diff --git a/beet-release.yaml b/beet-release.yaml index 0484f05d37..4ef2e3cef5 100644 --- a/beet-release.yaml +++ b/beet-release.yaml @@ -6,6 +6,9 @@ pipeline: - gm4.plugins.manifest.write_meta - broadcast: 'gm4_*' extend: 'beet.yaml' + require: + - gm4.plugins.output.release + - gm4.plugins.player_heads pipeline: - gm4.plugins.manifest.write_updates - gm4.plugins.manifest.write_credits @@ -13,7 +16,11 @@ pipeline: meta: {copy_files: {data_pack: {LICENSE.md: "../LICENSE.md"}}} - gm4.plugins.readme_generator - gm4.plugins.write_mcmeta - - gm4.plugins.output.release + meta: + mecha: + formatting: + layout: preserve + nbt_compact: True meta: autosave: diff --git a/beet.yaml b/beet.yaml index dacc108d1d..bcaf3a017c 100644 --- a/beet.yaml +++ b/beet.yaml @@ -3,6 +3,13 @@ pipeline: - gm4.plugins.manifest.create - broadcast: 'gm4_*' extend: 'beet.yaml' + require: + - gm4.plugins.output + - gm4.plugins.player_heads pipeline: - gm4.plugins.write_mcmeta - - gm4.plugins.output + meta: + mecha: + layout: preserve + nbt_compact: True + cmd_compact: True diff --git a/gm4/commands.py b/gm4/commands.py index 156cde5a9c..fa7e974193 100644 --- a/gm4/commands.py +++ b/gm4/commands.py @@ -39,11 +39,24 @@ def dev(ctx: click.Context, project: Project, modules: tuple[str], watch: bool, config = { "broadcast": modules, "extend": "beet.yaml", - "require": ["beet.contrib.livereload"] if reload else [], + "require": [ + "gm4.plugins.output", + "beet.contrib.livereload", + "gm4.plugins.player_heads" + ] if reload else [ + "gm4.plugins.output", + "gm4.plugins.player_heads" + ], "pipeline": [ - "gm4.plugins.write_mcmeta", - "gm4.plugins.output" - ] + "gm4.plugins.write_mcmeta" + ], + "meta": { + "mecha" : { + "formatting":{ + "layout": "preserve", + "nbt_compact": True, + "cmd_compact": True + } } } } project.config_overrides = [ f"pipeline[] = {json.dumps(config)}", diff --git a/gm4/plugins/manifest.py b/gm4/plugins/manifest.py index 757406c875..85e5c7829c 100644 --- a/gm4/plugins/manifest.py +++ b/gm4/plugins/manifest.py @@ -1,4 +1,4 @@ -from beet import Context, TextFile +from beet import Context, TextFile, JsonFile from pathlib import Path from typing import Any from functools import cache @@ -97,6 +97,7 @@ def update_patch(ctx: Context): release_dir = Path('release') / version manifest_file = release_dir / "meta.json" logger = parent_logger.getChild("update_patch") + skin_cache = JsonFile(source_path="gm4/skin_cache.json").data modules = ctx.cache["gm4_manifest"].json["modules"] @@ -119,7 +120,16 @@ def update_patch(ctx: Context): deps = _traverse_includes(id) | {"base"} deps_dirs = [element for sublist in [[f"{d}/data", f"{d}/*py"] for d in deps] for element in sublist] - diff = run(["git", "diff", last_commit, "--shortstat", "--", f"{id}/data", f"{id}/*.py"] + deps_dirs) if last_commit else True + # add watches to skins this module uses from other modules. NOTE this could be done in a more extendable way in the future, rather than "hardcoded" + skin_dep_dirs: list[str] = [] + for skin_ref in skin_cache["nonnative_references"].get(id, []): + d = skin_cache["skins"][skin_ref]["parent_module"] + ns, path = skin_ref.split(":") + skin_dep_dirs.append(f"{d}/data/{ns}/skins/{path}.png") + + watch_dirs = deps_dirs+skin_dep_dirs + + diff = run(["git", "diff", last_commit, "--shortstat", "--", f"{id}/data", f"{id}/*.py"] + watch_dirs) if last_commit else True if not diff and released: # No changes were made, keep the same patch version diff --git a/gm4/plugins/output.py b/gm4/plugins/output.py index c7e7aabcd3..84722c5fb8 100644 --- a/gm4/plugins/output.py +++ b/gm4/plugins/output.py @@ -1,6 +1,5 @@ from beet import Context from pathlib import Path -from bolt import Module import os import json import requests @@ -18,12 +17,13 @@ USER_AGENT = "Gamemode4Dev/GM4_Datapacks/release-pipeline (gamemode4official@gmail.com)" def beet_default(ctx: Context): - """Saves the datapack to the ./out folder.""" + """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.20") out_dir = Path("out") - ctx.data[Module].clear() # manually cleanup bolt modules - + yield # wait for exit phase, after other plugins cleanup + ctx.data.save( path=out_dir / f"{ctx.project_id}_{version.replace('.', '_')}", overwrite=True, @@ -33,6 +33,7 @@ def beet_default(ctx: Context): def release(ctx: Context): """ Saves the zipped datapack and metadata to the ./release/{version} folder. + Should be first in pipeline to properly wrap all other plugins cleanup phases If the module has the `version` and `meta.modrinth.project_id` fields, and `BEET_MODRINTH_TOKEN` environment variable is set, will try to publish a @@ -46,7 +47,7 @@ def release(ctx: Context): release_dir = Path("release") / version_dir file_name = f"{ctx.project_id}_{version_dir.replace('.', '_')}.zip" - ctx.data[Module].clear() # manually cleanup bolt modules + yield # wait for exit phase, after other plugins cleanup ctx.data.save( path=release_dir / file_name, diff --git a/gm4/plugins/player_heads.py b/gm4/plugins/player_heads.py new file mode 100644 index 0000000000..0c48f51a05 --- /dev/null +++ b/gm4/plugins/player_heads.py @@ -0,0 +1,266 @@ +import base64 +import hashlib +import json +import logging +import os +import sys +import time +from dataclasses import replace +from io import BytesIO +from typing import Any, Callable, ClassVar, Generator + +import requests +from beet import Context, FileDeserialize, JsonFile, PngFile +from mecha import CompilationUnit, Diagnostic, Mecha, MutatingReducer, rule +from mecha.ast import ( + AstChildren, + AstCommand, + AstNbtCompound, + AstNbtCompoundEntry, + AstNbtPath, + AstNbtPathKey, + AstResourceLocation, +) +from nbtlib import IntArray # type: ignore +from PIL.Image import Image +from tokenstream import set_location + +from gm4.utils import nested_get + +parent_logger = logging.getLogger("gm4.player_heads") + +USER_AGENT = "Gamemode4Dev/GM4_Datapacks/player_head_management (gamemode4official@gmail.com)" +MISSING_TEXTURE_SKIN = "eyJ0ZXh0dXJlcyIgOiB7ICJTS0lOIiA6IHsgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9kYWUyOTA0YTI4NmI5NTNmYWI4ZWNlNTFkNjJiZmNjYjMyY2IwMjc0OGY0NjdjMDBiYzMxODg1NTk4MDUwNThiIn19fQ==" + +def beet_default(ctx: Context): + ctx.data.extend_namespace.append(Skin) # register new filetype to datapack + tf = ctx.inject(SkinNbtTransformer) + ctx.inject(Mecha).transform.extend(tf) # register new ruleset to mecha + + yield + tf.cache_nonnative_references() + tf.log_unused_textures() + tf.output_skin_cache() + ctx.data[Skin].clear() # cleanup skin files from output pack + +class Skin(PngFile): + """Class representing a skin texture file.""" + scope: ClassVar[tuple[str, ...]] = ("skins",) + extension: ClassVar[str] = ".png" + image: ClassVar[FileDeserialize[Image]] = FileDeserialize() # purely here to solve type-warnings on PIL images + + +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 + self.skin_cache = JsonFile(source_path="gm4/skin_cache.json").data + self.used_textures: list[str] = [] + super().__init__() + + @rule(AstNbtCompoundEntry) + def skullowner_substitutions(self, node: AstNbtCompoundEntry, **kwargs: Any) -> Generator[Diagnostic, None, AstNbtCompoundEntry]: + if node.key.value == "SkullOwner": + match node.value.evaluate(): + case val if "$" in val: + skin_val, uuid, d = self.retrieve_texture(val, **kwargs) + if d: + yield d + node = replace(node, value=AstNbtCompound.from_value({ + "Id": IntArray(uuid), + "Properties": { + "textures":[{ + "Value": skin_val + }] + } + })) + case {"Value": str(val), **rest} if "$" in val: + skin_val, uuid, d = self.retrieve_texture(val, **kwargs) + if d: + yield d + node = replace(node, value=AstNbtCompound.from_value( + ({"Name": n} if (n:=rest.get("Name")) else {}) | + {"Id": IntArray(uuid), + "Properties": { + "textures":[ + {"Value": skin_val} | + ({"Signature": s} if (s:=rest.get("Signature")) else {})] + } + } + )) + case {"Properties": {"textures": [{"Value": str(val), **tex_rest}]}, **root_rest} if "$" in val: + skin_val, uuid, d = self.retrieve_texture(val, **kwargs) + if d: + yield d + node = replace(node, value=AstNbtCompound.from_value( + ({"Name": n} if (n:=root_rest.get("Name")) else {}) | + {"Id": IntArray(uuid), + "Properties": { + "textures":[ + {"Value": skin_val} | + ({"Signature": s} if (s:=tex_rest.get("Signature")) else {})] + } + } + )) + case _: + if "$" in node.value.evaluate().snbt(): + yield Diagnostic("warn", f"Unhandled SkullOwner substitution. Format failed to match known schemas.", + filename=kwargs.get("filename"), file=kwargs.get("file")) + return node + + @rule(AstCommand, identifier="data:modify:storage:target:targetPath:append:value:value") + def lib_player_heads_skullowner_subs(self, node: AstCommand) -> Generator[Diagnostic, None, AstCommand]: + """Captures skin texture data in lib_player_heads setup""" + ast_storage, ast_storage_path, ast_nbt = node.arguments + if isinstance(ast_storage, AstResourceLocation) and isinstance(ast_storage_path, AstNbtPath) and isinstance(ast_nbt, AstNbtCompound) and isinstance(path_key:=ast_storage_path.components[0], AstNbtPathKey): + if ast_storage.get_value() == "gm4_player_heads:register" and path_key.value == "heads": + nbt: dict[str, Any] = ast_nbt.evaluate() + match nbt: + case {"value": str(value)} if "$" in value: + skin_val, _, d = self.retrieve_texture(value) + if d: + erroring_subnode = next(i for i in ast_nbt.entries if i.key.value == "value") + yield set_location(d, erroring_subnode) + node = replace(node, arguments=AstChildren((ast_storage, ast_storage_path, AstNbtCompound.from_value(nbt|{"value": skin_val})))) + case _: + pass + return node + + def retrieve_texture(self, skin_name: str, **kwargs: Any) -> tuple[str, list[int], Diagnostic|None]: + skin_name = skin_name.lstrip("$") + if ":" not in skin_name: + skin_name = f"{self.ctx.project_id}:{skin_name}" + self.used_textures.append(skin_name) + cached_data = self.skin_cache["skins"].get(skin_name, {"hash": None, "parent_module": self.ctx.project_id}) + + if cached_data["parent_module"] == self.ctx.project_id: # if the skin belongs to another module, just trust the cache to be right. The skin.png file isn't available to check + try: + skin_file: Skin = self.ctx.data[Skin][skin_name] + except KeyError: + d = Diagnostic("error", f"Unknown skin \'{skin_name}\'", + filename=kwargs.get("filename"), + file=kwargs.get("file") + ) + return MISSING_TEXTURE_SKIN, [0,0,0,0], d + else: + skin_hash = hashlib.sha1(skin_file.image.tobytes()).hexdigest() #type: ignore + + if skin_hash != cached_data["hash"]: + # the image file contents have changed - upload the new image + value, uuid = self.mineskin_upload(skin_file, f"{skin_name.split(':')[-1]}.png") + if value is None or uuid is None: + return MISSING_TEXTURE_SKIN, [0,0,0,0], None # skin upload failed, don't cache the result and return missing texture + self.skin_cache["skins"][skin_name] = { + "uuid": uuid, + "value": value, + "hash": skin_hash, + "parent_module": self.ctx.project_id + } + return value, uuid, None + return cached_data["value"], cached_data["uuid"], None + + def mineskin_upload(self, skin: Skin, filename: str) -> tuple[str|None, list[int]|None]: + logger = parent_logger.getChild(f"mineskin_upload.{self.ctx.project_id}") + if os.getenv("GITHUB_ACTIONS"): + logger.error(f"Failed to upload {filename}. Github Actions cannot upload skins via the mineskin api") + sys.exit(1) # quit the build and mark the github action as failed + + token = self.ctx.inject(MineskinAuthManager).token + + buf = BytesIO() + skin.image.save(buf, format="PNG") + res = requests.post( + url='https://api.mineskin.org/generate/upload', + data={"name":"GM4_Skin", "visibility":0}, + files={"file":(filename, buf.getvalue(), 'text/x-spam')}, + headers={"User-Agent": USER_AGENT, "Authorization": "Bearer "+token} + ) + if res.status_code == 429: + logger.info(f"Mineskin request ratelimited! Waiting and trying again") + next_request_time = res.json()["nextRequest"] + wait_time = max(next_request_time - time.time(), 0) + time.sleep(wait_time) + return self.mineskin_upload(skin, filename) + elif res.status_code != 200: + logger.error(f"Mineskin upload failed: {res.status_code} {res.text}") + return None, None + logger.info(f"New skin texture \'{filename}\' successfully uploaded via Mineskin") + + # strip out unnecessary fields encoded within texture value + value = res.json()["data"]["texture"]["value"] + decoded_value = json.loads(base64.b64decode(value).decode('utf-8')) + trimmed_decoded_value = {"textures": {"SKIN": {"url": decoded_value["textures"]["SKIN"]["url"]}}} + trimmed_value = str(base64.b64encode(str(trimmed_decoded_value).encode('utf-8')), 'utf-8') + + # split hex uuid into 4 ints + uuid = res.json()["uuid"] + i = range(0,33,8) + segmented_uuid = [uuid[a:b] for a,b in zip(i, i[1:])] + signed_int: Callable[[str], int] = lambda s: int.from_bytes(bytes.fromhex(s), byteorder="big", signed=True) + uuid_arr = list(map(signed_int, segmented_uuid)) + return trimmed_value, uuid_arr + + def log_unused_textures(self): + logger = parent_logger.getChild(self.ctx.project_id) + cached_member_textures = [e for e in self.skin_cache["skins"].keys() if e.split(":")[0] == self.ctx.project_id] + for tex in set(cached_member_textures) - set(self.used_textures): + logger.info(f"Cached skin texture {tex} is not referenced. Consider manually cleaning up skin_cache.json") + + def cache_nonnative_references(self): + """Adds any skin references from another module into skin_cache.json, so changes can trigger patch increments""" + if (nonnative_refs := set(self.used_textures) - set(self.ctx.data[Skin])): + self.skin_cache["nonnative_references"][self.ctx.project_id] = list(nonnative_refs) + else: + self.skin_cache["nonnative_references"].pop(self.ctx.project_id, None) + + def output_skin_cache(self): + JsonFile(self.skin_cache).dump(origin="", path="gm4/skin_cache.json") + +def process_json_files(ctx: Context): + """Passes nbt contained in advancements, loot_tables ect.. through the custom Mecha AST rule for appropiate texture replacements""" + tf = ctx.inject(SkinNbtTransformer) + mc = ctx.inject(Mecha) + + def transform_snbt(snbt: str, db_entry_key: str) -> str: + escaped_snbt = snbt.replace("\n", "\\\\n") + # NOTE snbt in loot-tables reacts weird to \n characters. Both \n and \\\\n produce the same ingame output (\\n). + # gm4 only has one case of \n in loot tables, so this replacement forces \n->\\\\n for the mecha parser to read it right. + # this may need to be altered in the future, but for now this means that \\\\n, while valid in vanilla loot-tables, will not + # work after being put through the mecha parser + node = mc.parse(escaped_snbt, type=AstNbtCompound) # parse string to AST + filename = os.path.relpath(jsonfile.original.source_path, ctx.directory) if jsonfile.original.source_path else None # get relative filepath for Diagnostics + mc.database.update({db_entry_key: CompilationUnit(source=snbt)}) #type:ignore # register fake CompilationUnit for Diagnostic printing, using unique string as key instead of the File() object, to support multiple entries from the same file + return mc.serialize(tf.invoke(node, filename=filename, file=db_entry_key)) # run AST through custom rule, and serialize back to string, passing along data for Diagnostic + + for name, jsonfile in [*ctx.data.loot_tables.items(), *ctx.data.item_modifiers.items()]: + # item modifiers, annoyingly, can have a list as the root, so we wrap in a dict to use nested_get + contents = {"listroot": jsonfile.data} if type(jsonfile.data) is list else jsonfile.data + + for func_list in nested_get(contents, "functions"): + f: Callable[[Any], bool] = lambda e: e["function"].removeprefix('minecraft:')=="set_nbt" + for i, entry in enumerate(filter(f, func_list)): + entry["tag"] = transform_snbt(entry["tag"], db_entry_key=f"{name}_{i}") + + for name, jsonfile in ctx.data.advancements.items(): + for i, entry in enumerate(nested_get(jsonfile.data, "icon")): + entry["nbt"] = transform_snbt(entry["nbt"], db_entry_key=f"{name}_{i}") + + # send any raised diagnostic errors to Mecha for reporting + mc.diagnostics.extend(tf.diagnostics) + + +class MineskinAuthManager(): + """A process for managing mineskin access credentials, prompting the user if needed""" + def __init__(self, ctx: Context): + token_cache = ctx.cache.get("mineskin").json.get("token") # type: ignore , cache.get ensures cache exists + + if token_cache is None: + # request token from user + print(("\033[93mThis build has detected a changed skin file, but no Mineskin API key is available locally.\n\t" + "Visit mineskin.org/account, login or create an account with google, and create an API key.\n\t" + "Beet will cache your token locally, but save the api key and key secret in a secure location in case the cache resets.\n\t" + "You do not need to provide mineskin with your Minecraft account details unless you wish to\033[0m.")) + self.token = input("API Key >>") + ctx.cache["mineskin"].json = {"token": self.token} + return + self.token = token_cache diff --git a/gm4/plugins/versioning.py b/gm4/plugins/versioning.py index fa24fcc651..d943ee5ed4 100644 --- a/gm4/plugins/versioning.py +++ b/gm4/plugins/versioning.py @@ -216,7 +216,7 @@ def versioned_namespace(ctx: Context, version: Version): "replace": f"{versioned_namespace}:\\1" })) ctx.require(find_replace(data_pack={"match": "*"}, substitute={ - "find": f"(? str: """Run a shell command and return the stdout.""" @@ -29,4 +30,19 @@ def int_rep(self) -> int: """returns integer representation of version, for use in datapack scoreboards""" if type(None) in map(type, [self.major, self.minor, self.patch]): raise TypeError(f"Version number cannot be converted to integer when one or more fields are not set") - return 100_000*self.major + 1_000*self.minor + self.patch # type: ignore \ No newline at end of file + return 100_000*self.major + 1_000*self.minor + self.patch # type: ignore + +def nested_get(d: dict[str, Any], key: str) -> list[Any]: + """Recursively traverses a string-keyed dict (like minecraft json files) for the specified key, returning all that exist + returns empty list and throws no errors if key does not exist""" + ret_list: list[Any] = [] + for k, v in d.items(): + if k == key: + ret_list.append(d[k]) + elif isinstance(v, dict): + ret_list.extend(nested_get(d[k], key)) + elif isinstance(v, list): + for elem in d[k]: + if isinstance(elem, dict): + ret_list.extend(nested_get(elem, key)) #type: ignore ; NBT is hard to type due to its nested nature + return ret_list diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/functions/init.mcfunction b/gm4_animi_shamir/data/gm4_animi_shamir/functions/init.mcfunction index fc83ff8f5f..1979d9458b 100644 --- a/gm4_animi_shamir/data/gm4_animi_shamir/functions/init.mcfunction +++ b/gm4_animi_shamir/data/gm4_animi_shamir/functions/init.mcfunction @@ -6,7 +6,7 @@ execute unless score animi_shamir gm4_earliest_version < animi_shamir gm4_module scoreboard players set animi_shamir gm4_modules 1 # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_animi_shamir:band/v0"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_animi_shamir:band/v1",name:"[Drop to Fix Item] gm4_animi_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"animi",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-1332644679,659216762,2108439484,664728976],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODAyOTI2NzM2NiwKICAicHJvZmlsZUlkIiA6ICI3ZmIyOGQ1N2FhZmQ0MmQ1YTcwNWNlZjE4YWI1MzEzZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJjaXJjdWl0MTAiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2MzMTBmZDk3YjFhN2Q3MDkwOGExODc2N2FjZmRjYzYwZDJhMTU1NTY5Zjk0YThmYjZhZWUxYTMzMWE5MjM4IgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420117,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.animi","fallback":"Animi"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_animi_shamir:band/v0"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_animi_shamir:band/v1",name:"[Drop to Fix Item] gm4_animi_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"animi",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/curies_bismium",CustomModelData:3420117,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.animi","fallback":"Animi"}']}}} # guidebook execute if score gm4_guidebook load.status matches 1 run summon marker ~ 315.331110999018 ~ {CustomName:'"gm4_animi_shamir_guide"',Tags:["gm4_guide"],data:{type:"_expansion",base:"metallurgy",id:"animi_shamir",page_count:2,line_count:1,module_name:"Animi Shamir"}} diff --git a/gm4_audere_shamir/data/gm4_audere_shamir/functions/init.mcfunction b/gm4_audere_shamir/data/gm4_audere_shamir/functions/init.mcfunction index 3b7f947e66..369883ba65 100644 --- a/gm4_audere_shamir/data/gm4_audere_shamir/functions/init.mcfunction +++ b/gm4_audere_shamir/data/gm4_audere_shamir/functions/init.mcfunction @@ -6,7 +6,7 @@ scoreboard players set audere_shamir gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_audere_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_audere_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_audere_shamir:band/v1",name:"[Drop to Fix Item] gm4_audere_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"audere",metal:{type:"barium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-758190455,118414880,1677653096,2076204799],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODg4MzkzODA4MiwKICAicHJvZmlsZUlkIiA6ICJmNThkZWJkNTlmNTA0MjIyOGY2MDIyMjExZDRjMTQwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJ1bnZlbnRpdmV0YWxlbnQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGMxMzcwMGVlMGViYzgwOTU2N2IxYTNjOTFhYzhjMWFhMmJiNWNlYjQ4YWRlNzZlOGJkN2QzMWE5Y2EzYjdkIgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420120,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F0EAD6","translate":"item.gm4.metallurgy.band","fallback":"Barium Band","with":[{"translate":"item.gm4.metallurgy.barium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.audere","fallback":"Audere"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_audere_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_audere_shamir:band/v1",name:"[Drop to Fix Item] gm4_audere_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"audere",metal:{type:"barium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/barium",CustomModelData:3420120,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F0EAD6","translate":"item.gm4.metallurgy.band","fallback":"Barium Band","with":[{"translate":"item.gm4.metallurgy.barium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.audere","fallback":"Audere"}']}}} schedule function gm4_audere_shamir:main 16t diff --git a/gm4_auto_crafting/data/gm4_auto_crafting/loot_tables/items/auto_crafter.json b/gm4_auto_crafting/data/gm4_auto_crafting/loot_tables/items/auto_crafter.json index ea07db077c..ca780c6f8d 100644 --- a/gm4_auto_crafting/data/gm4_auto_crafting/loot_tables/items/auto_crafter.json +++ b/gm4_auto_crafting/data/gm4_auto_crafting/loot_tables/items/auto_crafter.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420140,gm4_machines:{id:\"auto_crafter\"},SkullOwner:{Name:\"gm4_auto_crafter\",Id:[I;925477182,1548502938,-926454109,-774539107],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY1NjM4MTc3MTIyMywKICAicHJvZmlsZUlkIiA6ICJjMTNkYzkxZjg1YjA0ZWM4OGU2NDk5YzdjZDc4Zjk3MSIsCiAgInByb2ZpbGVOYW1lIiA6ICJjYXNzdGhlY3J5cHRpZCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jZjI4NWUwYjc1NGNhMDU3NDllODYzMjA0MmZkZmEyZGRkYjIyMjNhYWVmNGU3NjczOTdlNzg5Y2ZjYTYzYjFhIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{CustomModelData:3420140,gm4_machines:{id:\"auto_crafter\"},SkullOwner:{Name:\"gm4_auto_crafter\",Signature:\"gm4_machine\",Value:\"$auto_crafter\"}}" }, { "function": "set_name", diff --git a/gm4_auto_crafting/data/gm4_auto_crafting/skins/auto_crafter.png b/gm4_auto_crafting/data/gm4_auto_crafting/skins/auto_crafter.png new file mode 100644 index 0000000000..8c4c37e895 Binary files /dev/null and b/gm4_auto_crafting/data/gm4_auto_crafting/skins/auto_crafter.png differ diff --git a/gm4_block_compressors/data/gm4_block_compressors/loot_tables/items/block_compressor.json b/gm4_block_compressors/data/gm4_block_compressors/loot_tables/items/block_compressor.json index ff252ed0f4..76d5ce0bcd 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/loot_tables/items/block_compressor.json +++ b/gm4_block_compressors/data/gm4_block_compressors/loot_tables/items/block_compressor.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420130,gm4_machines:{id:\"block_compressor\"},SkullOwner:{Name:\"gm4_block_compressor\",Id:[I;788137431,1839549415,-1633195690,-1508391925],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1MzYzMTM1MiwKICAicHJvZmlsZUlkIiA6ICI0ZWQ4MjMzNzFhMmU0YmI3YTVlYWJmY2ZmZGE4NDk1NyIsCiAgInByb2ZpbGVOYW1lIiA6ICJGaXJlYnlyZDg4IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzZmYTkzMjMxZjZmNjVkNjc1NDI2NjgyMzE3NWIwOWFmNGNhN2E1NzQ1NDQzYjMyNjFlZGE3OGUzNTk5NTgyYmYiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{CustomModelData:3420130,gm4_machines:{id:\"block_compressor\"},SkullOwner:{Name:\"gm4_block_compressor\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$block_compressor\"}]}}}" }, { "function": "set_name", diff --git a/gm4_block_compressors/data/gm4_block_compressors/skins/block_compressor.png b/gm4_block_compressors/data/gm4_block_compressors/skins/block_compressor.png new file mode 100644 index 0000000000..9d5b37f0a8 Binary files /dev/null and b/gm4_block_compressors/data/gm4_block_compressors/skins/block_compressor.png differ diff --git a/gm4_desire_lines/data/gm4_desire_lines/functions/init.mcfunction b/gm4_desire_lines/data/gm4_desire_lines/functions/init.mcfunction index 51005efe57..344f8fc943 100644 --- a/gm4_desire_lines/data/gm4_desire_lines/functions/init.mcfunction +++ b/gm4_desire_lines/data/gm4_desire_lines/functions/init.mcfunction @@ -10,7 +10,7 @@ scoreboard players set desire_lines gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_celaro_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_celaro_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_celaro_shamir:band/v1",name:"[Drop to Fix Item] gm4_celaro_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"celaro",metal:{type:"aluminium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;1961294324,1560605478,885901402,915511979],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODc4ODAzNjY3NCwKICAicHJvZmlsZUlkIiA6ICI2MjM5ZWRhM2ExY2Y0YjJiYWMyODk2NGQ0NmNlOWVhOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGYXRGYXRHb2QiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGQ3MTQ5OTY0MDNlMTNhNGE4ZTc4OTQ0OWNjN2I5OGRhMmI4NDc1NTRjNDgwZGUyMDUxOTcwYjIxODIzZGJkOSIKICAgIH0KICB9Cn0="}]}},CustomModelData:3420118,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F47989","translate":"item.gm4.metallurgy.band","fallback":"Aluminium Band","with":[{"translate":"item.gm4.metallurgy.aluminium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.celaro","fallback":"Celaro"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_celaro_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_celaro_shamir:band/v1",name:"[Drop to Fix Item] gm4_celaro_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"celaro",metal:{type:"aluminium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/aluminium",CustomModelData:3420118,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F47989","translate":"item.gm4.metallurgy.band","fallback":"Aluminium Band","with":[{"translate":"item.gm4.metallurgy.aluminium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.celaro","fallback":"Celaro"}']}}} schedule function gm4_desire_lines:tick 1t diff --git a/gm4_disassemblers/data/gm4_disassemblers/loot_tables/items/disassembler.json b/gm4_disassemblers/data/gm4_disassemblers/loot_tables/items/disassembler.json index 4b9edf2995..edb9631c8b 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/loot_tables/items/disassembler.json +++ b/gm4_disassemblers/data/gm4_disassemblers/loot_tables/items/disassembler.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420135,gm4_machines:{id:\"disassembler\"},SkullOwner:{Name:\"gm4_disassembler\",Id:[I;-1561282646,-258324274,-1153094374,-693854673],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1NDAzMTQ2MywKICAicHJvZmlsZUlkIiA6ICJjNDM5NDI3Y2U1NGQ0NDMwYTYzOGU5OTdlYzc2YTBhOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJUaGVNYXN0ZXJHb2xkZW4iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODFjNzQ2NzEwZjQ3ODZiYzgxZTI1ZWVmOTM5ODI3ZjNiNDMzMjFhODQ1ZmYyNmU4N2E3MjVmZDBkMzU2Y2Y5MCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420135,gm4_machines:{id:\"disassembler\"},SkullOwner:{Name:\"gm4_disassembler\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$disassembler\"}]}}}" }, { "function": "set_name", diff --git a/gm4_disassemblers/data/gm4_disassemblers/skins/disassembler.png b/gm4_disassemblers/data/gm4_disassemblers/skins/disassembler.png new file mode 100644 index 0000000000..491a010084 Binary files /dev/null and b/gm4_disassemblers/data/gm4_disassemblers/skins/disassembler.png differ diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_tables/items/enchantment_extractor.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_tables/items/enchantment_extractor.json index 015ccfe952..5ce3f41ea9 100644 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_tables/items/enchantment_extractor.json +++ b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_tables/items/enchantment_extractor.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420134,gm4_machines:{id:\"enchantment_extractor\"},SkullOwner:{Name:\"gm4_enchantment_extractor\",Id:[I;-395669705,959204555,-1473222203,-686353911],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1NDA4MzE3NiwKICAicHJvZmlsZUlkIiA6ICIxYTc1ZTNiYmI1NTk0MTc2OTVjMmY4NTY1YzNlMDAzZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJUZXJvZmFyIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzIyZTRiMWM2ODExYjhkOTgyNTg3NTNmZWNkNGYyOWUzY2Y2MjJmODFhN2FlZTEyNTIwMTc1MmM0NGVkM2EyNDEiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{CustomModelData:3420134,gm4_machines:{id:\"enchantment_extractor\"},SkullOwner:{Name:\"gm4_enchantment_extractor\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$enchantment_extractor\"}]}}}" }, { "function": "set_name", 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 new file mode 100644 index 0000000000..dd81cc10c9 Binary files /dev/null and b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/skins/enchantment_extractor.png differ diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_tables/items/enderpuff.json b/gm4_end_fishing/data/gm4_end_fishing/loot_tables/items/enderpuff.json index 080a5b3f25..ad3b6c868a 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_tables/items/enderpuff.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_tables/items/enderpuff.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420014,gm4_end_fishing:{enderpuff:1b},SkullOwner:{Id:[I;-749248143,1561284060,-1964497486,1336566238],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNzM3NjU5NjgxNiwKICAicHJvZmlsZUlkIiA6ICI4NDMwMDNlM2JlNTY0M2Q5OTQxMTBkMzJhMzU2MTk2MCIsCiAgInByb2ZpbGVOYW1lIiA6ICJHYWJvTWNHYW1lciIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9lYjIzNTI3MWNhNTZlOGExYTQzMWViMWU2NWNlODIwYWE3ZTUwMWYwNmMxZjEzNTZhY2ViN2U4NjJmMTRhMjgiCiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420014,gm4_end_fishing:{enderpuff:1b},SkullOwner:\"$enderpuff\"}" } ] } diff --git a/gm4_end_fishing/data/gm4_end_fishing/skins/enderpuff.png b/gm4_end_fishing/data/gm4_end_fishing/skins/enderpuff.png new file mode 100644 index 0000000000..13f12adf0c Binary files /dev/null and b/gm4_end_fishing/data/gm4_end_fishing/skins/enderpuff.png differ diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/create_cart.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/create_cart.mcfunction index 958dcd26b5..70cf88a137 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/create_cart.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/create_cart.mcfunction @@ -4,7 +4,7 @@ # run from gm4_ender_hoppers:machine/verify_place_cart # summon new hopper minecart -summon hopper_minecart ~ ~ ~ {Tags:["gm4_ender_hopper_minecart_new","gm4_new_machine"],Passengers:[{id:"minecraft:armor_stand",CustomName:'"gm4_ender_hopper_stand"',Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],Invisible:1b,Small:1b,Pose:{Head:[180f,0f,0f],RightArm:[0f,0f,0f]},ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;986384532,2063540834,-1688310937,-1123024522],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM4ODkxMTA4NSwKICAicHJvZmlsZUlkIiA6ICJkMWY2OTc0YzE2ZmI0ZjdhYjI1NjU4NzExNjM3M2U2NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGaW9saWVzdGEiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ0MWJkNGZkYzgwYzczY2NlNTQ5NTY1ZDIyN2U3MjVlMjZlZDM2MzJhNmRiYjVlODExMTVhYjgwMmM1ZjI0MSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],DisabledSlots:2039583,HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420009}},{}]}]} +summon hopper_minecart ~ ~ ~ {Tags:["gm4_ender_hopper_minecart_new","gm4_new_machine"],Passengers:[{id:"minecraft:armor_stand",CustomName:'"gm4_ender_hopper_stand"',Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],Invisible:1b,Small:1b,Pose:{Head:[180f,0f,0f],RightArm:[0f,0f,0f]},ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display"}}],DisabledSlots:2039583,HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420009}},{}]}]} 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/functions/machine/rotate/down.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/down.mcfunction index 46be18ac1b..d8a2c1dbac 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/down.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/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 armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420003}},{}],Pose:{RightArm:[0f, 0f, 0f]},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display_2"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420003}},{}],Pose:{RightArm:[0f, 0f, 0f]},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/functions/machine/rotate/east.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/east.mcfunction index 1b73be484c..215f93a3f2 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/east.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/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 armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},Rotation:[-90.0f,0.0f]} +summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display_2"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},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/functions/machine/rotate/north.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/north.mcfunction index 72edf7131c..7e7d32eb3e 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/north.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/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 armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},Rotation:[180.0f,0.0f]} +summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display_2"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},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/functions/machine/rotate/south.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/south.mcfunction index 2347837549..033b67a1c6 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/south.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/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 armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display_2"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},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/functions/machine/rotate/west.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/west.mcfunction index e549fa39f0..f48e01da37 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/machine/rotate/west.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/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 armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},Rotation:[90.0f,0.0f]} +summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display_2"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420008}},{}],Pose:{RightArm:[0f, 0f, 0f]},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/functions/relocate/place_down.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/place_down.mcfunction index 2a6026507a..ebce3ad5b5 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/place_down.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/place_down.mcfunction @@ -8,6 +8,6 @@ execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ hopper[fac execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ hopper[facing=down] data merge block ~ ~ ~ {CustomName:'{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper"}'} -summon armor_stand ~ ~-.5 ~ {Tags:["gm4_ender_hopper","gm4_no_edit"],Small:1b,Marker:1b,Invisible:1b,Invulnerable:1b,NoGravity:1b,ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738856610,-1151712444,-1271437163,677619263],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0Nzc4NTE1MDIxNDUsInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzhiOWUyMTVkM2Q4NzQ3YzhkZjYxNGZkOGZlNGQxMzlkZTEyMTI0ZmZlMTlmMjkwOWQzOGNkNGE3MzI5MjVkIn0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}}}],DisabledSlots:2039583,HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420003}}],Pose:{RightArm:[0f, 0f, 0f]}} +summon armor_stand ~ ~-.5 ~ {Tags:["gm4_ender_hopper","gm4_no_edit"],Small:1b,Marker:1b,Invisible:1b,Invulnerable:1b,NoGravity:1b,ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display"}}],DisabledSlots:2039583,HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420003}}],Pose:{RightArm:[0f, 0f, 0f]}} 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 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/summon_block_markers.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/summon_block_markers.mcfunction index 62fffc8a49..c935d88c7a 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/summon_block_markers.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/relocate/summon_block_markers.mcfunction @@ -5,7 +5,7 @@ scoreboard players set $placed_block gm4_rl_data 1 -summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420003}},{}],Pose:{RightArm:[0f, 0f, 0f]},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.5 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:"$ender_hopper_display_2"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420003}},{}],Pose:{RightArm:[0f, 0f, 0f]},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]} 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 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_cart_stand.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_cart_stand.mcfunction index 7ab1da66c8..6365f0d2b2 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_cart_stand.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_cart_stand.mcfunction @@ -3,7 +3,7 @@ # located at @s # run from gm4_ender_hoppers:main -data merge entity @s {Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_cart","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper_stand"',Pose:{Head:[180f,0f,0f],RightArm:[0f,0f,0f]},ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;986384532,2063540834,-1688310937,-1123024522],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM4ODkxMTA4NSwKICAicHJvZmlsZUlkIiA6ICJkMWY2OTc0YzE2ZmI0ZjdhYjI1NjU4NzExNjM3M2U2NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGaW9saWVzdGEiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ0MWJkNGZkYzgwYzczY2NlNTQ5NTY1ZDIyN2U3MjVlMjZlZDM2MzJhNmRiYjVlODExMTVhYjgwMmM1ZjI0MSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420009}},{}]} +data merge entity @s {Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_cart","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper_stand"',Pose:{Head:[180f,0f,0f],RightArm:[0f,0f,0f]},ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1,tag:{CustomModelData:3420002,SkullOwner:{Properties:{textures:[{Value:"$ender_hopper_display"}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420009}},{}]} scoreboard players set @e[type=hopper_minecart,tag=gm4_ender_hopper,distance=..0.2] gm4_entity_version 1 execute as @e[type=hopper_minecart,tag=gm4_ender_hopper,distance=..0.2] run data merge entity @s {CustomName:'{"translate":"%1$s%3427655$s","with":[{"translate":"%1$s%3427656$s","with":[{"text":"Minecart with Ender Hopper","font":"minecraft:default","color":"#373737"},[{"translate":"gui.gm4.ender_hopper_minecart","font":"gm4:container_gui","color":"white"},{"text":"Minecart with Ender Hopper","font":"minecraft:default","color":"#373737"}]]},{"translate":"%1$s%3427656$s","with":[{"translate":"container.gm4.ender_hopper_minecart","font":"minecraft:default","color":"#373737"},[{"translate":"gui.gm4.ender_hopper_minecart","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper_minecart","font":"minecraft:default","color":"#373737"}]]}]}',Tags:["gm4_ender_hopper_minecart","gm4_machine_cart"]} scoreboard players set @s gm4_entity_version 1 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_stand.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_stand.mcfunction index b73084423d..f0698cb48b 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_stand.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/functions/upgrade_machine_stand.mcfunction @@ -4,15 +4,15 @@ # run from gm4_ender_hoppers:main execute if block ~ ~ ~ hopper[facing=down] align xyz run summon marker ~0.5 ~0.5 ~0.5 {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper"',Rotation:[0.0f,0.0f]} -execute if block ~ ~ ~ hopper[facing=down] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],Rotation:[0.0f,0.0f]} +execute if block ~ ~ ~ hopper[facing=down] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Properties:{textures:[{Value:"$ender_hopper_display_2"}]}}}}],Rotation:[0.0f,0.0f]} execute if block ~ ~ ~ hopper[facing=north] align xyz run summon marker ~0.5 ~0.5 ~0.5 {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper"',Rotation:[180.0f,0.0f]} -execute if block ~ ~ ~ hopper[facing=north] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],Rotation:[180.0f,0.0f]} +execute if block ~ ~ ~ hopper[facing=north] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Properties:{textures:[{Value:"$ender_hopper_display_2"}]}}}}],Rotation:[180.0f,0.0f]} execute if block ~ ~ ~ hopper[facing=east] align xyz run summon marker ~0.5 ~0.5 ~0.5 {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper"',Rotation:[-90.0f,0.0f]} -execute if block ~ ~ ~ hopper[facing=east] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],Rotation:[-90.0f,0.0f]} +execute if block ~ ~ ~ hopper[facing=east] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Properties:{textures:[{Value:"$ender_hopper_display_2"}]}}}}],Rotation:[-90.0f,0.0f]} execute if block ~ ~ ~ hopper[facing=south] align xyz run summon marker ~0.5 ~0.5 ~0.5 {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper"',Rotation:[0.0f,0.0f]} -execute if block ~ ~ ~ hopper[facing=south] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],Rotation:[0.0f,0.0f]} +execute if block ~ ~ ~ hopper[facing=south] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Properties:{textures:[{Value:"$ender_hopper_display_2"}]}}}}],Rotation:[0.0f,0.0f]} execute if block ~ ~ ~ hopper[facing=west] align xyz run summon marker ~0.5 ~0.5 ~0.5 {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict"],CustomName:'"gm4_ender_hopper"',Rotation:[90.0f,0.0f]} -execute if block ~ ~ ~ hopper[facing=west] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Id:[I;-1738045610,-1151472894,-1829437163,677674665],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTIwMTExNywKICAicHJvZmlsZUlkIiA6ICI5NTE3OTkxNjljYzE0MGY1OGM2MmRjOGZmZTU3NjBiZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmRpbmFsQ2FyZGluYWwiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTI4NzVlODdmNzBkODMzNjcxYTEzMWJjZjE2OGI2Y2VjYWQ4YmIwNjlhYTkwM2ZiOTFiOGVhMWYwOWRhZDQ1NyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9"}]}}}}],Rotation:[90.0f,0.0f]} +execute if block ~ ~ ~ hopper[facing=west] run data merge entity @s {Silent:1,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_ender_hopper_stand","gm4_machine_stand","smithed.entity","smithed.strict"],HasVisualFire:1,CustomName:'"gm4_ender_hopper_stand"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420002,SkullOwner:{Properties:{textures:[{Value:"$ender_hopper_display_2"}]}}}}],Rotation:[90.0f,0.0f]} execute unless block ~ ~ ~ hopper[facing=down] run data modify entity @s HandItems[0].tag.CustomModelData set value 3420008 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_tables/items/ender_hopper.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_tables/items/ender_hopper.json index e5d15d9fce..3ec9f5b584 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_tables/items/ender_hopper.json +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_tables/items/ender_hopper.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420131,gm4_machines:{id:\"ender_hopper\"},SkullOwner:{Name:\"gm4_ender_hopper\",Id:[I;-1638903124,-1364335607,-1999291957,-1538083823],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTAzMTI1MywKICAicHJvZmlsZUlkIiA6ICI5ZWEyMTQ0NGFiNjI0MWZkYjg5YjE2NDFhNDg2MGZiZiIsCiAgInByb2ZpbGVOYW1lIiA6ICI3QUJDSE9VTiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS80MjBjOThjYTlhZjRjYTY1N2ZjN2M5MTc4Yzc5ZjQ5MDM4YmU2ODExMzllNjIwZDEzMmJhNTJmMzA3YjAxMTcyIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{CustomModelData:3420131,gm4_machines:{id:\"ender_hopper\"},SkullOwner:{Name:\"gm4_ender_hopper\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$ender_hopper\"}]}}}" }, { "function": "set_name", diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper.png b/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper.png new file mode 100644 index 0000000000..a0589f4c23 Binary files /dev/null and b/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper.png differ diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper_display.png b/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper_display.png new file mode 100644 index 0000000000..5468edb0b4 Binary files /dev/null and b/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper_display.png differ diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper_display_2.png b/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper_display_2.png new file mode 100644 index 0000000000..2e8f4d644e Binary files /dev/null and b/gm4_ender_hoppers/data/gm4_ender_hoppers/skins/ender_hopper_display_2.png differ diff --git a/gm4_forming_press/data/gm4_forming_press/loot_tables/items/forming_press.json b/gm4_forming_press/data/gm4_forming_press/loot_tables/items/forming_press.json index c92c5a621d..aa7b143ad6 100644 --- a/gm4_forming_press/data/gm4_forming_press/loot_tables/items/forming_press.json +++ b/gm4_forming_press/data/gm4_forming_press/loot_tables/items/forming_press.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420129,gm4_machines:{id:\"forming_press\"},SkullOwner:{Name:\"gm4_forming_press\",Id:[I;-1176243816,418006447,-1230055084,297056131],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1NTQ0MTc1NywKICAicHJvZmlsZUlkIiA6ICJjNjEwOTExMDhlOTQ0MWRhODQyZDA5MDVmMDAyOWVhOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJkZVlvbm8iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjM0YWQ1NDAyYzAxMzAzYzA0NmI1MTJlZjBiMzYyYmQwNjJjMWI3ZTg1MTU5YTYzODMzMGQyMjg0NTYzMWNmYSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420129,gm4_machines:{id:\"forming_press\"},SkullOwner:{Name:\"gm4_forming_press\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$forming_press\"}]}}}" }, { "function": "set_name", 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 new file mode 100644 index 0000000000..85e0ee434c Binary files /dev/null and b/gm4_forming_press/data/gm4_forming_press/skins/forming_press.png differ diff --git a/gm4_fulcio_shamir/data/gm4_fulcio_shamir/functions/init.mcfunction b/gm4_fulcio_shamir/data/gm4_fulcio_shamir/functions/init.mcfunction index e039e564f5..25d645270a 100644 --- a/gm4_fulcio_shamir/data/gm4_fulcio_shamir/functions/init.mcfunction +++ b/gm4_fulcio_shamir/data/gm4_fulcio_shamir/functions/init.mcfunction @@ -8,7 +8,7 @@ scoreboard players set fulcio_shamir gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_fulcio_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_fulcio_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_fulcio_shamir:band/v1",name:"[Drop to Fix Item] gm4_fulcio_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"fulcio",metal:{type:"barimium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-340714413,1525011343,50560746,-1948445052],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODc5MjUwNDk5MiwKICAicHJvZmlsZUlkIiA6ICI5MWYwNGZlOTBmMzY0M2I1OGYyMGUzMzc1Zjg2ZDM5ZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTdG9ybVN0b3JteSIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS85MzU2MjZhYzgwZmZmYWFiOTkyOWMwYWViNTg5N2RkN2FlOThjOWI5NTY1NjVjZTc3YTEyNjE0MjExYWI2NTg0IgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420115,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#D18A8A","translate":"item.gm4.metallurgy.band","fallback":"Barimium Band","with":[{"translate":"item.gm4.metallurgy.barimium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.fulcio","fallback":"Fulcio"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_fulcio_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_fulcio_shamir:band/v1",name:"[Drop to Fix Item] gm4_fulcio_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"fulcio",metal:{type:"barimium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/barimium",CustomModelData:3420115,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#D18A8A","translate":"item.gm4.metallurgy.band","fallback":"Barimium Band","with":[{"translate":"item.gm4.metallurgy.barimium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.fulcio","fallback":"Fulcio"}']}}} schedule function gm4_fulcio_shamir:main 1t schedule function gm4_fulcio_shamir:4_tick 1t diff --git a/gm4_heart_canisters/data/gm4/advancements/heart_canisters_max.json b/gm4_heart_canisters/data/gm4/advancements/heart_canisters_max.json index b1948216aa..53d84e9064 100644 --- a/gm4_heart_canisters/data/gm4/advancements/heart_canisters_max.json +++ b/gm4_heart_canisters/data/gm4/advancements/heart_canisters_max.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "player_head", - "nbt": "{CustomModelData:3420006,SkullOwner:{Id:[I;-320501529,-244889622,-2022276390,-292592904],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTgyOTM1NSwKICAicHJvZmlsZUlkIiA6ICI0ZTMwZjUwZTdiYWU0M2YzYWZkMmE3NDUyY2ViZTI5YyIsCiAgInByb2ZpbGVOYW1lIiA6ICJfdG9tYXRvel8iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzgxZmU0ZjA2YTM1ZWU3YzQyMzA5ZDM5M2MyNWJjMTFjZDFiNWIxNTBhMTllZGYzODllOGVjY2E0ZmNlMWRkZiIKICAgIH0KICB9Cn0=\"}]}}}" + "nbt": "{CustomModelData:3420006,SkullOwner:'$heart_canister_tier_2'}" }, "frame": "goal", "title": { diff --git a/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_1.json b/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_1.json index b4b24b1f9e..2fcbdb567f 100644 --- a/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_1.json +++ b/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_1.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "player_head", - "nbt": "{CustomModelData:3420004,SkullOwner:{Id:[I;1567268555,400377645,-2090593244,-1749540666],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTc2NTU0MSwKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjkxNzBhNzY4ZGY1MDQ1OTcwM2JkYWRkYjNlZGI2OTMyNmJkY2NjY2JmNDQxODM4MDM0YTI0N2I2NDFiN2UyZiIKICAgIH0KICB9Cn0=\"}]}}}" + "nbt": "{CustomModelData:3420004,SkullOwner:'$heart_canister_tier_1'}" }, "title": { "translate": "advancement.gm4.heart_canisters.tier_1.title", diff --git a/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_2.json b/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_2.json index 3f78e3e1c9..221ad07a82 100644 --- a/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_2.json +++ b/gm4_heart_canisters/data/gm4/advancements/heart_canisters_tier_2.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "player_head", - "nbt": "{CustomModelData:3420005,SkullOwner:{Id:[I;-320501529,-244889622,-2022276390,-292592904],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTgyOTM1NSwKICAicHJvZmlsZUlkIiA6ICI0ZTMwZjUwZTdiYWU0M2YzYWZkMmE3NDUyY2ViZTI5YyIsCiAgInByb2ZpbGVOYW1lIiA6ICJfdG9tYXRvel8iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzgxZmU0ZjA2YTM1ZWU3YzQyMzA5ZDM5M2MyNWJjMTFjZDFiNWIxNTBhMTllZGYzODllOGVjY2E0ZmNlMWRkZiIKICAgIH0KICB9Cn0=\"}]}}}" + "nbt": "{CustomModelData:3420005,SkullOwner:'$heart_canister_tier_2'}" }, "title": { "translate": "advancement.gm4.heart_canisters.tier_2.title", diff --git a/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_1.json b/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_1.json index 13b490e1d7..d307effb7a 100644 --- a/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_1.json +++ b/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_1.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{CustomModelData:3420060,SkullOwner:{Id:[I;1567268555,400377645,-2090593244,-1749540666],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTc2NTU0MSwKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjkxNzBhNzY4ZGY1MDQ1OTcwM2JkYWRkYjNlZGI2OTMyNmJkY2NjY2JmNDQxODM4MDM0YTI0N2I2NDFiN2UyZiIKICAgIH0KICB9Cn0=\"}]}}}" + "nbt": "{CustomModelData:3420060,SkullOwner:'$heart_canister_tier_1'}" }, "title": { "text": "Check your guidebook!", diff --git a/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_2.json b/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_2.json index 853d91a543..6c648cd827 100644 --- a/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_2.json +++ b/gm4_heart_canisters/data/gm4_guidebook/advancements/heart_canisters/page_2.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{CustomModelData:3420060,SkullOwner:{Id:[I;1567268555,400377645,-2090593244,-1749540666],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTc2NTU0MSwKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjkxNzBhNzY4ZGY1MDQ1OTcwM2JkYWRkYjNlZGI2OTMyNmJkY2NjY2JmNDQxODM4MDM0YTI0N2I2NDFiN2UyZiIKICAgIH0KICB9Cn0=\"}]}}}" + "nbt": "{CustomModelData:3420060,SkullOwner:'$heart_canister_tier_1'}" }, "title": { "text": "Check your guidebook!", diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/functions/init.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/functions/init.mcfunction index 10b45e9a30..d9f724c163 100644 --- a/gm4_heart_canisters/data/gm4_heart_canisters/functions/init.mcfunction +++ b/gm4_heart_canisters/data/gm4_heart_canisters/functions/init.mcfunction @@ -5,8 +5,8 @@ scoreboard objectives add gm4_heart_can dummy execute unless data storage gm4_player_heads:register heads[{id:"gm4_heart_canisters:heart_canister/tier_1/v0"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_heart_canisters:heart_canister/tier_1/v0",value:'eyJ0aW1lc3RhbXAiOjE0MjkzNDc5MDU4NzMsInByb2ZpbGVJZCI6IjYzY2JkZjhkNDg4OTQ3NWY5NDQxMjk3ZTRhM2Q1NjczIiwicHJvZmlsZU5hbWUiOiJWZWxlVCIsImlzUHVibGljIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTNjZjA2ZDViNDdiNzQ2ZDE2ZWU2MzExODdjYjg1N2Q4YzE2YmZjZDU3MGE0MGYyODZiMmMzODg2N2NmZGEifX19',item:{CustomModelData:3420007,gm4_heart_canister:1b,gm4_heart_canister_tier:1b,display:{Lore:['{"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["1"],"italic":false}'],Name:'{"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}'}}} execute unless data storage gm4_player_heads:register heads[{id:"gm4_heart_canisters:heart_canister/tier_2/v0"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_heart_canisters:heart_canister/tier_2/v0",value:'eyJ0aW1lc3RhbXAiOjE0MjkzNDc5OTc3ODcsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzQ1NWQ5YmY4NWFjNTY1YjM1ZTFmYTE5MjQ3Y2E2NTQxZGMyZTMzNGJlYzExNWNiNDQ5ZWZiZThlOWI4MTAyMiJ9fX0=',item:{CustomModelData:3420008,gm4_heart_canister:1b,gm4_heart_canister_tier:2b,display:{Lore:['{"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["2"],"italic":false}'],Name:'{"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}'}}} # new texture -execute unless data storage gm4_player_heads:register heads[{id:"gm4_heart_canisters:heart_canister/tier_1/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_heart_canisters:heart_canister/tier_1/v1",value:'ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTc2NTU0MSwKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjkxNzBhNzY4ZGY1MDQ1OTcwM2JkYWRkYjNlZGI2OTMyNmJkY2NjY2JmNDQxODM4MDM0YTI0N2I2NDFiN2UyZiIKICAgIH0KICB9Cn0=',item:{CustomModelData:3420007,gm4_heart_canister:1b,gm4_heart_canister_tier:1b,display:{Lore:['{"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["1"],"italic":false,"color":"gray"}'],Name:'{"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}'}}} -execute unless data storage gm4_player_heads:register heads[{id:"gm4_heart_canisters:heart_canister/tier_2/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_heart_canisters:heart_canister/tier_2/v1",value:'ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTgyOTM1NSwKICAicHJvZmlsZUlkIiA6ICI0ZTMwZjUwZTdiYWU0M2YzYWZkMmE3NDUyY2ViZTI5YyIsCiAgInByb2ZpbGVOYW1lIiA6ICJfdG9tYXRvel8iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzgxZmU0ZjA2YTM1ZWU3YzQyMzA5ZDM5M2MyNWJjMTFjZDFiNWIxNTBhMTllZGYzODllOGVjY2E0ZmNlMWRkZiIKICAgIH0KICB9Cn0=',item:{CustomModelData:3420008,gm4_heart_canister:1b,gm4_heart_canister_tier:2b,display:{Lore:['{"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["2"],"italic":false,"color":"gray"}'],Name:'{"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}'}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_heart_canisters:heart_canister/tier_1/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_heart_canisters:heart_canister/tier_1/v1",value:'$heart_canister_tier_1',item:{CustomModelData:3420007,gm4_heart_canister:1b,gm4_heart_canister_tier:1b,display:{Lore:['{"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["1"],"italic":false,"color":"gray"}'],Name:'{"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}'}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_heart_canisters:heart_canister/tier_2/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_heart_canisters:heart_canister/tier_2/v1",value:'$heart_canister_tier_2',item:{CustomModelData:3420008,gm4_heart_canister:1b,gm4_heart_canister_tier:2b,display:{Lore:['{"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["2"],"italic":false,"color":"gray"}'],Name:'{"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}'}}} 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 diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_1_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_1_heart_canister.json index b61ce54add..c0a9a47794 100644 --- a/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_1_heart_canister.json +++ b/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_1_heart_canister.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420007,gm4_heart_canister:1b,gm4_heart_canister_tier:1b,SkullOwner:{Id:[I;1567268555,400377645,-2090593244,-1749540666],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTc2NTU0MSwKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjkxNzBhNzY4ZGY1MDQ1OTcwM2JkYWRkYjNlZGI2OTMyNmJkY2NjY2JmNDQxODM4MDM0YTI0N2I2NDFiN2UyZiIKICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{CustomModelData:3420007,gm4_heart_canister:1b,gm4_heart_canister_tier:1b,SkullOwner:'$heart_canister_tier_1'}" }, { "function": "minecraft:set_name", diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_2_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_2_heart_canister.json index 0647dbfca0..a73f1e7da4 100644 --- a/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_2_heart_canister.json +++ b/gm4_heart_canisters/data/gm4_heart_canisters/loot_tables/items/tier_2_heart_canister.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420008,gm4_heart_canister:1b,gm4_heart_canister_tier:2b,SkullOwner:{Id:[I;-320501529,-244889622,-2022276390,-292592904],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxNjM4NTgyOTM1NSwKICAicHJvZmlsZUlkIiA6ICI0ZTMwZjUwZTdiYWU0M2YzYWZkMmE3NDUyY2ViZTI5YyIsCiAgInByb2ZpbGVOYW1lIiA6ICJfdG9tYXRvel8iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzgxZmU0ZjA2YTM1ZWU3YzQyMzA5ZDM5M2MyNWJjMTFjZDFiNWIxNTBhMTllZGYzODllOGVjY2E0ZmNlMWRkZiIKICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{CustomModelData:3420008,gm4_heart_canister:1b,gm4_heart_canister_tier:2b,SkullOwner:'$heart_canister_tier_2'}" }, { "function": "minecraft:set_name", 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 new file mode 100644 index 0000000000..ff6341ce89 Binary files /dev/null and b/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_1.png 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 new file mode 100644 index 0000000000..2c89c2685d Binary files /dev/null and b/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_2.png differ diff --git a/gm4_iacio_shamir/data/gm4_iacio_shamir/functions/init.mcfunction b/gm4_iacio_shamir/data/gm4_iacio_shamir/functions/init.mcfunction index 18667f5c14..2bc07c78a3 100644 --- a/gm4_iacio_shamir/data/gm4_iacio_shamir/functions/init.mcfunction +++ b/gm4_iacio_shamir/data/gm4_iacio_shamir/functions/init.mcfunction @@ -14,7 +14,7 @@ scoreboard players set iacio_shamir gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_iacio_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_iacio_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_iacio_shamir:band/v1",name:"[Drop to Fix Item] gm4_iacio_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"iacio",metal:{type:"barium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-758190455,118414880,1677653096,2076204799],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODg4MzkzODA4MiwKICAicHJvZmlsZUlkIiA6ICJmNThkZWJkNTlmNTA0MjIyOGY2MDIyMjExZDRjMTQwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJ1bnZlbnRpdmV0YWxlbnQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGMxMzcwMGVlMGViYzgwOTU2N2IxYTNjOTFhYzhjMWFhMmJiNWNlYjQ4YWRlNzZlOGJkN2QzMWE5Y2EzYjdkIgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420122,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F0EAD6","translate":"item.gm4.metallurgy.band","fallback":"Barium Band","with":[{"translate":"item.gm4.metallurgy.barium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.iacio","fallback":"Iacio"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_iacio_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_iacio_shamir:band/v1",name:"[Drop to Fix Item] gm4_iacio_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"iacio",metal:{type:"barium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/barium",CustomModelData:3420122,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F0EAD6","translate":"item.gm4.metallurgy.band","fallback":"Barium Band","with":[{"translate":"item.gm4.metallurgy.barium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.iacio","fallback":"Iacio"}']}}} # guidebook execute if score gm4_guidebook load.status matches 1 run summon marker ~ 1861.593306342615 ~ {CustomName:'"gm4_iacio_shamir_guide"',Tags:["gm4_guide"],data:{type:"_expansion",base:"metallurgy",id:"iacio_shamir",page_count:2,line_count:1,module_name:"Iacio Shamir"}} diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/brewing_stand/texture_connector/check_structure.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/brewing_stand/texture_connector/check_structure.mcfunction index 71fcde2f44..a453f855bb 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/brewing_stand/texture_connector/check_structure.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/brewing_stand/texture_connector/check_structure.mcfunction @@ -3,5 +3,5 @@ # at @s # run from main -execute if block ~ ~1 ~ lightning_rod[facing=up] align xyz unless entity @e[tag=gm4_lightning_rod_texture_connector,dy=0.01,limit=1] run summon item_display ~0.5 ~1 ~0.5 {Tags:["gm4_lightning_rod_texture_connector"],item:{id:"minecraft:player_head",Count:1b,tag:{SkullOwner:{Id:[I;1196754309,1130089731,-1851853423,152678880],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYzNzc3MDAzOTc2OCwKICAicHJvZmlsZUlkIiA6ICJmODJmNTQ1MDIzZDA0MTFkYmVlYzU4YWI4Y2JlMTNjNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZXNwb25kZW50cyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzEzZjIxN2U5NmJmY2VhNjIwZTc3YTIzNjRjYTBkNmE0ZTdhN2UwOGMzNzAzNzI3ODI4MTQ4ZjQxNjM0YmVjIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="}]}}}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.25,0.25,0.25]}} +execute if block ~ ~1 ~ lightning_rod[facing=up] align xyz unless entity @e[tag=gm4_lightning_rod_texture_connector,dy=0.01,limit=1] run summon item_display ~0.5 ~1 ~0.5 {Tags:["gm4_lightning_rod_texture_connector"],item:{id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"$texture_connector"}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.25,0.25,0.25]}} execute unless block ~ ~1 ~ lightning_rod[facing=up] align xyz run kill @e[type=item_display,tag=gm4_lightning_rod_texture_connector,dy=0.01] diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/liquid_tanks/liquid_init/lightning.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/liquid_tanks/liquid_init/lightning.mcfunction index 152a91f05e..1cc990c9d0 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/liquid_tanks/liquid_init/lightning.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/liquid_tanks/liquid_init/lightning.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.lightning","fallback":"Lightning Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.lightning","fallback":"Lightning Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Silent:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138570753,-1614258158,-884567317],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYzODMwMzcyNDQ2NywKICAicHJvZmlsZUlkIiA6ICI4MmM2MDZjNWM2NTI0Yjc5OGI5MWExMmQzYTYxNjk3NyIsCiAgInByb2ZpbGVOYW1lIiA6ICJOb3ROb3RvcmlvdXNOZW1vIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y3ZjA1OWRiZTJhZDIxZTlmMzZiY2U3NmYyY2YyOGI5ZDdlOGFmN2Q4OTE0MDdhYWYwYTE2OTk3MTJhMmE2YmEiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Silent:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$lightning_liquid"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_liab_lightning" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_liab_lightning diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/upgrade_paths/1.4.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/upgrade_paths/1.4.mcfunction index 5595621073..f8168760df 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/upgrade_paths/1.4.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/functions/upgrade_paths/1.4.mcfunction @@ -1,4 +1,4 @@ # upgrades armor-stand gm4_lightning_rod_texture_connector's to item_displays -execute as @e[type=armor_stand,tag=gm4_lightning_rod_texture_connector] at @s align xyz run summon item_display ~0.5 ~1 ~0.5 {Tags:["gm4_lightning_rod_texture_connector"],item:{id:"minecraft:player_head",Count:1b,tag:{SkullOwner:{Id:[I;1196754309,1130089731,-1851853423,152678880],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYzNzc3MDAzOTc2OCwKICAicHJvZmlsZUlkIiA6ICJmODJmNTQ1MDIzZDA0MTFkYmVlYzU4YWI4Y2JlMTNjNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZXNwb25kZW50cyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzEzZjIxN2U5NmJmY2VhNjIwZTc3YTIzNjRjYTBkNmE0ZTdhN2UwOGMzNzAzNzI3ODI4MTQ4ZjQxNjM0YmVjIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="}]}}}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.25,0.25,0.25]}} +execute as @e[type=armor_stand,tag=gm4_lightning_rod_texture_connector] at @s align xyz run summon item_display ~0.5 ~1 ~0.5 {Tags:["gm4_lightning_rod_texture_connector"],item:{id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"$texture_connector"}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.25,0.25,0.25]}} kill @e[type=armor_stand,tag=gm4_lightning_rod_texture_connector] diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/skins/lightning_liquid.png b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/skins/lightning_liquid.png new file mode 100644 index 0000000000..f6fe75edf0 Binary files /dev/null and b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/skins/lightning_liquid.png differ diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/skins/texture_connector.png b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/skins/texture_connector.png new file mode 100644 index 0000000000..184e8078f3 Binary files /dev/null and b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/skins/texture_connector.png differ diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/functions/liquid_value_update.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/functions/liquid_value_update.mcfunction index 6911555a98..a4f84243e9 100644 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/functions/liquid_value_update.mcfunction +++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/functions/liquid_value_update.mcfunction @@ -7,10 +7,10 @@ scoreboard players operation @s gm4_lm_data *= #100 gm4_lm_data scoreboard players operation @s gm4_lm_data /= @s gm4_lt_max #1%-50% -execute if score @s gm4_lt_value matches 1.. if score @s gm4_lm_data matches 0..50 run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:{Id:[I;1120840726,453134473,-1920599881,-1587040077],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTEzNjg2ZjIxMDY1YTRiZTZjYzU3MDYxZDhlNzM2MDQ3MzQ2YzU4NmEzYTU1OWMwMzdhMDMxNGJjNDUyOTA4MSJ9fX0="}]}}}} +execute if score @s gm4_lt_value matches 1.. if score @s gm4_lm_data matches 0..50 run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"$liquid_minecart_display/low"}} #51%-99% -execute unless score @s gm4_lt_value = @s gm4_lt_max if score @s gm4_lm_data matches 51..100 run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:{Id:[I;-325521224,-1751038048,-1752797071,-316499442],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmFjOTBjM2ZmNWI5NzBhNTIyNTliNTdhNDlmMjFmOGE1NTdmZmIxYTM2ZmNjNDkwMDQyMTQzNDZkOWViN2RmZCJ9fX0="}]}}}} +execute unless score @s gm4_lt_value = @s gm4_lt_max if score @s gm4_lm_data matches 51..100 run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"$liquid_minecart_display/high"}} #100% -execute if score @s gm4_lt_value = @s gm4_lt_max run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:{Id:[I;-6800160,1470582470,-1663082352,-568664979],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2M5OTI4ODgxNGY1ODVjN2JjMmU1NWQ0NDY0ZDUzOGQwZDlkOWM4YjE4NzRiZTA5ZDc4Yjk3YzA3YzAwYWIxYSJ9fX0="}]}}}} +execute if score @s gm4_lt_value = @s gm4_lt_max run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"$liquid_minecart_display/full"}} #0% -execute if score @s gm4_lt_value matches 0 run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:{Id:[I;119585825,206784598,-1119495979,-520523912],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjhiMjU1MjJjMzFiZmU0Y2VhMTAxMDA4MGQ1YTFiOWIwOGU3NWJhZTUzOGRhODk3MmNiZGQ2YTk0Mzk5MjEyYSJ9fX0="}]}}}} +execute if score @s gm4_lt_value matches 0 run data modify entity @e[type=armor_stand,tag=gm4_liquid_minecart_stand,limit=1,sort=nearest] ArmorItems[3] merge value {id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"$liquid_minecart_display/empty"}} diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/empty.png b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/empty.png new file mode 100644 index 0000000000..9c00b6d023 Binary files /dev/null and b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/empty.png differ diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/full.png b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/full.png new file mode 100644 index 0000000000..322692a7dc Binary files /dev/null and b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/full.png differ diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/high.png b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/high.png new file mode 100644 index 0000000000..cd07c9773b Binary files /dev/null and b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/high.png differ diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/low.png b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/low.png new file mode 100644 index 0000000000..b0afbab86a Binary files /dev/null and b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/skins/liquid_minecart_display/low.png differ diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_tables/items/liquid_tank.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_tables/items/liquid_tank.json index 9180165e33..39fe29d3e5 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_tables/items/liquid_tank.json +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_tables/items/liquid_tank.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420132,gm4_machines:{id:\"liquid_tank\"},SkullOwner:{Name:\"gm4_liquid_tank\",Id:[I;506554253,2099987480,-1876292803,1704690390],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1NDI1OTYyNSwKICAicHJvZmlsZUlkIiA6ICJiNzVjZDRmMThkZjg0MmNlYjJhY2MxNTU5MTNiMjA0YiIsCiAgInByb2ZpbGVOYW1lIiA6ICJLcmlzdGlqb25hczEzIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzFlOGI5ZjNiODgwNjIzZDNlM2ZmZGZkNmUyZTljYTY0OWQ0ODcyMDY0YzY0NmUyNWNjNDEyZGYzYTZjNmRlMTkiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{CustomModelData:3420132,gm4_machines:{id:\"liquid_tank\"},SkullOwner:{Name:\"gm4_liquid_tank\",Id:[I;506554253,2099987480,-1876292803,1704690390],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$liquid_tank\"}]}}}" }, { "function": "set_name", diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/skins/liquid_tank.png b/gm4_liquid_tanks/data/gm4_liquid_tanks/skins/liquid_tank.png new file mode 100644 index 0000000000..7292e529e8 Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_liquid_tanks/skins/liquid_tank.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/beetroot_soup.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/beetroot_soup.mcfunction index c63c865b49..a860fb5ac0 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/beetroot_soup.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/beetroot_soup.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.beetroot_soup","fallback":"Beetroot Soup Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.beetroot_soup","fallback":"Beetroot Soup Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636291,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0OTgxODE5OTY3NDIsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzRkOTM0ZWRiMzRjM2IxNmRlZWNmMjRkZjhmMTc1NTQyZDAxZWMwNTJmZWZkOTEzNjI4MWJiNmE2Y2E3ZDdkIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/beetroot_soup"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_beetroot_soup" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_beetroot_soup diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/experience.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/experience.mcfunction index 99f3a8a15f..9cdc3efc63 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/experience.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/experience.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.experience","fallback":"Experience Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.experience","fallback":"Experience Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;-1627825275,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc3NzA2NjksInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzNlYTI4YzJkYzZjOWQyMjdhNWNmNDM1MTI5ZDgwNjVkMzJiYjY0NDk5N2QzNTllNzQ4YTRjYzE0NWEzNjlhIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/experience"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_experience" scoreboard players set @s gm4_lt_max 1395 tag @s add gm4_lt_experience diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/glow_ink.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/glow_ink.mcfunction index 0cf89d98e3..2fada45897 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/glow_ink.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/glow_ink.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.glow_ink","fallback":"Glow Ink Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.glow_ink","fallback":"Glow Ink Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138570753,-1614258158,-884567317],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyNzQyMDQ0MTc4MiwKICAicHJvZmlsZUlkIiA6ICIyMjg0NDBlODcyYzg0ZGM3ODM0OGIyNzc1ODUwMzRjOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJTcGVjaWFsQnVpbGRlcjMyIiwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2ZjYjc1NzljZWQ1NTRiZWU0ZmQ5ZmZhMGYzYjQ5NGU0YjJhOWE4MDBmM2ZiNmI4Yjc0YjVlMmU3MThjMTgzYmEiCiAgICB9CiAgfQp9"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/glow_ink"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_glow_ink" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_glow_ink diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/honey.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/honey.mcfunction index 7fc8bf7ae6..636db308b7 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/honey.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/honey.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.honey","fallback":"Honey Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.honey","fallback":"Honey Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;-782351782,542655898,-1075183804,1293758076],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE1ODYwNDAzNDcxNzIsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2QyZDBlZDU3ZGQwNWYxMGExNTk5ZDFkNWY2Mzg0ZGMxYzgzNWM5ZWVmYWQ5MDFjNTdkZDkxZDg1YWM5MWFjZWIifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/honey"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_honey" scoreboard players set @s gm4_lt_max 400 tag @s add gm4_lt_honey diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/ink.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/ink.mcfunction index 1515ea8f7f..cd51d7ad4c 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/ink.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/ink.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.ink","fallback":"Ink Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.ink","fallback":"Ink Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2112341109,-1138570753,-1614258018,-889714137],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyNzQyMDI0MjQ3OCwKICAicHJvZmlsZUlkIiA6ICIyMjg0NDBlODcyYzg0ZGM3ODM0OGIyNzc1ODUwMzRjOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJTcGVjaWFsQnVpbGRlcjMyIiwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Q5NjAzYmMyODg0M2RhYjVjOTEzYTkxNmVkMzIxZGZhNTFlMzlkZGVjZDA5YWIyMzNiZjViZDNhMDM1ZjlhNWMiCiAgICB9CiAgfQp9"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/ink"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_ink" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_ink diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/lava.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/lava.mcfunction index 4cb7a8a372..7d7545d918 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/lava.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/lava.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.lava","fallback":"Lava Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.lava","fallback":"Lava Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDM2NDg0MTcsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2YyNWJmOTlmYjdlMmQwZTFhZDQ1MDgyNGUyMmQzNDllNjc3Zjk2YzNkOWFmZjcyMTVlNDdiNjU3N2EzMmI4YyJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/lava"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_lava" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_lava diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/milk.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/milk.mcfunction index 49ea22f4f5..f1ba5c59df 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/milk.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/milk.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.milk","fallback":"Milk Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.milk","fallback":"Milk Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271365,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDQxMzEyNjcsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2ExYTk2M2I1ZjYwM2IxODYyY2VhZjg1MGYxN2QzNWFhMjcxMzBiODQ2NjY0ZDJkYTlmZWRkYTMzMDQwIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/milk"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_milk" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_milk diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/mushroom_stew.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/mushroom_stew.mcfunction index aef2a1a451..9016b78d37 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/mushroom_stew.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/mushroom_stew.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.mushroom_stew","fallback":"Mushroom Stew Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.mushroom_stew","fallback":"Mushroom Stew Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636289,-1614258018,-889714316],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYwMDU2MjksInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2VmZTg5ZjEyZjA2N2ViMzlmYTlkZGY4N2U3ZmZiYmRlZmZjZDAyZjVjMThjYjIyNjFkMGY0NDk4YjgxYjQxNyJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/mushroom_stew"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_mushroom_stew" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_mushroom_stew diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/powder_snow.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/powder_snow.mcfunction index 1700df170a..183d49e111 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/powder_snow.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/powder_snow.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.powder_snow","fallback":"Powder Snow Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.powder_snow","fallback":"Powder Snow Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271365,-1134446289,-1614258018,-889714317],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyNzMyNzg2NzMwNSwKICAicHJvZmlsZUlkIiA6ICIyMjg0NDBlODcyYzg0ZGM3ODM0OGIyNzc1ODUwMzRjOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJTcGVjaWFsQnVpbGRlcjMyIiwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2I0YTVhMDQxZTI0YWQ5NWY5ZmFkYTVhZTZiNjc1ZjBhYmU4NWI3OGIxZDhmNGUxNTI5Mzg1NDJjZDE2ZWY5YzUiCiAgICB9CiAgfQp9"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/powder_snow"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_powder_snow" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_powder_snow diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/rabbit_stew.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/rabbit_stew.mcfunction index cfe98578ad..8c94228468 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/rabbit_stew.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/rabbit_stew.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.rabbit_stew","fallback":"Rabbit Stew Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.rabbit_stew","fallback":"Rabbit Stew Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271365,-1138636289,-1614258019,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYwNjgzODksInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2UwNTJkZWRmN2ZmNDk1MDQ3MjNmMDRhZGViMzRmNjlkYTI4OTJhMmI3YzM3NTRmZWZhYjBkNzgxODg1NzVjIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/rabbit_stew"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_rabbit_stew" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_rabbit_stew diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/water.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/water.mcfunction index 82d3efeee5..ac0c14c990 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/water.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/functions/liquid_init/water.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.water","fallback":"Water Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.water","fallback":"Water Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138570753,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDQ4ODY3MTgsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzYzMWY5MjQwYjE2NmJhOGViMWY2YmU0MzVjZGI3NDg2YTM5YzQzYTdjMWQzZDM2ZTQ5NzgzYWU0NTI2ZDNiNDMifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_standard_liquids:liquids/water"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_water" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_water diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/beetroot_soup.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/beetroot_soup.png new file mode 100644 index 0000000000..ed3e7d10b2 Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/beetroot_soup.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/experience.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/experience.png new file mode 100644 index 0000000000..b0bc275a7e Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/experience.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/glow_ink.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/glow_ink.png new file mode 100644 index 0000000000..77d7716ce4 Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/glow_ink.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/honey.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/honey.png new file mode 100644 index 0000000000..7213c9a3aa Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/honey.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/ink.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/ink.png new file mode 100644 index 0000000000..6277f7ebab Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/ink.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/lava.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/lava.png new file mode 100644 index 0000000000..180aba1d12 Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/lava.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/milk.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/milk.png new file mode 100644 index 0000000000..5114efa78b Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/milk.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/mushroom_stew.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/mushroom_stew.png new file mode 100644 index 0000000000..5ff6fc8d2b Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/mushroom_stew.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/powder_snow.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/powder_snow.png new file mode 100644 index 0000000000..d548770e29 Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/powder_snow.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/rabbit_stew.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/rabbit_stew.png new file mode 100644 index 0000000000..835bc7529d Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/rabbit_stew.png differ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/water.png b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/water.png new file mode 100644 index 0000000000..1d750635f3 Binary files /dev/null and b/gm4_liquid_tanks/data/gm4_standard_liquids/skins/liquids/water.png differ diff --git a/gm4_lumos_shamir/data/gm4_lumos_shamir/functions/init.mcfunction b/gm4_lumos_shamir/data/gm4_lumos_shamir/functions/init.mcfunction index 5591bb7c81..179495056d 100644 --- a/gm4_lumos_shamir/data/gm4_lumos_shamir/functions/init.mcfunction +++ b/gm4_lumos_shamir/data/gm4_lumos_shamir/functions/init.mcfunction @@ -6,7 +6,7 @@ scoreboard players set lumos_shamir gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_lumos_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_lumos_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_lumos_shamir:band/v1",name:"[Drop to Fix Item] gm4_lumos_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"lumos",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-1332644679,659216762,2108439484,664728976],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODAyOTI2NzM2NiwKICAicHJvZmlsZUlkIiA6ICI3ZmIyOGQ1N2FhZmQ0MmQ1YTcwNWNlZjE4YWI1MzEzZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJjaXJjdWl0MTAiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2MzMTBmZDk3YjFhN2Q3MDkwOGExODc2N2FjZmRjYzYwZDJhMTU1NTY5Zjk0YThmYjZhZWUxYTMzMWE5MjM4IgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420114,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.lumos","fallback":"Lumos"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_lumos_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_lumos_shamir:band/v1",name:"[Drop to Fix Item] gm4_lumos_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"lumos",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/curies_bismium",CustomModelData:3420114,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.lumos","fallback":"Lumos"}']}}} schedule function gm4_lumos_shamir:main 4t diff --git a/gm4_metallurgy/data/gm4/advancements/metallurgy_blast_ore.json b/gm4_metallurgy/data/gm4/advancements/metallurgy_blast_ore.json index 4f10bf7012..6608acce15 100644 --- a/gm4_metallurgy/data/gm4/advancements/metallurgy_blast_ore.json +++ b/gm4_metallurgy/data/gm4/advancements/metallurgy_blast_ore.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{CustomModelData:3420049,SkullOwner:{Id:[I;140191582,-1151712444,-1271445916,307298631],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODE0MDk5OTEzMzMsInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzdmNTRiOTc5Y2Y0YzUzM2Q5OTVjMDdiOTljMWU5OWI5MTdlYzA2ODU2ZDQ2YjBhMmU2ODhiYmQzZDE0ZSJ9LCJDQVBFIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWMzY2E3ZWUyYTQ5OGYxYjVkMjU4ZDVmYTkyN2U2M2U0MzMxNDNhZGQ1NTM4Y2Y2M2I2YTliNzhhZTczNSJ9fX0=\"}]}}}" + "nbt": "{CustomModelData:3420049,SkullOwner:\"$gm4_metallurgy:ore/aluminium\"}" }, "title": { "translate": "advancement.gm4.metallurgy.blast_ore.title", diff --git a/gm4_metallurgy/data/gm4/advancements/metallurgy_cast.json b/gm4_metallurgy/data/gm4/advancements/metallurgy_cast.json index b783521ffc..18b01144ce 100644 --- a/gm4_metallurgy/data/gm4/advancements/metallurgy_cast.json +++ b/gm4_metallurgy/data/gm4/advancements/metallurgy_cast.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{CustomModelData:3420050,SkullOwner:{Id:[I;1961294324,1560605478,885901402,915511979],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODE2NjMyMjQ2MTUsInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTc5ZWRhYmI2MjU1YzhkMjQyOWE3ZTUzM2U4MzUxOWE4NjVhNTk0ZGJmMTRhMTdjZjVhYzIxMzUzYTM5N2U3In19fQ==\"}]}}}" + "nbt": "{CustomModelData:3420050,SkullOwner:\"$gm4_metallurgy:band/aluminium\"}" }, "title": { "translate": "advancement.gm4.metallurgy.cast.title", diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_aluminium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_aluminium.mcfunction index fd25ae6c92..0ae82cb047 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_aluminium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_aluminium.mcfunction @@ -3,7 +3,7 @@ # add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$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:1b,tag:{CustomModelData:3420001,display:{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 block andesite ~.45 ~0.1 ~.65 .1 .1 .1 0 9 diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barimium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barimium.mcfunction index ff760b16da..8529dac2d8 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barimium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barimium.mcfunction @@ -3,7 +3,7 @@ # add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$mould/hot_metal"} # add primary metal scoreboard players operation @s gm4_ml_ore_al += $metal_amount gm4_ml_data diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barium.mcfunction index 68980dc305..e7ee28808f 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_barium.mcfunction @@ -3,7 +3,7 @@ #add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$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:1b,tag:{CustomModelData:3420001,display:{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 block granite ~.45 ~0.1 ~.65 .1 .1 .1 0 9 diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_bismuth.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_bismuth.mcfunction index bd7152bd84..a75b015f1e 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_bismuth.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_bismuth.mcfunction @@ -3,7 +3,7 @@ # add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$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:1b,tag:{CustomModelData:3420001,display:{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 block stone ~.45 ~0.1 ~.65 .1 .1 .1 0 9 diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_copper.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_copper.mcfunction index 9c6db26b58..efab8c579c 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_copper.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_copper.mcfunction @@ -3,7 +3,7 @@ #add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$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:1b,tag:{CustomModelData:3420001,display:{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 block stone ~.45 ~0.1 ~.65 .1 .1 .1 0 9 diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_curies_bismium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_curies_bismium.mcfunction index 135d19dd42..7fc7e2b321 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_curies_bismium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_curies_bismium.mcfunction @@ -3,7 +3,7 @@ # add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$mould/hot_metal"} # add primary metal scoreboard players operation @s gm4_ml_ore_th += $metal_amount gm4_ml_data diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium.mcfunction index 0baa307b11..d406d9ef75 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium.mcfunction @@ -3,7 +3,7 @@ # add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$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:1b,tag:{CustomModelData:3420001,display:{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 block diorite ~.45 ~0.1 ~.65 .1 .1 .1 0 9 diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium_brass.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium_brass.mcfunction index a3a65b3d4f..2bcfd62908 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium_brass.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/add_metal/add_thorium_brass.mcfunction @@ -3,7 +3,7 @@ # add score to sand ring tag @s add gm4_contains_metal -data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$mould/hot_metal"} # add primary metal scoreboard players operation @s gm4_ml_ore_th += $metal_amount gm4_ml_data diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/create_mould.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/create_mould.mcfunction index 427d951638..094a0d87e0 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/create_mould.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/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 check_mould_creation -summon armor_stand ~.45 ~-1.150 ~.65 {CustomName:'"gm4_sand_ring"',Tags:["gm4_sand_ring","gm4_new_sand_ring"],ArmorItems:[{id:"minecraft:stick",Count:1b},{},{},{id:"minecraft:player_head",Count:1,tag:{CustomModelData:3420023,SkullOwner:{Id:[I;140191582,-1151712444,-1271441790,1896239124],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0Nzk4NTI1MDM5MzksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWZhYmExYzg3NTFjYWIzZjEyZjJlODgwMTRjZjRlYmY2N2ZjNWQ3NGNmY2U5YmUyNTI1YWQ0OWE5MjFkY2YyIn0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}}}],Silent:1,Invulnerable:1,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"],ArmorItems:[{id:"minecraft:stick",Count:1b},{},{},{id:"minecraft:player_head",Count:1,tag:{CustomModelData:3420023,SkullOwner:"$mould/cool_empty"}}],Silent:1,Invulnerable:1,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/functions/casting/set_mould.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/set_mould.mcfunction index 46f9e9d94e..93f2d8d587 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/set_mould.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/set_mould.mcfunction @@ -15,7 +15,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:1b,tag:{CustomModelData:3420022,SkullOwner:{Name:"[Drop to Fix Item] gm4_metallurgy:band/mundane/v0",Id:[I;2090045838,1070000930,-1136417339,1085846924],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE2NjMzMzg5MDksInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzQ4MGNjMjY3M2ZmMjhkNTEzNDY0MTMxN2FiYzUzMWU5ZTFjZWU3MTFlYWJmYWY3YzJhZDY1M2E0NmQxZmI3In19fQ=="}]}},display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',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:1b,tag:{CustomModelData:3420022,SkullOwner:{Name:"[Drop to Fix Item] gm4_metallurgy:band/mundane/v0",Properties:{textures:[{Value:"$band/mundane"}]}},display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',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/functions/casting/sustain_mould.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/sustain_mould.mcfunction index e8f32805fa..6e04b77709 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/functions/casting/sustain_mould.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/functions/casting/sustain_mould.mcfunction @@ -16,16 +16,16 @@ execute if score @s gm4_ml_heat matches 50..89 align xyz positioned ~ ~1 ~ as @e execute if score @s gm4_ml_heat matches 50..89 align xyz positioned ~ ~1 ~ if entity @e[type=item,nbt={Item:{Count:1b,tag:{gm4_metallurgy:{metal:{castable:1b}}}},OnGround:1b},dx=0,dy=0,dz=0] run function gm4_metallurgy:casting/add_metal/initialize # hot ring without metal -execute if score @s[tag=!gm4_contains_metal] gm4_ml_heat matches 50..51 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420024,SkullOwner:{Id:[I;140191582,-1151712444,-1271434748,932201856],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE3MjM4MDYsInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTc0NTVkNjg3MjJkOTU3ZmI1ZGVjZGNjY2NjMWI2MWU4NzlhOTY3ZjFiZGM3YzJhMmZkMTlhYTI3OWU4ODUifSwiQ0FQRSI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzVjM2NhN2VlMmE0OThmMWI1ZDI1OGQ1ZmE5MjdlNjNlNDMzMTQzYWRkNTUzOGNmNjNiNmE5Yjc4YWU3MzUifX19"}]}}} +execute if score @s[tag=!gm4_contains_metal] gm4_ml_heat matches 50..51 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420024,SkullOwner:"$mould/hot_empty"} # hot ring with metal -execute if score @s[tag=gm4_contains_metal] gm4_ml_heat matches 50..51 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:{Id:[I;140191582,-1151712444,-1271433465,-1758951935],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE2NTQxODksInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZkMTEwNmNjZDhhY2E3NDg4N2Q1ODIwNTU0YmZiMzM5YzdhM2NmOTJjNDY1MTU2MmM2NmZiNzZkMTQ0In0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +execute if score @s[tag=gm4_contains_metal] gm4_ml_heat matches 50..51 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420026,SkullOwner:"$mould/hot_metal"} # cool (I'm way too awesome!) ring without metals -execute if score @s[tag=!gm4_contains_metal] gm4_ml_heat matches 48..49 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420023,SkullOwner:{Id:[I;140191582,-1151712444,-1271450254,-1988033943],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE0NTAzOTYsInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWZhYmExYzg3NTFjYWIzZjEyZjJlODgwMTRjZjRlYmY2N2ZjNWQ3NGNmY2U5YmUyNTI1YWQ0OWE5MjFkY2YyIn0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ=="}]}}} +execute if score @s[tag=!gm4_contains_metal] gm4_ml_heat matches 48..49 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420023,SkullOwner:"$mould/cool_empty"} # cool ring with metal -execute if score @s[tag=gm4_contains_metal] gm4_ml_heat matches 48..49 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420025,SkullOwner:{Id:[I;140191582,-1151712444,-1271443335,826741136],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0ODE0MTE1NjYwMjQsInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjM3ZjE2Zjc2MTk1ZWM3OWI4MzFmMzc5ZjkzYjYwYzg2MWZkNGNhYmYyZTI5ZDNmZTlkYTJmODU4OTJkY2EifSwiQ0FQRSI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzVjM2NhN2VlMmE0OThmMWI1ZDI1OGQ1ZmE5MjdlNjNlNDMzMTQzYWRkNTUzOGNmNjNiNmE5Yjc4YWU3MzUifX19"}]}}} +execute if score @s[tag=gm4_contains_metal] gm4_ml_heat matches 48..49 run data modify entity @s ArmorItems[3].tag set value {CustomModelData:3420025,SkullOwner:"$mould/cool_metal"} execute if score @s gm4_ml_heat matches 56.. run particle lava ~ ~1 ~ 0 0 0 0.005 1 diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/aluminium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/aluminium_band.json index 2a67b9c763..cf27e81bd7 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/aluminium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/aluminium_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"aluminium\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;1961294324,1560605478,885901402,915511979],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyODc4ODAzNjY3NCwKICAicHJvZmlsZUlkIiA6ICI2MjM5ZWRhM2ExY2Y0YjJiYWMyODk2NGQ0NmNlOWVhOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGYXRGYXRHb2QiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGQ3MTQ5OTY0MDNlMTNhNGE4ZTc4OTQ0OWNjN2I5OGRhMmI4NDc1NTRjNDgwZGUyMDUxOTcwYjIxODIzZGJkOSIKICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"aluminium\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:\"$band/aluminium\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barimium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barimium_band.json index 979a182138..c51caa12ac 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barimium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barimium_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"barimium\",amount:[9s,3s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;-340714413,1525011343,50560746,-1948445052],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyODc5MjUwNDk5MiwKICAicHJvZmlsZUlkIiA6ICI5MWYwNGZlOTBmMzY0M2I1OGYyMGUzMzc1Zjg2ZDM5ZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTdG9ybVN0b3JteSIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS85MzU2MjZhYzgwZmZmYWFiOTkyOWMwYWViNTg5N2RkN2FlOThjOWI5NTY1NjVjZTc3YTEyNjE0MjExYWI2NTg0IgogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"barimium\",amount:[9s,3s],castable:1b},item:\"obsidian_cast\"},SkullOwner:\"$band/barimium\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barium_band.json index 843f6ad422..2fdc894ce5 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/barium_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"barium\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;-758190455,118414880,1677653096,2076204799],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyODg4MzkzODA4MiwKICAicHJvZmlsZUlkIiA6ICJmNThkZWJkNTlmNTA0MjIyOGY2MDIyMjExZDRjMTQwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJ1bnZlbnRpdmV0YWxlbnQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGMxMzcwMGVlMGViYzgwOTU2N2IxYTNjOTFhYzhjMWFhMmJiNWNlYjQ4YWRlNzZlOGJkN2QzMWE5Y2EzYjdkIgogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"barium\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:\"$band/barium\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/baryte_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/baryte_lump.json index ec5ff4adfd..02c14d1f25 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/baryte_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/baryte_lump.json @@ -39,7 +39,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{metal:{type:\"barium\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420019,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/barium/v0\",Id:[I;140191582,-1151712444,-1271442552,1879524245],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyOTY4NDI1Njk5MSwKICAicHJvZmlsZUlkIiA6ICJiMGQ0YjI4YmMxZDc0ODg5YWYwZTg2NjFjZWU5NmFhYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNaW5lU2tpbl9vcmciLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjg5ZjJlZjhmZTJlMzhlM2I1YzliMzU0N2M3ZTFmODUzYTlhNDQ4MjFiZDllZTI1YmQ2ODhiYTY0MzcwZTk2MyIKICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{gm4_metallurgy:{metal:{type:\"barium\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420019,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/barium/v0\",Properties:{textures:[{Value:\"$ore/barium\"}]}}}" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bauxite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bauxite_lump.json index 287adff79f..ab9494fe68 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bauxite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bauxite_lump.json @@ -39,7 +39,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{metal:{type:\"aluminium\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420021,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/aluminium/v0\",Id:[I;140191582,-1151712444,-1271445916,307298631],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyOTY4NDMzNDA1MiwKICAicHJvZmlsZUlkIiA6ICI3ZmIyOGQ1N2FhZmQ0MmQ1YTcwNWNlZjE4YWI1MzEzZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJjaXJjdWl0MTAiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjU1MTdhNjYyYTgzY2FhYWFjMWE3MTMzMmUzODFiYmZmYzkxYjJhNjBhODc1Y2NhZDhmZTM4ZGM3NWRlZDU0OSIKICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{gm4_metallurgy:{metal:{type:\"aluminium\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420021,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/aluminium/v0\",Properties:{textures:[{Value:\"$ore/aluminium\"}]}}}" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismuth_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismuth_band.json index ad71f9c654..a793cbcbb5 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismuth_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismuth_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"bismuth\",amount:[12s],castable:1b},item:\"obsidian_cast\"},CustomModelData:3420053,SkullOwner:{Id:[I;-359255454,30123560,-1513962184,-616842323],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyODAxNDc0OTQ2MSwKICAicHJvZmlsZUlkIiA6ICJiMWMyNWQ0YjMwZDU0N2Y4YTk3NmZlYTllOGU1YzBjMyIsCiAgInByb2ZpbGVOYW1lIiA6ICJvd29FbmRlciIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS82NmM0ODcwYmNiMDdkYWJjMjNiNTZkMzJlNzI5OWI5NTE4ZTU1N2VmMzU2YTNiZGRmNDBkNGM3MDIwYzI3MTdhIgogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"bismuth\",amount:[12s],castable:1b},item:\"obsidian_cast\"},CustomModelData:3420053,SkullOwner:{Properties:{textures:[{Value:\"$band/bismuth\"}]}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismutite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismutite_lump.json index 0acb6fbbb4..8a750219d4 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismutite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/bismutite_lump.json @@ -75,7 +75,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{metal:{type:\"bismuth\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420017,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/bismuth\",Id:[I;140254582,-1151718614,-1277548307,1366135037],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyOTY4NDM0MzA2MCwKICAicHJvZmlsZUlkIiA6ICI0OWIzODUyNDdhMWY0NTM3YjBmN2MwZTFmMTVjMTc2NCIsCiAgInByb2ZpbGVOYW1lIiA6ICJiY2QyMDMzYzYzZWM0YmY4IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2EwODFiMmY2Nzk3ZDk2YzcxMGYyMjk1YmQ2MGJmYjc3NTE5ZDU4Yzk3NGEwYjM0YjViZDcyZmNkNzc3OTYyMWIiCiAgICB9LAogICAgIkNBUEUiIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzIzNDBjMGUwM2RkMjRhMTFiMTVhOGIzM2MyYTdlOWUzMmFiYjIwNTFiMjQ4MWQwYmE3ZGVmZDYzNWNhN2E5MzMiCiAgICB9CiAgfQp9\"}]}}}" + "tag": "{gm4_metallurgy:{metal:{type:\"bismuth\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420017,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/bismuth\",Properties:{textures:[{Value:\"$ore/bismuth\"}]}}}" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/copper_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/copper_band.json index f80e1a31a3..226bdb89d8 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/copper_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/copper_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"copper\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;-359695444,30126360,-1513204284,-616246813],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODg0Njc2ODYwNDksInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjMyNjQ2OGE2N2NlZTNkYTJlYzE0MDJiZGU1MzhlNGZjOGU5ZGVmZGFmOGNlMzVjZGJiYjEzY2RjZTE1ZSJ9fX0=\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"copper\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:\"$band/copper_RETIRED\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/curies_bismium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/curies_bismium_band.json index 5374b5f95e..0090800644 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/curies_bismium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/curies_bismium_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"curies_bismium\",amount:[9s,3s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;-1332644679,659216762,2108439484,664728976],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyODAyOTI2NzM2NiwKICAicHJvZmlsZUlkIiA6ICI3ZmIyOGQ1N2FhZmQ0MmQ1YTcwNWNlZjE4YWI1MzEzZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJjaXJjdWl0MTAiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2MzMTBmZDk3YjFhN2Q3MDkwOGExODc2N2FjZmRjYzYwZDJhMTU1NTY5Zjk0YThmYjZhZWUxYTMzMWE5MjM4IgogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"curies_bismium\",amount:[9s,3s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Properties:{textures:[{Value:\"$band/curies_bismium\"}]}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/malachite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/malachite_lump.json index 569a1f3acc..4bb5757753 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/malachite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/malachite_lump.json @@ -39,7 +39,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{metal:{type:\"copper\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420018,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/copper/v0\",Id:[I;140191582,-1151712444,-1271449307,1366570837],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODE0MTA4Mjk2OTAsInByb2ZpbGVJZCI6Ijk4NWIyNzVlYmI1YTQzNDRiNDM3Njg5NTI4NjNhNjNmIiwicHJvZmlsZU5hbWUiOiJTcGFya3MiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDNjMWE3ZGEyZWJkZGI0YTk3YzI3NDA0N2RlNzFkN2RjZWJjMTc2YTBlNjE3MzBmZmQzMzIzODUzNTNlIn0sIkNBUEUiOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81YzNjYTdlZTJhNDk4ZjFiNWQyNThkNWZhOTI3ZTYzZTQzMzE0M2FkZDU1MzhjZjYzYjZhOWI3OGFlNzM1In19fQ==\"}]}}}" + "tag": "{gm4_metallurgy:{metal:{type:\"copper\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420018,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/copper/v0\",Properties:{textures:[{Value:\"$ore/copper_RETIRED\"}]}}}" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorianite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorianite_lump.json index faf4d049a7..dac9f1209e 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorianite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorianite_lump.json @@ -39,7 +39,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{metal:{type:\"thorium\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420020,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/thorium/v0\",Id:[I;140191582,-1151712444,-1271454064,-1822255261],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyOTY4NDM2MzM0MywKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjcxYWQ1MTBhMTBjNWMxYzZkMGY3NzVjYWRkNWVmMTliZWRkODY2NTQwNmE5ZWY1NTI0ZGJmOGZiNjQ2MmViIgogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{gm4_metallurgy:{metal:{type:\"thorium\",amount:[1s],castable:1b},item:\"ore\"},CustomModelData:3420020,SkullOwner:{Name:\"[Drop to Fix Item] gm4_metallurgy:ore/thorium/v0\",Properties:{textures:[{Value:\"$ore/thorium\"}]}}}" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_band.json index f07c40b695..5dca978280 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"thorium\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;1709100198,-881135263,-295939255,1602156123],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODE2NjM1MTAwNzIsInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTYzOTJhNmQ5OWY5MzE5ZWU3YzRmNGMxYTE5NzQ5ZDY4N2NkY2M4ZWVjOGZjNjY4ZTczZDM3YTZkYWY3N2EifX19\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"thorium\",amount:[12s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Properties:{textures:[{Value:\"$band/thorium\"}]}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_brass_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_brass_band.json index c437a17f87..ea68369b4a 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_brass_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_tables/thorium_brass_band.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"thorium_brass\",amount:[9s,3s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Id:[I;-1331314679,659659762,2101919484,662148976],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODg0NjY1NTQzODUsInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDk2ZWJmMzMxZmQ1MzM3MjM0ZmU0OTM2ZWMyOTU2NTI4ZDQ3N2FiYTU4NzU5YmM2ZWIyODRiMmU5MmQxNDI4In19fQ==\"}]}}}" + "tag": "{gm4_metallurgy:{has_shamir:1b,metal:{type:\"thorium_brass\",amount:[9s,3s],castable:1b},item:\"obsidian_cast\"},SkullOwner:{Properties:{textures:[{Value:\"$band/thorium_brass_RETIRED\"}]}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/aluminium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/aluminium.png new file mode 100644 index 0000000000..74d3beeed3 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/aluminium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/barimium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/barimium.png new file mode 100644 index 0000000000..faa79316c3 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/barimium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/barium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/barium.png new file mode 100644 index 0000000000..6434b3e5bf Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/barium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/bismuth.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/bismuth.png new file mode 100644 index 0000000000..17c464292f Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/bismuth.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/copper_RETIRED.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/copper_RETIRED.png new file mode 100644 index 0000000000..085881bf61 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/copper_RETIRED.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/curies_bismium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/curies_bismium.png new file mode 100644 index 0000000000..60700dca29 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/curies_bismium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/mundane.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/mundane.png new file mode 100644 index 0000000000..b31488541e Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/mundane.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/thorium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/thorium.png new file mode 100644 index 0000000000..a5c6405f8e Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/thorium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/band/thorium_brass_RETIRED.png b/gm4_metallurgy/data/gm4_metallurgy/skins/band/thorium_brass_RETIRED.png new file mode 100644 index 0000000000..f74a43b2bb Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/band/thorium_brass_RETIRED.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/mould/cool_empty.png b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/cool_empty.png new file mode 100644 index 0000000000..851fc0a37e Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/cool_empty.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/mould/cool_metal.png b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/cool_metal.png new file mode 100644 index 0000000000..91fea56f17 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/cool_metal.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/mould/hot_empty.png b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/hot_empty.png new file mode 100644 index 0000000000..8a9f0ce20e Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/hot_empty.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/mould/hot_metal.png b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/hot_metal.png new file mode 100644 index 0000000000..c86e187f5f Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/mould/hot_metal.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/ore/aluminium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/aluminium.png new file mode 100644 index 0000000000..359ac5c995 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/aluminium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/ore/barium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/barium.png new file mode 100644 index 0000000000..88ce393d30 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/barium.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/ore/bismuth.png b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/bismuth.png new file mode 100644 index 0000000000..96592691d4 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/bismuth.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/ore/copper_RETIRED.png b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/copper_RETIRED.png new file mode 100644 index 0000000000..2000b66d6d Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/copper_RETIRED.png differ diff --git a/gm4_metallurgy/data/gm4_metallurgy/skins/ore/thorium.png b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/thorium.png new file mode 100644 index 0000000000..f01bbef097 Binary files /dev/null and b/gm4_metallurgy/data/gm4_metallurgy/skins/ore/thorium.png differ diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/functions/init.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/functions/init.mcfunction index 7fa12dcbd7..672e15c7c1 100755 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/functions/init.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/functions/init.mcfunction @@ -32,7 +32,7 @@ execute in minecraft:the_nether run tag @a[x=0] add gm4_oa_in_nether data remove storage gm4_player_heads:register heads[{id:"gm4_corripio_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_corripio_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_corripio_shamir:band/v1",name:"[Drop to Fix Item] gm4_corripio_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"corripio",metal:{type:"bismuth",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-359255454,30123560,-1513962184,-616842323],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODAxNDc0OTQ2MSwKICAicHJvZmlsZUlkIiA6ICJiMWMyNWQ0YjMwZDU0N2Y4YTk3NmZlYTllOGU1YzBjMyIsCiAgInByb2ZpbGVOYW1lIiA6ICJvd29FbmRlciIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS82NmM0ODcwYmNiMDdkYWJjMjNiNTZkMzJlNzI5OWI5NTE4ZTU1N2VmMzU2YTNiZGRmNDBkNGM3MDIwYzI3MTdhIgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420116,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['[{"translate":"item.gm4.metallurgy.bismuth.red","fallback":"Bi","italic":false,"color":"#F47989"},{"translate":"item.gm4.metallurgy.bismuth.orange","fallback":"sm","italic":false,"color":"#F5B478"},{"translate":"item.gm4.metallurgy.bismuth.yellow","fallback":"ut","italic":false,"color":"#F5DD79"},{"translate":"item.gm4.metallurgy.bismuth.green","fallback":"h ","italic":false,"color":"#78F4AE"},{"translate":"item.gm4.metallurgy.bismuth.blue","fallback":"Ba","italic":false,"color":"#79D6F5"},{"translate":"item.gm4.metallurgy.bismuth.purple","fallback":"nd","italic":false,"color":"#8378F5"},{"translate":"item.gm4.metallurgy.bismuth.magenta","fallback":"","italic":false,"color":"#D579F5"}]','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.corripio","fallback":"Corripio"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_corripio_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_corripio_shamir:band/v1",name:"[Drop to Fix Item] gm4_corripio_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"corripio",metal:{type:"bismuth",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/bismuth",CustomModelData:3420116,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['[{"translate":"item.gm4.metallurgy.bismuth.red","fallback":"Bi","italic":false,"color":"#F47989"},{"translate":"item.gm4.metallurgy.bismuth.orange","fallback":"sm","italic":false,"color":"#F5B478"},{"translate":"item.gm4.metallurgy.bismuth.yellow","fallback":"ut","italic":false,"color":"#F5DD79"},{"translate":"item.gm4.metallurgy.bismuth.green","fallback":"h ","italic":false,"color":"#78F4AE"},{"translate":"item.gm4.metallurgy.bismuth.blue","fallback":"Ba","italic":false,"color":"#79D6F5"},{"translate":"item.gm4.metallurgy.bismuth.purple","fallback":"nd","italic":false,"color":"#8378F5"},{"translate":"item.gm4.metallurgy.bismuth.magenta","fallback":"","italic":false,"color":"#D579F5"}]','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.corripio","fallback":"Corripio"}']}}} execute unless score orb_of_ankou gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Orb of Ankou"} execute unless score orb_of_ankou gm4_earliest_version < orb_of_ankou gm4_modules run scoreboard players operation orb_of_ankou gm4_earliest_version = orb_of_ankou gm4_modules diff --git a/gm4_percurro_shamir/data/gm4_percurro_shamir/functions/init.mcfunction b/gm4_percurro_shamir/data/gm4_percurro_shamir/functions/init.mcfunction index 18c31105ce..3497043fed 100644 --- a/gm4_percurro_shamir/data/gm4_percurro_shamir/functions/init.mcfunction +++ b/gm4_percurro_shamir/data/gm4_percurro_shamir/functions/init.mcfunction @@ -6,7 +6,7 @@ scoreboard players set percurro_shamir gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_percurro_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_percurro_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_percurro_shamir:band/v1",name:"[Drop to Fix Item] gm4_percurro_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"percurro",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-1332644679,659216762,2108439484,664728976],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODAyOTI2NzM2NiwKICAicHJvZmlsZUlkIiA6ICI3ZmIyOGQ1N2FhZmQ0MmQ1YTcwNWNlZjE4YWI1MzEzZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJjaXJjdWl0MTAiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2MzMTBmZDk3YjFhN2Q3MDkwOGExODc2N2FjZmRjYzYwZDJhMTU1NTY5Zjk0YThmYjZhZWUxYTMzMWE5MjM4IgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420117,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.percurro","fallback":"Percurro"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_percurro_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_percurro_shamir:band/v1",name:"[Drop to Fix Item] gm4_percurro_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"percurro",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/curies_bismium",CustomModelData:3420117,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.percurro","fallback":"Percurro"}']}}} # guidebook execute if score gm4_guidebook load.status matches 1 run summon marker ~ 3337.509617641432 ~ {CustomName:'"gm4_percurro_shamir_guide"',Tags:["gm4_guide"],data:{type:"_expansion",base:"metallurgy",id:"percurro_shamir",page_count:2,line_count:1,module_name:"Percurro Shamir"}} diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/fire_resistance.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/fire_resistance.mcfunction index 63b6988fcc..76876a7575 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/fire_resistance.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/fire_resistance.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.fire_resistance","fallback":"Fire Resistance Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.fire_resistance","fallback":"Fire Resistance Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636321,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY4MTUxNTgsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2M2NjE2NmM2MzA3NTE5NTEyMzVjNDRmNjNlYWViZTgzNDYyMWU1MWNhOWI3NmEyODc2ODA4YThjMzAyMGE0In19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/fire_resistance"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_fire_resistance" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_fire_resistance diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/floating.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/floating.mcfunction index c33cb9054e..1f6f5ccce8 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/floating.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/floating.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.floating","fallback":"Floating Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.floating","fallback":"Floating Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2117688197,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0OTkwMjE1NzczMzQsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwic2lnbmF0dXJlUmVxdWlyZWQiOnRydWUsInRleHR1cmVzIjp7IlNLSU4iOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS82YzNiYjZjMjM2YzdjZTZiMzA1YWQ4M2QwMzBmOGJlNmVmOGExMzFkNjVhMTBiZmIxZWQ3OTk0OGY0NWZkMCJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/floating"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_floating" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_floating diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/harming.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/harming.mcfunction index 802da63a41..a30cb47961 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/harming.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/harming.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.harming","fallback":"Harming Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.harming","fallback":"Harming Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138638081,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDcxNjQyNDAsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI2MjkyYmYwNzk0N2IxNjQ3ZmFlNGJjYjc2NzVmOWNhZGJiZDY1MDczMjIzNDM0M2RiZGY2YzA0MTRkYiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/harming"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_harming" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_harming diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/healing.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/healing.mcfunction index 5795be962b..c2f8902b18 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/healing.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/healing.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.healing","fallback":"Healing Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.healing","fallback":"Healing Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636289,-1614258018,-889714315],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYzOTQ3MTEsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzliYTZjZjQzODg0YjJjZmMyNDU0NGNmYTVmNmZjNzViY2M3OGE2YWM1NjhmYTE5OGY2NDVkZDkxNWM4Y2FlMzcifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/healing"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_healing" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_healing diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/invisibility.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/invisibility.mcfunction index 3428adbc00..f728810598 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/invisibility.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/invisibility.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.invisibility","fallback":"Invisibility Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.invisibility","fallback":"Invisibility Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636289,-1614258029,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDcwODQ2MTQsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2YxOWUyNGI1N2UxN2I1NGYzZmFhOTcxMGM4ZGZjNTUxMTRhNzE5YjE0YWYwOWE0ZDFjMDRiMTY2MTQ0ZWY2YiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/invisibility"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_invisibility" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_invisibility diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/leaping.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/leaping.mcfunction index 2392f38955..c69a157047 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/leaping.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/leaping.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.leaping","fallback":"Leaping Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.leaping","fallback":"Leaping Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1407071745,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY5NDYzMjksInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2RjMzE2NmFkZTk1NTA2Y2VmZDhjNTdiMWVlNWY4MTNiNTNhOWZjMTliYTEzNDhjYTE2NmE2YjBjZmEwMzAifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/leaping"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_leaping" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_leaping diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/luck.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/luck.mcfunction index d1898b7c4e..2b190f5a81 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/luck.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/luck.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.luck","fallback":"Luck Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.luck","fallback":"Luck Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;579092712,-1832366649,-2142784905,1481188552],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE1NTE4MjQwMTMxMzAsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzg5NGY2ZTRkZmU4Y2E2ZjVjOTg5YjZlNjAyMWM4YTgzMjQzYjgzYTdkYzI1OWI4NmI2ZGNiZmE0OGMxOTQ3ZGEifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/luck"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_luck" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_luck diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/night_vision.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/night_vision.mcfunction index 2f4917df07..94462b53be 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/night_vision.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/night_vision.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.night_vision","fallback":"Night Vision Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.night_vision","fallback":"Night Vision Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271117,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDczMzU2MDIsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2I2NmY2MmE3ZWEyNjcwMjBhNjYyYWI1ZTI1ZWFlMzdjNTM2Yzc2N2QwNDYyZWE1MDIyZTVhZmQ1ODQzODYxIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/night_vision"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_night_vision" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_night_vision diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/poison.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/poison.mcfunction index c4534aaaf4..267cb9e314 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/poison.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/poison.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.poison","fallback":"Poison Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.poison","fallback":"Poison Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;1056529285,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY4ODg4NzIsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzY2MWU3NWExMWEwNzBmNTgyMWMxYmJlOTkxMTJiZGJjYWVjY2IyZDQ3Njg2OWQ3N2ExYzJkZDlmZjY0MDM3In19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/poison"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_poison" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_poison diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/regeneration.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/regeneration.mcfunction index 94214e2bae..6aad18d444 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/regeneration.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/regeneration.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.regeneration","fallback":"Regeneration Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.regeneration","fallback":"Regeneration Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271113,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYxNzA4MTcsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI2YzljOTNjNjRlZmYzMzE4MzFmNDkyY2E2Nzc1YWJjY2VkM2RjZDhmZWExOWEzMmM0OTM4NjRkYjFlMWMifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/regeneration"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_regeneration" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_regeneration diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slow_falling.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slow_falling.mcfunction index 627ac3e850..cef1472c6a 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slow_falling.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slow_falling.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.slow_falling","fallback":"Slow Falling Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.slow_falling","fallback":"Slow Falling Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;579092712,1925725639,-2092432809,408565448],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE1NTE4MjI2MTE5MDQsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2UzNmJhMjRkZWQ5ODYxYzM2OWFlOGEzMGUzMTE5NWFjYTFkOGI4MDgzZjQzNTFkYjdjYWM4OTg5NDBhMDNlZWUifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/slow_falling"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_slow_falling" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_slow_falling diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slowness.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slowness.mcfunction index 09c578175e..3a8a9e957f 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slowness.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/slowness.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.slowness","fallback":"Slowness Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.slowness","fallback":"Slowness Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2115591045,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc1NzI0MDgsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI4NTdjZWZhOTYzZmI5NWYyNTg4ZDU5ZTNlMGI5YjM5ZmE3YjYxMGVkODNjMTU0NmZmYTk3MjlmN2Q3ZWNiIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/slowness"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_slowness" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_slowness diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strength.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strength.mcfunction index 7b17252147..a11d03987f 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strength.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strength.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strength","fallback":"Strength Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strength","fallback":"Strength Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2063162245,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY3NTE4NTAsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y5NGE3YjJmZDc5MzYxNzdjNjI2ZDllYWQwZWY0MzRmMjNmNmViNmQyYzAzNDgwZGE2MDRlZWIyMWRjZiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/strength"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strength" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strength diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_harming.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_harming.mcfunction index dcc0765850..79939019b9 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_harming.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_harming.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_harming","fallback":"Strong Harming Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_harming","fallback":"Strong Harming Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138638081,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDcxNjQyNDAsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI2MjkyYmYwNzk0N2IxNjQ3ZmFlNGJjYjc2NzVmOWNhZGJiZDY1MDczMjIzNDM0M2RiZGY2YzA0MTRkYiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/strength"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_harming" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_harming diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_healing.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_healing.mcfunction index f68a71fd2f..fe6c4f774c 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_healing.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_healing.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_healing","fallback":"Strong Healing Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_healing","fallback":"Strong Healing Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636289,-1614258018,-889714315],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYzOTQ3MTEsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzliYTZjZjQzODg0YjJjZmMyNDU0NGNmYTVmNmZjNzViY2M3OGE2YWM1NjhmYTE5OGY2NDVkZDkxNWM4Y2FlMzcifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/healing"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_healing" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_healing diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_leaping.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_leaping.mcfunction index b3af0e74c9..e60b096a3c 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_leaping.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_leaping.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_leaping","fallback":"Strong Leaping Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_leaping","fallback":"Strong Leaping Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1407071745,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY5NDYzMjksInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2RjMzE2NmFkZTk1NTA2Y2VmZDhjNTdiMWVlNWY4MTNiNTNhOWZjMTliYTEzNDhjYTE2NmE2YjBjZmEwMzAifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/leaping"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_leaping" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_leaping diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_poison.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_poison.mcfunction index 43e65e5dcb..c3b35cd061 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_poison.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_poison.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_poison","fallback":"Strong Poison Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_poison","fallback":"Strong Poison Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;1056529285,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY4ODg4NzIsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzY2MWU3NWExMWEwNzBmNTgyMWMxYmJlOTkxMTJiZGJjYWVjY2IyZDQ3Njg2OWQ3N2ExYzJkZDlmZjY0MDM3In19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/poison"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_poison" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_poison diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_regeneration.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_regeneration.mcfunction index d77c278f8d..2a2e1342e7 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_regeneration.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_regeneration.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_regeneration","fallback":"Strong Regeneration Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_regeneration","fallback":"Strong Regeneration Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271113,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYxNzA4MTcsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI2YzljOTNjNjRlZmYzMzE4MzFmNDkyY2E2Nzc1YWJjY2VkM2RjZDhmZWExOWEzMmM0OTM4NjRkYjFlMWMifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/regeneration"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_regeneration" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_regeneration diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_slowness.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_slowness.mcfunction index 2084793c71..629663c526 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_slowness.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_slowness.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_slowness","fallback":"Strong Slowness Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_slowness","fallback":"Strong Slowness Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2115591045,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc1NzI0MDgsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI4NTdjZWZhOTYzZmI5NWYyNTg4ZDU5ZTNlMGI5YjM5ZmE3YjYxMGVkODNjMTU0NmZmYTk3MjlmN2Q3ZWNiIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/slowness"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_slowness" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_slowness diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_strength.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_strength.mcfunction index bfbf59915d..ec81f972c6 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_strength.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_strength.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_strength","fallback":"Strong Strength Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_strength","fallback":"Strong Strength Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2063162245,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY3NTE4NTAsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y5NGE3YjJmZDc5MzYxNzdjNjI2ZDllYWQwZWY0MzRmMjNmNmViNmQyYzAzNDgwZGE2MDRlZWIyMWRjZiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/strength"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_strength" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_strength diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_swiftness.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_swiftness.mcfunction index da8fc17193..9cb76e43c3 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_swiftness.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_swiftness.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_swiftness","fallback":"Strong Swiftness Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_swiftness","fallback":"Strong Swiftness Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271221,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc2MjgyNjQsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzU1N2FhOWExMTBmOTEwOGE3MWI2MzI5ODhhMzM4MzQ1OGY0NDVlYjJlYjBmMDM4ZjE3ZDQ5OGU0YmNiYTJhZCJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/swiftness"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_swiftness" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_swiftness diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_turtle_master.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_turtle_master.mcfunction index 2d04d3cba1..64014d4932 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_turtle_master.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/strong_turtle_master.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.strong_turtle_master","fallback":"Strong Turtle Master Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.strong_turtle_master","fallback":"Strong Turtle Master Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;579092712,1923632407,-2041990537,944780488],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE1NTE3MTgxMDc4NjMsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzVhODlmM2Q3MGNhYmYyYTEwM2Y3MDYwZDU0NTA0NDhjMDM3YjZjMWM3MjBkM2U5OGViOTViZmY0NzAwNjdhNTIifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/turtle_master"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_strong_turtle_master" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_strong_turtle_master diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/swiftness.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/swiftness.mcfunction index 2a241e9910..31389eac0e 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/swiftness.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/swiftness.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.swiftness","fallback":"Swiftness Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.swiftness","fallback":"Swiftness Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271221,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc2MjgyNjQsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzU1N2FhOWExMTBmOTEwOGE3MWI2MzI5ODhhMzM4MzQ1OGY0NDVlYjJlYjBmMDM4ZjE3ZDQ5OGU0YmNiYTJhZCJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/swiftness"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_swiftness" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_swiftness diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/turtle_master.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/turtle_master.mcfunction index b7950ad764..961352a8a6 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/turtle_master.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/turtle_master.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.turtle_master","fallback":"Turtle Master Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.turtle_master","fallback":"Turtle Master Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;579092712,1923632407,-2041990537,944780488],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE1NTE3MTgxMDc4NjMsInByb2ZpbGVJZCI6IjIyODQ0MGU4NzJjODRkYzc4MzQ4YjI3NzU4NTAzNGM4IiwicHJvZmlsZU5hbWUiOiJTcGVjaWFsQnVpbGRlcjMyIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzVhODlmM2Q3MGNhYmYyYTEwM2Y3MDYwZDU0NTA0NDhjMDM3YjZjMWM3MjBkM2U5OGViOTViZmY0NzAwNjdhNTIifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/turtle_master"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_turtle_master" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_turtle_master diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/water_breathing.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/water_breathing.mcfunction index bd13d0c846..b9d9d3c02e 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/water_breathing.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/water_breathing.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.water_breathing","fallback":"Water Breathing Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.water_breathing","fallback":"Water Breathing Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138624001,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc2OTI3OTMsInByb2ZpbGVJZCI6IjYzY2JkZjhkNDg4OTQ3NWY5NDQxMjk3ZTRhM2Q1NjczIiwicHJvZmlsZU5hbWUiOiJWZWxlVCIsImlzUHVibGljIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDc3YTdjMjEzNjc3NWE0ZWI0ZGUzMWU3MTViZWM2Y2M2NTdhN2Q2NmI0OGEzYmE1MjczMzI5MmM2ZTMyMmZhZSJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/water_breathing"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_water_breathing" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_water_breathing diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/weakness.mcfunction b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/weakness.mcfunction index 53f3b9be48..c46d845b68 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/weakness.mcfunction +++ b/gm4_potion_liquids/data/gm4_potion_liquids/functions/liquid_init/weakness.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.weakness","fallback":"Weakness Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.weakness","fallback":"Weakness Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138644481,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc0MTQ0NjEsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2NjYWM2NzI4NGNhNjM5MGY4ZDI4NDYwNjI3ZmZjNTg3YmI5ODk1MmQ3NDk4MzE2OWMwMWY5YjkwZmQ3MjVjIn19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:"\"gm4_liquid_tank_display\"",Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$liquids/weakness"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_weakness" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_weakness diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/fire_resistance.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/fire_resistance.png new file mode 100644 index 0000000000..3d9328b11e Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/fire_resistance.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/floating.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/floating.png new file mode 100644 index 0000000000..6d63f6e5ff Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/floating.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/harming.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/harming.png new file mode 100644 index 0000000000..9efe21946f Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/harming.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/healing.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/healing.png new file mode 100644 index 0000000000..14beefcbae Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/healing.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/invisibility.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/invisibility.png new file mode 100644 index 0000000000..57b41befd0 Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/invisibility.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/leaping.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/leaping.png new file mode 100644 index 0000000000..29d22dce2b Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/leaping.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/luck.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/luck.png new file mode 100644 index 0000000000..2aa399e667 Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/luck.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/night_vision.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/night_vision.png new file mode 100644 index 0000000000..408d01395e Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/night_vision.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/poison.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/poison.png new file mode 100644 index 0000000000..a52290d62f Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/poison.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/regeneration.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/regeneration.png new file mode 100644 index 0000000000..666fda641b Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/regeneration.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/slow_falling.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/slow_falling.png new file mode 100644 index 0000000000..483ed1c8a1 Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/slow_falling.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/slowness.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/slowness.png new file mode 100644 index 0000000000..4aae2b682e Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/slowness.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/strength.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/strength.png new file mode 100644 index 0000000000..d415ecb93a Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/strength.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/swiftness.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/swiftness.png new file mode 100644 index 0000000000..c01893a79d Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/swiftness.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/turtle_master.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/turtle_master.png new file mode 100644 index 0000000000..06db257b80 Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/turtle_master.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/water_breathing.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/water_breathing.png new file mode 100644 index 0000000000..768cbf24cf Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/water_breathing.png differ diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/weakness.png b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/weakness.png new file mode 100644 index 0000000000..46223dc926 Binary files /dev/null and b/gm4_potion_liquids/data/gm4_potion_liquids/skins/liquids/weakness.png differ diff --git a/gm4_relocators/data/gm4/advancements/relocators.json b/gm4_relocators/data/gm4/advancements/relocators.json index 7e5e410779..984ebda6b7 100644 --- a/gm4_relocators/data/gm4/advancements/relocators.json +++ b/gm4_relocators/data/gm4/advancements/relocators.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{CustomModelData:3420037,SkullOwner:{Id:[I;739224026,-1192800770,-2115274619,-970102126],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NjM4MTY4ODE5NTcsInByb2ZpbGVJZCI6IjdkYTJhYjNhOTNjYTQ4ZWU4MzA0OGFmYzNiODBlNjhlIiwicHJvZmlsZU5hbWUiOiJHb2xkYXBmZWwiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzMwM2Q3YTkyNTIxZDZmZTU1M2ZiNGYyNzIxOTI2Yzk4YTVlMDdlMDhmZjdiNzg4OTg1OTc3MGM0Yjg0NmJlZDYifX19\"}]}}}" + "nbt": "{CustomModelData:3420037,SkullOwner:\"$gm4_relocators:relocator_empty\"}" }, "title": { "translate": "advancement.gm4.relocators.title", diff --git a/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_empty.json b/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_empty.json index 1faeef9c80..74d5071664 100644 --- a/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_empty.json +++ b/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_empty.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420027,gm4_machines:{id:\"relocator_empty\"},SkullOwner:{Name:\"gm4_relocator_empty\",Id:[I;939288592,-1692047561,-1963748291,-978837126],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTU0MDM1NCwKICAicHJvZmlsZUlkIiA6ICIxYTc1ZTNiYmI1NTk0MTc2OTVjMmY4NTY1YzNlMDAzZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJUZXJvZmFyIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y3YmJiZTlkNzY0MTM3NjRkNmEyNzc0MWJhMTA5ZTViY2E1Mjg1NjFmMGE2NjJlMGE0N2UwZjM1NTc0YTI3OTkiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{CustomModelData:3420027,gm4_machines:{id:\"relocator_empty\"},SkullOwner:{Name:\"gm4_relocator_empty\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$relocator_empty\"}]}}}" }, { "function": "set_name", diff --git a/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_full.json b/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_full.json index 7e11e7042e..29fd1e16b5 100644 --- a/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_full.json +++ b/gm4_relocators/data/gm4_relocators/loot_tables/items/relocator_full.json @@ -10,7 +10,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420061,gm4_machines:{id:\"relocator_full\"},SkullOwner:{Name:\"gm4_relocator_full\",Id:[I;938288371,-119475667,-177364551,-680664510],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0NDM1MTY1ODg2NiwKICAicHJvZmlsZUlkIiA6ICJmZDYwZjM2ZjU4NjE0ZjEyYjNjZDQ3YzJkODU1Mjk5YSIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWFkIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzE3OTE5NTFiNjQ5ZmZmMDI2OGUyZTBkYWZhMGQxZDQ0YjYzNTU4NTg1YTkzYjMyZWMyYzQxMjRmYzM5NmQyNTYiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}}}" + "tag": "{CustomModelData:3420061,gm4_machines:{id:\"relocator_full\"},SkullOwner:{Name:\"gm4_relocator_full\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$relocator_full\"}]}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_relocators/data/gm4_relocators/skins/relocator_empty.png b/gm4_relocators/data/gm4_relocators/skins/relocator_empty.png new file mode 100644 index 0000000000..ebd0ee0187 Binary files /dev/null and b/gm4_relocators/data/gm4_relocators/skins/relocator_empty.png differ diff --git a/gm4_relocators/data/gm4_relocators/skins/relocator_full.png b/gm4_relocators/data/gm4_relocators/skins/relocator_full.png new file mode 100644 index 0000000000..89049fb74a Binary files /dev/null and b/gm4_relocators/data/gm4_relocators/skins/relocator_full.png differ diff --git a/gm4_scuba_gear/data/gm4/advancements/scuba_gear.json b/gm4_scuba_gear/data/gm4/advancements/scuba_gear.json index 80333de9bc..313b836bfd 100644 --- a/gm4_scuba_gear/data/gm4/advancements/scuba_gear.json +++ b/gm4_scuba_gear/data/gm4/advancements/scuba_gear.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "minecraft:player_head", - "nbt": "{CustomModelData:3420048,SkullOwner:{Id:[I;505437377,1176259381,-1878264711,-101560156],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NDMxNjc2MjM1NzMsInByb2ZpbGVJZCI6IjVjN2ZiNzhhMmQxMzQ5NTZhNWE1M2EyNGQ5NWY1YjRmIiwicHJvZmlsZU5hbWUiOiJQZWFyc29uSW5tYW4iLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzc1OWY1NmU3MDc4NDkzYzEzMDZlZWI2YmQxM2UwYmQ1NTZlYjAxOGUzZGRjMDAzMGE1NzFhYjg4YzRjZGNlNGUifX19\"}]}}}" + "nbt": "{CustomModelData:3420048,SkullOwner:\"$scuba_helmet\"}" }, "title": { "translate": "advancement.gm4.scuba_gear.title", diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_tables/items/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_tables/items/scuba_helmet.json index 941ce64f8a..e8e8b88e2d 100644 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_tables/items/scuba_helmet.json +++ b/gm4_scuba_gear/data/gm4_scuba_gear/loot_tables/items/scuba_helmet.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420009,gm4_scuba_gear:{item:\"helmet\"},AttributeModifiers:[{AttributeName:\"generic.armor\",Name:\"generic.armor\",Amount:2,Operation:0,UUID:[I;0,190244,0,554768],Slot:\"head\"},{AttributeName:\"generic.attack_speed\",Name:\"generic.attack_speed\",Amount:-.5,Operation:0,UUID:[I;0,193195,0,454101],Slot:\"head\"}],SkullOwner:{Name:\"[Drop to Fix Item] gm4_scuba_gear:scuba_helmet\",Id:[I;-68336571,19415274,-1818733955,-1859858872],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyODUzNDg1MTY2MCwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDExZTAyOTJlZTgzZDUwZTQzM2MxNTkxNzE5OGZhNDRjYjZkMTMyODhiNmFhNjZmYmUzY2QxZTZkZjY1OGRhNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420009,gm4_scuba_gear:{item:\"helmet\"},AttributeModifiers:[{AttributeName:\"generic.armor\",Name:\"generic.armor\",Amount:2,Operation:0,UUID:[I;0,190244,0,554768],Slot:\"head\"},{AttributeName:\"generic.attack_speed\",Name:\"generic.attack_speed\",Amount:-.5,Operation:0,UUID:[I;0,193195,0,454101],Slot:\"head\"}],SkullOwner:{Name:\"[Drop to Fix Item] gm4_scuba_gear:scuba_helmet\",Properties:{textures:[{Value:\"$scuba_helmet\"}]}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/skins/scuba_helmet.png b/gm4_scuba_gear/data/gm4_scuba_gear/skins/scuba_helmet.png new file mode 100644 index 0000000000..68991f14ba Binary files /dev/null and b/gm4_scuba_gear/data/gm4_scuba_gear/skins/scuba_helmet.png differ diff --git a/gm4_smelteries/data/gm4_smelteries/loot_tables/items/smeltery.json b/gm4_smelteries/data/gm4_smelteries/loot_tables/items/smeltery.json index c9de0ce45b..f070db9a15 100644 --- a/gm4_smelteries/data/gm4_smelteries/loot_tables/items/smeltery.json +++ b/gm4_smelteries/data/gm4_smelteries/loot_tables/items/smeltery.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420133,gm4_machines:{id:\"smeltery\"},SkullOwner:{Name:\"gm4_smeltery\",Id:[I;1784636653,-1150006069,-1125092353,-1658708865],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1NDMwMDcwMywKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWM3MjJlYmQxNzdlNDI3MDUzMmMyNGMyNTFhNGY1NzY4OGNiZDg3YTJmNTlmNGE2NjQ5ZGMxZmFjMGI1YmRlOCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420133,gm4_machines:{id:\"smeltery\"},SkullOwner:{Name:\"gm4_smeltery\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$smeltery\"}]}}}" }, { "function": "set_name", diff --git a/gm4_smelteries/data/gm4_smelteries/skins/smeltery.png b/gm4_smelteries/data/gm4_smelteries/skins/smeltery.png new file mode 100644 index 0000000000..87393b85c3 Binary files /dev/null and b/gm4_smelteries/data/gm4_smelteries/skins/smeltery.png differ diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_anchor.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_anchor.json index 09f330155c..72ce864cd9 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_anchor.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_anchor.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420139,gm4_machines:{id:\"teleportation_anchor\"},SkullOwner:{Name:\"gm4_teleportation_anchor\",Id:[I;772836475,993526495,-815540237,-2046417388],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0NDQ3MTM3OTY2MSwKICAicHJvZmlsZUlkIiA6ICI5ZDQyNWFiOGFmZjg0MGU1OWM3NzUzZjc5Mjg5YjMyZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJUb21wa2luNDIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTFiZTRkYzdkMTUyOWViYzFlYmZjMWU5MGY5NDM3MDg0NzE2NTAxNzE2ZDA1ODNjOWZjMWNhNmI3OGY5MDhmYyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420139,gm4_machines:{id:\"teleportation_anchor\"},SkullOwner:{Name:\"gm4_teleportation_anchor\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$teleportation_anchor\"}]}}}" }, { "function": "set_name", diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_jammer.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_jammer.json index 10a5e28187..c3479b940a 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_jammer.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_tables/items/teleportation_jammer.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420138,gm4_machines:{id:\"teleportation_jammer\"},SkullOwner:{Name:\"gm4_teleportation_jammer\",Id:[I;878310477,672930541,-264551059,-1299384752],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0NDQ3MTUyNDc4NSwKICAicHJvZmlsZUlkIiA6ICIzZmM3ZmRmOTM5NjM0YzQxOTExOTliYTNmN2NjM2ZlZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJZZWxlaGEiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzI4MDdlOGM2YjcwMzI2ZjU2Y2I4ZDU1NTQzNWU2MjYwMmM5YWJhYzc4NWM0ZmQ4ZjJjY2IwOGMwMDNmY2ZlZCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420138,gm4_machines:{id:\"teleportation_jammer\"},SkullOwner:{Name:\"gm4_teleportation_jammer\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$teleportation_jammer\"}]}}}" }, { "function": "set_name", diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/skins/teleportation_anchor.png b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/skins/teleportation_anchor.png new file mode 100644 index 0000000000..c3c84bd319 Binary files /dev/null and b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/skins/teleportation_anchor.png differ diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/skins/teleportation_jammer.png b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/skins/teleportation_jammer.png new file mode 100644 index 0000000000..607f4888f8 Binary files /dev/null and b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/skins/teleportation_jammer.png differ diff --git a/gm4_tinkering_compressors/data/gm4/advancements/tinkering_compressors.json b/gm4_tinkering_compressors/data/gm4/advancements/tinkering_compressors.json index fbb16cdf10..1f746fe6ec 100644 --- a/gm4_tinkering_compressors/data/gm4/advancements/tinkering_compressors.json +++ b/gm4_tinkering_compressors/data/gm4/advancements/tinkering_compressors.json @@ -2,7 +2,7 @@ "display": { "icon": { "item": "player_head", - "nbt": "{CustomModelData:3420015,SkullOwner:{Id:[I;-1331314679,659659762,2101919484,662148976],Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE0ODg0NjY1NTQzODUsInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDk2ZWJmMzMxZmQ1MzM3MjM0ZmU0OTM2ZWMyOTU2NTI4ZDQ3N2FiYTU4NzU5YmM2ZWIyODRiMmU5MmQxNDI4In19fQ==\"}]}}}" + "nbt": "{CustomModelData:3420015,SkullOwner:\"$gm4_metallurgy:band/curies_bismium\"}" }, "title": { "translate": "advancement.gm4.tinkering_compressors.title", diff --git a/gm4_tinkering_compressors/data/gm4_tinkering_compressors/functions/relocate/place_down.mcfunction b/gm4_tinkering_compressors/data/gm4_tinkering_compressors/functions/relocate/place_down.mcfunction index 84c7643d95..80b5b90401 100644 --- a/gm4_tinkering_compressors/data/gm4_tinkering_compressors/functions/relocate/place_down.mcfunction +++ b/gm4_tinkering_compressors/data/gm4_tinkering_compressors/functions/relocate/place_down.mcfunction @@ -8,6 +8,6 @@ execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ dropper[fa execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ dropper[facing=up] data merge block ~ ~ ~ {CustomName:'{"translate":"container.gm4.tinkering_compressor","fallback":"Tinkering Compressor"}'} -summon armor_stand ~ ~-.4 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_tinkering_compressor"],HasVisualFire:1,CustomName:'"gm4_tinkering_compressor"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420001,SkullOwner:{Id:[I;690199207,-409122254,-1436298594,1358624862],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWQyZTU2OTkwOTI4ZWM2ZjI1NzY5YTczNjE2M2MxOWFjOTcwNmYyNTM0Y2YwM2FlOWNhMzgyOWY2MzdiYTMwMCJ9fX0="}]}}}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420002}}],Pose:{RightArm:[0f, 0f, 0f]}} +summon armor_stand ~ ~-.4 ~ {Small:1,NoGravity:1,Marker:1,Invulnerable:1,Invisible:1,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_tinkering_compressor"],HasVisualFire:1,CustomName:'"gm4_tinkering_compressor"',ArmorItems:[{},{},{},{id:"minecraft:player_head",Count:1b,tag:{CustomModelData:3420001,SkullOwner:"$tinkering_compressor"}}],HandItems:[{id:"minecraft:stone_button",Count:1b,tag:{CustomModelData:3420002}}],Pose:{RightArm:[0f, 0f, 0f]}} playsound minecraft:entity.firework_rocket.blast block @a[distance=..5] particle cloud ~ ~ ~ 0.1 0.1 0.1 0.05 10 diff --git a/gm4_tinkering_compressors/data/gm4_tinkering_compressors/loot_tables/items/tinkering_compressor.json b/gm4_tinkering_compressors/data/gm4_tinkering_compressors/loot_tables/items/tinkering_compressor.json index 34aa27e518..b52802fff5 100644 --- a/gm4_tinkering_compressors/data/gm4_tinkering_compressors/loot_tables/items/tinkering_compressor.json +++ b/gm4_tinkering_compressors/data/gm4_tinkering_compressors/loot_tables/items/tinkering_compressor.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420136,gm4_machines:{id:\"tinkering_compressor\"},gm4_metallurgy:{has_shamir:1b},SkullOwner:{Name:\"gm4_tinkering_compressor\",Id:[I;1102824805,-1759752670,-1411440773,621305304],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1NDM0MjA3MiwKICAicHJvZmlsZUlkIiA6ICI3MzgyZGRmYmU0ODU0NTVjODI1ZjkwMGY4OGZkMzJmOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJJb3lhbCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8xZDYwOWQzYTNiNjRiNjlmZTE0MDhjZmE0NjY3YjU1ZTU1YWE3NTI3OWQ2ZjAyOTU4MjEzOTYyYTlkZDBkMTQ4IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=\"}]}}}" + "tag": "{CustomModelData:3420136,gm4_machines:{id:\"tinkering_compressor\"},gm4_metallurgy:{has_shamir:1b},SkullOwner:{Name:\"gm4_tinkering_compressor\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$tinkering_compressor\"}]}}}" }, { "function": "set_name", diff --git a/gm4_tinkering_compressors/data/gm4_tinkering_compressors/skins/tinkering_compressor.png b/gm4_tinkering_compressors/data/gm4_tinkering_compressors/skins/tinkering_compressor.png new file mode 100644 index 0000000000..ec08107f5e Binary files /dev/null and b/gm4_tinkering_compressors/data/gm4_tinkering_compressors/skins/tinkering_compressor.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/functions/items/disarming.mcfunction b/gm4_tnt_landmines/data/gm4_tnt_landmines/functions/items/disarming.mcfunction index 9c0768a4ec..566ebf53a7 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/functions/items/disarming.mcfunction +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/functions/items/disarming.mcfunction @@ -8,7 +8,7 @@ playsound minecraft:entity.sheep.shear block @a[distance=..8] ~ ~1 ~ 0.6 0.3 advancement grant @a[distance=..4,gamemode=!spectator] only gm4:tnt_landmines #return item -summon item ~ ~1 ~ {Tags:["gm4_mine_checked","gm4_mine_new"],PickupDelay:30s,Motion:[0.0,0.4,0.0],Item:{id:":player_head",Count:1b,tag:{SkullOwner:{Id:[I;-1172284621,-1030471482,-1585707380,-40076772],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQxMDExMjEsInByb2ZpbGVJZCI6IjU3MGIwNWJhMjZmMzRhOGViZmRiODBlY2JjZDdlNjIwIiwicHJvZmlsZU5hbWUiOiJMb3JkU29ubnkiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2RkZWM2M2RlNWY4MmYyM2ExNTdmNTVkYTcyMmFiOTI3NDgzZTdkODk4YmU5MDg3MzQwOTE5ODZlNjY1MWQ4YTgifX19"}]}},gm4_tnt_landmines:{item:"landmine",block:"minecraft:tnt"},display:{Name:'{"italic":false,"translate":"item.gm4.tnt_landmine","fallback":"Landmine"}',Lore:['{"translate":"item.gm4.tnt_landmine.use","fallback":"Drop to use"}']}}}} +summon item ~ ~1 ~ {Tags:["gm4_mine_checked","gm4_mine_new"],PickupDelay:30s,Motion:[0.0,0.4,0.0],Item:{id:":player_head",Count:1b,tag:{SkullOwner:"$landmine",gm4_tnt_landmines:{item:"landmine",block:"minecraft:tnt"},display:{Name:'{"italic":false,"translate":"item.gm4.tnt_landmine","fallback":"Landmine"}',Lore:['{"translate":"item.gm4.tnt_landmine.use","fallback":"Drop to use"}']}}}} data modify entity @e[type=item,tag=gm4_mine_new,distance=..1.2,limit=1,sort=nearest] Item set from entity @e[type=armor_stand,tag=gm4_tnt_mine,distance=..0.1,limit=1,sort=nearest] ArmorItems[0] tag @e[type=item,tag=gm4_mine_new,distance=..1.2,limit=1,sort=nearest] remove gm4_mine_new diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/crafting_table_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/crafting_table_landmine.json index 6de4fb8503..6464afb244 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/crafting_table_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/crafting_table_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420045,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:crafting_table\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQyODI1NTUsInByb2ZpbGVJZCI6Ijc1MTQ0NDgxOTFlNjQ1NDY4Yzk3MzlhNmUzOTU3YmViIiwicHJvZmlsZU5hbWUiOiJUaGFua3NNb2phbmciLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzY2ODBmZmEyMTE5MzAwZGU2NWQzNjE4ODVkNjE0YjNlYTM3Y2QwODhiODc5OTAzMjc0MzNkNGMxMWU1ZjNjNSJ9fX0=\"}]},Id:[I;-893485270,-1979301661,-1601571774,-1580648190]}}" + "tag": "{CustomModelData:3420045,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:crafting_table\"},SkullOwner:\"$disguised/crafting_table\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/dirt_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/dirt_landmine.json index 0969835953..a0c862a8f4 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/dirt_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/dirt_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420042,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:dirt\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQ0MjA4NDgsInByb2ZpbGVJZCI6IjkxZjA0ZmU5MGYzNjQzYjU4ZjIwZTMzNzVmODZkMzllIiwicHJvZmlsZU5hbWUiOiJTdG9ybVN0b3JteSIsInNpZ25hdHVyZVJlcXVpcmVkIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGI1Mzc5ZjE2NWE1Y2M3YmI4YzM4MmZlOTJlMjRlODYwN2NiODU1Y2FjNmU4M2Q4NjJjNjBlZmNlZTA5MTE3NSJ9fX0=\"}]},Id:[I;-634349232,-591641614,-2012334048,-805394230]}}" + "tag": "{CustomModelData:3420042,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:dirt\"},SkullOwner:\"$disguised/dirt\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/grass_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/grass_landmine.json index 931231f94d..fecd3f55a7 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/grass_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/grass_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420041,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:grass_block\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQwMDkwMDUsInByb2ZpbGVJZCI6IjNmYzdmZGY5Mzk2MzRjNDE5MTE5OWJhM2Y3Y2MzZmVkIiwicHJvZmlsZU5hbWUiOiJZZWxlaGEiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzZiMzBmZTgxYWZlNTI2NjkxZGM1MDlhYzEwN2EzYjNjYTk1NTdjNDExZmYwZGMyZmNiNWE4YTlkNzc1ZTk0ODMifX19\"}]},Id:[I;940595468,1686389043,-1269390340,931805603]}}" + "tag": "{CustomModelData:3420041,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:grass_block\"},SkullOwner:\"$disguised/grass\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/invisible_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/invisible_landmine.json index 6498e60d17..4f49ed54b0 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/invisible_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/invisible_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420047,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:air\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQzODQ0NTUsInByb2ZpbGVJZCI6IjU3MGIwNWJhMjZmMzRhOGViZmRiODBlY2JjZDdlNjIwIiwicHJvZmlsZU5hbWUiOiJMb3JkU29ubnkiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzVlY2NhZmZlN2UwMWJjNjFiNjdmMDZkNGRmNjU2ZjQxZjdjMGJkODE3NzllNjFkMmEzYjk2YjE0MDVlYWQ1ODYifX19\"}]},Id:[I;1874250570,-1321581040,-1389990572,-1166592501]}}" + "tag": "{CustomModelData:3420047,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:air\"},SkullOwner:\"$disguised/invisible\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/netherrack_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/netherrack_landmine.json index 3eecf7426b..d0017a9485 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/netherrack_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/netherrack_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420046,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:netherrack\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQzNDQyNzYsInByb2ZpbGVJZCI6IjVkMjRiYTBiMjg4YzQyOTM4YmExMGVjOTkwNjRkMjU5IiwicHJvZmlsZU5hbWUiOiIxbnYzbnQxdjN0NGwzbnQiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzIwYmVlZWE4OTQ1MzAxOGMzNTVmZGZjZTg5YTM1ZTEyOGUwOWQyMzRlNWY5MGU0YzE4ZWE3MDI5NDYxOTFmNjIifX19\"}]},Id:[I;-1280943243,-877575330,-1094757423,425228596]}}" + "tag": "{CustomModelData:3420046,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:netherrack\"},SkullOwner:\"$disguised/netherrack\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_bricks_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_bricks_landmine.json index 7ff134d254..5d51980594 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_bricks_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_bricks_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420044,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:stone_bricks\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQyMjMxMzEsInByb2ZpbGVJZCI6ImIwZDczMmZlMDBmNzQwN2U5ZTdmNzQ2MzAxY2Q5OGNhIiwicHJvZmlsZU5hbWUiOiJPUHBscyIsInNpZ25hdHVyZVJlcXVpcmVkIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDJhOGE5NDk5MjE5NTk1NzEyYjI1ODdlZmViMzViMWY2NTU2ZGExMmIzZWU4ODI5NGUwMzk0MDM0YmZjMjhlOCJ9fX0=\"}]},Id:[I;737008073,-1254863835,-1725289382,-810892737]}}" + "tag": "{CustomModelData:3420044,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:stone_bricks\"},SkullOwner:\"$disguised/stone_bricks\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_landmine.json index 810780e61d..e270b01aff 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/stone_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420043,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:stone\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQxODg2MTMsInByb2ZpbGVJZCI6IjNmYzdmZGY5Mzk2MzRjNDE5MTE5OWJhM2Y3Y2MzZmVkIiwicHJvZmlsZU5hbWUiOiJZZWxlaGEiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzNjNjk4ZTE5MDllMWI4MzMxYmVhOGQ1YzU3N2NkMGM2M2I4YWVjMDFmYjg4ZjY0OWUwMGYwZmU5NjY1NDdjNWIifX19\"}]},Id:[I;-334658666,974668440,-2077434217,-1973492282]}}" + "tag": "{CustomModelData:3420043,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:stone\"},SkullOwner:\"$disguised/stone\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/tnt_landmine.json b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/tnt_landmine.json index c2143da9f1..34bf91d621 100644 --- a/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/tnt_landmine.json +++ b/gm4_tnt_landmines/data/gm4_tnt_landmines/loot_tables/items/tnt_landmine.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420040,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:tnt\"},SkullOwner:{Properties:{textures:[{Value:\"eyJ0aW1lc3RhbXAiOjE1NTQ0NzQxMDExMjEsInByb2ZpbGVJZCI6IjU3MGIwNWJhMjZmMzRhOGViZmRiODBlY2JjZDdlNjIwIiwicHJvZmlsZU5hbWUiOiJMb3JkU29ubnkiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2RkZWM2M2RlNWY4MmYyM2ExNTdmNTVkYTcyMmFiOTI3NDgzZTdkODk4YmU5MDg3MzQwOTE5ODZlNjY1MWQ4YTgifX19\"}]},Id:[I;-1172284621,-1030471482,-1585707380,-40076772]}}" + "tag": "{CustomModelData:3420040,gm4_tnt_landmines:{item:\"landmine\",block:\"minecraft:tnt\"},SkullOwner:\"$landmine\"}" }, { "function": "minecraft:set_name", diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/crafting_table.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/crafting_table.png new file mode 100644 index 0000000000..0ebdbee5dc Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/crafting_table.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/dirt.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/dirt.png new file mode 100644 index 0000000000..71c0547570 Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/dirt.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/grass.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/grass.png new file mode 100644 index 0000000000..f4a03223b3 Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/grass.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/invisible.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/invisible.png new file mode 100644 index 0000000000..c4d5d709aa Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/invisible.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/netherrack.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/netherrack.png new file mode 100644 index 0000000000..c999534417 Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/netherrack.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/stone.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/stone.png new file mode 100644 index 0000000000..d01afbdeb3 Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/stone.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/stone_bricks.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/stone_bricks.png new file mode 100644 index 0000000000..51a7643f67 Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/disguised/stone_bricks.png differ diff --git a/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/landmine.png b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/landmine.png new file mode 100644 index 0000000000..e33b733b94 Binary files /dev/null and b/gm4_tnt_landmines/data/gm4_tnt_landmines/skins/landmine.png differ diff --git a/gm4_vecto_shamir/data/gm4_vecto_shamir/functions/init.mcfunction b/gm4_vecto_shamir/data/gm4_vecto_shamir/functions/init.mcfunction index 08a0331a59..0109e9bcd6 100644 --- a/gm4_vecto_shamir/data/gm4_vecto_shamir/functions/init.mcfunction +++ b/gm4_vecto_shamir/data/gm4_vecto_shamir/functions/init.mcfunction @@ -10,7 +10,7 @@ scoreboard players set vecto_shamir gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_vecto_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_vecto_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_vecto_shamir:band/v1",name:"[Drop to Fix Item] gm4_vecto_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"vecto",metal:{type:"bismuth",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;-359255454,30123560,-1513962184,-616842323],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODAxNDc0OTQ2MSwKICAicHJvZmlsZUlkIiA6ICJiMWMyNWQ0YjMwZDU0N2Y4YTk3NmZlYTllOGU1YzBjMyIsCiAgInByb2ZpbGVOYW1lIiA6ICJvd29FbmRlciIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS82NmM0ODcwYmNiMDdkYWJjMjNiNTZkMzJlNzI5OWI5NTE4ZTU1N2VmMzU2YTNiZGRmNDBkNGM3MDIwYzI3MTdhIgogICAgfQogIH0KfQ=="}]}},CustomModelData:3420121,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['[{"translate":"item.gm4.metallurgy.bismuth.red","fallback":"Bi","italic":false,"color":"#F47989"},{"translate":"item.gm4.metallurgy.bismuth.orange","fallback":"sm","italic":false,"color":"#F5B478"},{"translate":"item.gm4.metallurgy.bismuth.yellow","fallback":"ut","italic":false,"color":"#F5DD79"},{"translate":"item.gm4.metallurgy.bismuth.green","fallback":"h ","italic":false,"color":"#78F4AE"},{"translate":"item.gm4.metallurgy.bismuth.blue","fallback":"Ba","italic":false,"color":"#79D6F5"},{"translate":"item.gm4.metallurgy.bismuth.purple","fallback":"nd","italic":false,"color":"#8378F5"},{"translate":"item.gm4.metallurgy.bismuth.magenta","fallback":"","italic":false,"color":"#D579F5"}]','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.vecto","fallback":"Vecto"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_vecto_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_vecto_shamir:band/v1",name:"[Drop to Fix Item] gm4_vecto_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"vecto",metal:{type:"bismuth",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/bismuth",CustomModelData:3420121,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['[{"translate":"item.gm4.metallurgy.bismuth.red","fallback":"Bi","italic":false,"color":"#F47989"},{"translate":"item.gm4.metallurgy.bismuth.orange","fallback":"sm","italic":false,"color":"#F5B478"},{"translate":"item.gm4.metallurgy.bismuth.yellow","fallback":"ut","italic":false,"color":"#F5DD79"},{"translate":"item.gm4.metallurgy.bismuth.green","fallback":"h ","italic":false,"color":"#78F4AE"},{"translate":"item.gm4.metallurgy.bismuth.blue","fallback":"Ba","italic":false,"color":"#79D6F5"},{"translate":"item.gm4.metallurgy.bismuth.purple","fallback":"nd","italic":false,"color":"#8378F5"},{"translate":"item.gm4.metallurgy.bismuth.magenta","fallback":"","italic":false,"color":"#D579F5"}]','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.vecto","fallback":"Vecto"}']}}} schedule function gm4_vecto_shamir:main 4t diff --git a/gm4_weighted_armour/data/gm4_weighted_armour/functions/init.mcfunction b/gm4_weighted_armour/data/gm4_weighted_armour/functions/init.mcfunction index c873da30a0..a8aa6a11e6 100644 --- a/gm4_weighted_armour/data/gm4_weighted_armour/functions/init.mcfunction +++ b/gm4_weighted_armour/data/gm4_weighted_armour/functions/init.mcfunction @@ -8,7 +8,7 @@ scoreboard players set weighted_armour gm4_modules 1 data remove storage gm4_player_heads:register heads[{id:"gm4_helious_shamir:band/v0"}] # register shamir with lib_player_heads -execute unless data storage gm4_player_heads:register heads[{id:"gm4_helious_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_helious_shamir:band/v1",name:"[Drop to Fix Item] gm4_helious_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"helious",metal:{type:"aluminium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:{Id:[I;1961294324,1560605478,885901402,915511979],Properties:{textures:[{Value:"ewogICJ0aW1lc3RhbXAiIDogMTYyODc4ODAzNjY3NCwKICAicHJvZmlsZUlkIiA6ICI2MjM5ZWRhM2ExY2Y0YjJiYWMyODk2NGQ0NmNlOWVhOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGYXRGYXRHb2QiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGQ3MTQ5OTY0MDNlMTNhNGE4ZTc4OTQ0OWNjN2I5OGRhMmI4NDc1NTRjNDgwZGUyMDUxOTcwYjIxODIzZGJkOSIKICAgIH0KICB9Cn0="}]}},CustomModelData:3420103,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F47989","translate":"item.gm4.metallurgy.band","fallback":"Aluminium Band","with":[{"translate":"item.gm4.metallurgy.aluminium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.helious","fallback":"Helious"}']}}} +execute unless data storage gm4_player_heads:register heads[{id:"gm4_helious_shamir:band/v1"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_helious_shamir:band/v1",name:"[Drop to Fix Item] gm4_helious_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"helious",metal:{type:"aluminium",amount:[12s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/aluminium",CustomModelData:3420103,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#F47989","translate":"item.gm4.metallurgy.band","fallback":"Aluminium Band","with":[{"translate":"item.gm4.metallurgy.aluminium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.helious","fallback":"Helious"}']}}} schedule function gm4_weighted_armour:main 1t diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_damage.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_damage.json index 34809a1b2f..e11ad66f98 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_damage.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_damage.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420054,gm4_zauber_cauldrons:{item:\"crystal\",type:\"instant_damage\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/instant_damage/v0\",Id:[I;-303046150,435877517,403512583,-719739582],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4NzQ1MDY4OCwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTUxN2E0NDE1NDI5NzQ2OTZjNjcxYWI3MmQ1ZmQwMTVhNTI5ZTVmZjVhZjRhYTEwNDM4MWY1ZjllYWYyM2EwYSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420054,gm4_zauber_cauldrons:{item:\"crystal\",type:\"instant_damage\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/instant_damage/v0\",Properties:{textures:[{Value:\"$crystal/instant_damage\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_health.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_health.json index 093cfeff27..83c30e8aac 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_health.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/instant_health.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420055,gm4_zauber_cauldrons:{item:\"crystal\",type:\"instant_health\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/instant_health/v0\",Id:[I;-306488150,400956517,403523013,-700259582],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4Nzc2NjExMSwKICAicHJvZmlsZUlkIiA6ICI2NGExOGZiZmQ0YWY0Yzg0YjliN2FjZmNlNDRmMTAzZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJieVJPTkFMX1lUIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzIxY2Y1YmM2OTJjZmQwZjI3YzkzNTUyOWJjNjE1ZmRjYjc0ZmZkZWJlYWFlY2JkOTU3OGFhOGUwMzFjNDRjYmYiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420055,gm4_zauber_cauldrons:{item:\"crystal\",type:\"instant_health\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/instant_health/v0\",Properties:{textures:[{Value:\"$crystal/instant_health\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/jump_boost.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/jump_boost.json index 4a290e9f85..526f8de998 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/jump_boost.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/jump_boost.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420056,gm4_zauber_cauldrons:{item:\"crystal\",type:\"jump_boost\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/jump_boost/v0\",Id:[I;-306488846,400519617,492543013,-700009782],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4Nzc5NDAwNSwKICAicHJvZmlsZUlkIiA6ICI1NWFkZmYwYWFlOGY0ODViOGFlMTZjOWY5MWFmMmYyYSIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWRYU3RvbmUiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjk0NTUyNmRmM2RhNTEwZTRhYTZkODk5Njc0MThlYTllZjIyNGM4Mzk2MjI1MmJkNjE1MzYyYTUxZTNjZDUwNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420056,gm4_zauber_cauldrons:{item:\"crystal\",type:\"jump_boost\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/jump_boost/v0\",Properties:{textures:[{Value:\"$crystal/jump_boost\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/poison.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/poison.json index 1ddded8b61..43df7aa946 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/poison.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/poison.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420057,gm4_zauber_cauldrons:{item:\"crystal\",type:\"poison\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/poison/v0\",Id:[I;-306913246,403513617,416233013,-700067452],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4NzgyMjA2MSwKICAicHJvZmlsZUlkIiA6ICIxYWZhZjc2NWI1ZGY0NjA3YmY3ZjY1ZGYzYWIwODhhOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJMb3lfQmxvb2RBbmdlbCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9kZjU0ZTJlMTBlMGQ5MTZlNzMxMTU3ODlmNjBmZmM4Yzk0NzkwN2Q3ZTUxNTIyMGYxMDM5ZWI3Y2QxYTM3M2VmIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420057,gm4_zauber_cauldrons:{item:\"crystal\",type:\"poison\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/poison/v0\",Properties:{textures:[{Value:\"$crystal/poison\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/regeneration.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/regeneration.json index 8fdb48261d..e00f444057 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/regeneration.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/regeneration.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420013,gm4_zauber_cauldrons:{item:\"crystal\",type:\"regeneration\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/regeneration/v1\",Id:[I;-503854593,212580059,-440694433,-647960158],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4Nzg1ODA5NywKICAicHJvZmlsZUlkIiA6ICJmNDY0NTcxNDNkMTU0ZmEwOTkxNjBlNGJmNzI3ZGNiOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWxhcGFnbzA1IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FmNzM2MDQwYmRlNDk2OTRhZjc4OGI4YmEzY2U1ODk0MWZlYTY4MzBkOTIzYzczMmY3ZWJjNDA5NDlkMDIzMTQiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420013,gm4_zauber_cauldrons:{item:\"crystal\",type:\"regeneration\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/regeneration/v1\",Properties:{textures:[{Value:\"$crystal/regeneration\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/speed.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/speed.json index ecd2e628e8..7496fbec00 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/speed.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/speed.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420012,gm4_zauber_cauldrons:{item:\"crystal\",type:\"speed\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/speed/v1\",Id:[I;143602933,54143057,74884136,193769722],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4Nzg4NDkwOSwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODkwYzMwMzUzN2QwN2FlMTM0Y2YwNzA4MzdkZWMwNGQyN2VhY2NkZTg5M2VlNDIwOTQyMjk5ODk2YmY5Njk3MSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420012,gm4_zauber_cauldrons:{item:\"crystal\",type:\"speed\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/speed/v1\",Properties:{textures:[{Value:\"$crystal/speed\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/strength.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/strength.json index 81ee4cc97d..b59afa7ffc 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/strength.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_tables/recipes/crystals/strength.json @@ -9,7 +9,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420058,gm4_zauber_cauldrons:{item:\"crystal\",type:\"strength\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/strength/v0\",Id:[I;-308545246,403555340,412409013,-705374452],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4NzkxOTAyNSwKICAicHJvZmlsZUlkIiA6ICJiNzVjZDRmMThkZjg0MmNlYjJhY2MxNTU5MTNiMjA0YiIsCiAgInByb2ZpbGVOYW1lIiA6ICJLcmlzdGlqb25hczEzIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FjZTJhNWQwM2I0MzczY2RkNjU1YjQ4MzZhZGQxMzdlOGQ4NDNmNTI4MjE4ZTRiNjY2NWViYWZmY2U4YzIxNWQiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]}},HideFlags:1}" + "tag": "{CustomModelData:3420058,gm4_zauber_cauldrons:{item:\"crystal\",type:\"strength\"},SkullOwner:{Name:\"[Drop to Fix Item] gm4_zauber_cauldrons:crystal/strength/v0\",Properties:{textures:[{Value:\"$crystal/strength\"}]}},HideFlags:1}" }, { "function": "minecraft:set_name", diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/instant_damage.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/instant_damage.png new file mode 100644 index 0000000000..f161bffb7e Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/instant_damage.png differ diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/instant_health.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/instant_health.png new file mode 100644 index 0000000000..88fa265a2c Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/instant_health.png differ diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/jump_boost.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/jump_boost.png new file mode 100644 index 0000000000..33e3a69ba7 Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/jump_boost.png differ diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/poison.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/poison.png new file mode 100644 index 0000000000..0261981e36 Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/poison.png differ diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/regeneration.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/regeneration.png new file mode 100644 index 0000000000..453d96c709 Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/regeneration.png differ diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/speed.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/speed.png new file mode 100644 index 0000000000..4478d96429 Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/speed.png differ diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/strength.png b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/strength.png new file mode 100644 index 0000000000..e1abc836f5 Binary files /dev/null and b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/skins/crystal/strength.png differ diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/harming.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/harming.mcfunction index c4785a09ae..015b6a2f3c 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/harming.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/harming.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.harming","fallback":"Zauber Harming Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.harming","fallback":"Zauber Harming Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138638081,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDcxNjQyNDAsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI2MjkyYmYwNzk0N2IxNjQ3ZmFlNGJjYjc2NzVmOWNhZGJiZDY1MDczMjIzNDM0M2RiZGY2YzA0MTRkYiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/harming"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_harming_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_harming_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/healing.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/healing.mcfunction index 327fa139b8..2ddad52545 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/healing.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/healing.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.healing","fallback":"Zauber Healing Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.healing","fallback":"Zauber Healing Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1138636289,-1614258018,-889714315],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYzOTQ3MTEsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzliYTZjZjQzODg0YjJjZmMyNDU0NGNmYTVmNmZjNzViY2M3OGE2YWM1NjhmYTE5OGY2NDVkZDkxNWM4Y2FlMzcifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/healing"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_healing_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_healing_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/leaping.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/leaping.mcfunction index 1708c23eaf..a9c062afd7 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/leaping.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/leaping.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.leaping","fallback":"Zauber Leaping Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.leaping","fallback":"Zauber Leaping Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271109,-1407071745,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY5NDYzMjksInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2RjMzE2NmFkZTk1NTA2Y2VmZDhjNTdiMWVlNWY4MTNiNTNhOWZjMTliYTEzNDhjYTE2NmE2YjBjZmEwMzAifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/leaping"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_leaping_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_leaping_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/poison.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/poison.mcfunction index 56c2d970de..148ef66f54 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/poison.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/poison.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.poison","fallback":"Zauber Poison Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.poison","fallback":"Zauber Poison Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;1056529285,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY4ODg4NzIsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzY2MWU3NWExMWEwNzBmNTgyMWMxYmJlOTkxMTJiZGJjYWVjY2IyZDQ3Njg2OWQ3N2ExYzJkZDlmZjY0MDM3In19fQ=="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/poison"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_poison_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_poison_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/regeneration.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/regeneration.mcfunction index d564bfe681..565b467f11 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/regeneration.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/regeneration.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.regeneration","fallback":"Zauber Regeneration Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.regeneration","fallback":"Zauber Regeneration Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271113,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDYxNzA4MTcsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzI2YzljOTNjNjRlZmYzMzE4MzFmNDkyY2E2Nzc1YWJjY2VkM2RjZDhmZWExOWEzMmM0OTM4NjRkYjFlMWMifX19"}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/regeneration"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_regeneration_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_regeneration_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/strength.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/strength.mcfunction index 0f72804ddf..a64e01bbc8 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/strength.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/strength.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.strength","fallback":"Zauber Strength Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.strength","fallback":"Zauber Strength Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2063162245,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDY3NTE4NTAsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y5NGE3YjJmZDc5MzYxNzdjNjI2ZDllYWQwZWY0MzRmMjNmNmViNmQyYzAzNDgwZGE2MDRlZWIyMWRjZiJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/strength"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_strength_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_strength_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/swiftness.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/swiftness.mcfunction index b0d2dce284..1745565cf3 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/swiftness.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/swiftness.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.swiftness","fallback":"Zauber Swiftness Potion Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.swiftness","fallback":"Zauber Swiftness Potion Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;2130271221,-1138636289,-1614258018,-889714317],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0MjkzNDc2MjgyNjQsInByb2ZpbGVJZCI6IjZjZjU0M2E2MGVlOTQzN2NiNjE0YzdiOTRkZTVjNWI3IiwicHJvZmlsZU5hbWUiOiJNcnNNYWtpc3RlaW4iLCJpc1B1YmxpYyI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzU1N2FhOWExMTBmOTEwOGE3MWI2MzI5ODhhMzM4MzQ1OGY0NDVlYjJlYjBmMDM4ZjE3ZDQ5OGU0YmNiYTJhZCJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_potion_liquids:liquids/swiftness"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_swiftness_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_swiftness_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/wormhole.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/wormhole.mcfunction index 0fec20a21e..431e93ce5f 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/wormhole.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/functions/liquid_init/wormhole.mcfunction @@ -1,5 +1,5 @@ data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.zauber_tank.wormhole","fallback":"Wormhole Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.zauber_tank.wormhole","fallback":"Wormhole Tank","font":"gm4:default","color":"#404040"}]]}'} -summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:{Id:[I;-1903127985,893928782,-1710128554,467590157],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODQ5M2Q5OTRlODBmOTc0NWNiZWFiYWMwN2VkYmE2MTk5YTgyNGM3YTJhYTJjNDI1MjhkMDNkMzAzYzVhN2M5YSJ9fX0="}]}}}}]} +summon armor_stand ~ ~-.95 ~ {CustomName:'"gm4_liquid_tank_display"',Tags:["gm4_no_edit","gm4_liquid_tank_display","smithed.entity","smithed.strict"],NoGravity:1,Marker:1,Invisible:1,Invulnerable:1,Small:1,Silent:1,DisabledSlots:4144959,HasVisualFire:1,ArmorItems:[{},{},{},{id:"player_head",Count:1b,tag:{SkullOwner:"$gm4_zauber_liquids:liquids/wormhole"}}]} data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "gm4_lt_zauber_wormhole_potion" scoreboard players set @s gm4_lt_max 300 tag @s add gm4_lt_zauber_wormhole_potion diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/skins/liquids/wormhole.png b/gm4_zauber_liquids/data/gm4_zauber_liquids/skins/liquids/wormhole.png new file mode 100644 index 0000000000..de8035869f Binary files /dev/null and b/gm4_zauber_liquids/data/gm4_zauber_liquids/skins/liquids/wormhole.png differ diff --git a/lib_custom_crafters/beet.yaml b/lib_custom_crafters/beet.yaml index 2e267a9d60..a5819418e5 100644 --- a/lib_custom_crafters/beet.yaml +++ b/lib_custom_crafters/beet.yaml @@ -6,9 +6,14 @@ data_pack: load: data: data +require: + - gm4.plugins.player_heads + pipeline: - lib_custom_crafters.generate_item_tags - gm4.plugins.module.gm4_root_advancement + - gm4.plugins.player_heads.process_json_files + - mecha - gm4.plugins.extend.library - gm4.plugins.include.lib_machines - gm4.plugins.include.lib_forceload @@ -35,3 +40,7 @@ meta: - SpecialBuilder32 Textures by: - kyrkis + mecha: + layout: preserve + nbt_compact: True + cmd_compact: True diff --git a/lib_custom_crafters/data/gm4_custom_crafters/loot_tables/items/custom_crafter.json b/lib_custom_crafters/data/gm4_custom_crafters/loot_tables/items/custom_crafter.json index 3b41b9ee99..fde1b024a0 100644 --- a/lib_custom_crafters/data/gm4_custom_crafters/loot_tables/items/custom_crafter.json +++ b/lib_custom_crafters/data/gm4_custom_crafters/loot_tables/items/custom_crafter.json @@ -10,7 +10,7 @@ "functions": [ { "function": "set_nbt", - "tag": "{CustomModelData:3420128,gm4_machines:{id:\"custom_crafter\"},SkullOwner:{Name:\"gm4_custom_crafter\",Id:[I;-141969460,1701595331,-2105287834,13831947],Properties:{textures:[{Signature:\"gm4_machine\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Mjg1Mzk1Mjk4NiwKICAicHJvZmlsZUlkIiA6ICJhYjlkYmMzZjk4NGE0ZWI4YTVmY2RlYWMzNzEzZWFkMSIsCiAgInByb2ZpbGVOYW1lIiA6ICJDeWJvcm51dDIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTE1ZDUwNmI2MzlhMzI1OWVlNDhkMTcyMjYzZWI2NzljY2NhNDQzNjVmY2VlMTllZDllYjI3NzU1YjAxN2IyYyIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}}}" + "tag": "{CustomModelData:3420128,gm4_machines:{id:\"custom_crafter\"},SkullOwner:{Name:\"gm4_custom_crafter\",Properties:{textures:[{Signature:\"gm4_machine\",Value:\"$gm4_custom_crafters:custom_crafter\"}]}}}" }, { "function": "set_name", 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 new file mode 100644 index 0000000000..13edd79911 Binary files /dev/null and b/lib_custom_crafters/data/gm4_custom_crafters/skins/custom_crafter.png differ diff --git a/lib_player_heads/README.md b/lib_player_heads/README.md new file mode 100644 index 0000000000..78efe6aad7 --- /dev/null +++ b/lib_player_heads/README.md @@ -0,0 +1,34 @@ +[Lantern Load]: https://github.com/LanternMC/Load + +# lib_player_heads +lib_player_heads is a mcfunction library that allows other datapacks to easily register player heads to a central system, which enables `minecraft:player_head` items to keep their item NBT (the contents of `Item.tag`) even after being placed down and mined. + +## How to use +Items can be restored based on their texture or `SkullOwner.Name`. +Note that if your item currently has a `SkullOwner.Name`, this lookup method will take priority over the texture method, so you may need to manually upgrade old items to have a more unique value for `SkullOwner.Name`. +Additionally, items with the `gm4_player_head:1b` tag will be excluded from processing, so you are recommended to put this tag on all custom skulls so they are not processed unnecessarily. + +If your items do not currently have a name, your pack should register the items based on their texture. +Otherwise, it is recommended to use a unique name. +The unique name should be derived from the `id` tag, but for user readability if they pick the item up too fast, it should include a string like `[Drop to Fix Item]` before the namespaced ID. + +To register a player head, the data pack must invoke the following command at least once for each player head to be registered: + +```mcfunction +execute unless data storage gm4_player_heads:register heads[{id:"NAMESPACED_IDENTIFIER_FOR_SKULL"}] run data modify storage gm4_player_heads:register heads append value {id:"NAMESPACED_IDENTIFIER_FOR_SKULL",value:'TEXTURE_DATA',name:'UNIQUE_SKULL_OWNER_NAME',item:{}} +``` + +It is recommended to do these calls upon reload in case the data is somehow removed, but otherwise the data will generally persist forever. + +- `NAMESPACED_IDENTIFIER_FOR_SKULL` is an indentifier used internally by the library. It should be descriptive and namespaced; versioning is recommended. For an example, see the provided `example_use`. +- `TEXTURE_DATA` is the texture data of the player head. On the item this is usually located at `tag.SkullOwner.Properties.textures[0].Value`. +- `UNIQUE_SKULL_OWNER_NAME` is a unique name stored in the player head's `SkullOwner.Name` tag. When `SkullOwner.Name` is present, this lookup method takes priority over the texture method. +- `` is to be replaced with the item data the skull should regain after being placed and broken. Bear in mind that a discrepancy between the NBT provided here and the original NBT of the item (for example from a loot table) will lead to undesired stacking issues. Notably, text components such as those present in `display.Name` or `display.Lore` may have an unexpected order if generated from a loot table, so you should be careful to replicate that order when registering your item with this library. + +You may provide `value`, `name`, or both, but whenever possible it is best to provide *only* `name` so that multiple unique items may share a texture without ambiguity. + +Please note that the `example_pack` must be started by calling `#load:load`, as a [proper load implementation](Lantern Load) is not included. The provided loot table in `example_pack` is NOT required. + +## Technical Details + - All player head data is stored in storage at `gm4_player_heads:register`. + - Player heads with the `gm4_player_head:1b` tag will be excluded from processing. diff --git a/module.yaml b/module.yaml index 1c7b9e2428..eda7374193 100644 --- a/module.yaml +++ b/module.yaml @@ -3,5 +3,7 @@ pipeline: - gm4.plugins.module.gm4_root_advancement - gm4.plugins.versioning.modules - gm4.plugins.upgrade_paths + - gm4.plugins.player_heads.process_json_files + - mecha - directory: '../base' extend: 'beet.yaml' diff --git a/poetry.lock b/poetry.lock index 2cb8dfaa3d..df660198be 100644 --- a/poetry.lock +++ b/poetry.lock @@ -63,19 +63,19 @@ uvloop = ["uvloop (>=0.15.2)"] [[package]] name = "bolt" -version = "0.31.0" +version = "0.37.0" description = "Supercharge Minecraft commands with Python" category = "main" optional = false python-versions = ">=3.10,<4.0" files = [ - {file = "bolt-0.31.0-py3-none-any.whl", hash = "sha256:89b54ef0048a82f60e84e4dec5bfc118ffd13576ce9cf7600099b88408a9a41c"}, - {file = "bolt-0.31.0.tar.gz", hash = "sha256:f95d164e554bb602fbdcfafa59fbc694843a9aa5247829677b10644db624d51a"}, + {file = "bolt-0.37.0-py3-none-any.whl", hash = "sha256:dee3a5c8acdd123ef6f223690ab0b6d1ab67e485eaa95ad6c06d914964fe672e"}, + {file = "bolt-0.37.0.tar.gz", hash = "sha256:357f7e4efa3243e36f22e3b439995b2677c0ee1b7f13be7dde0406653d3d6caf"}, ] [package.dependencies] -beet = ">=0.83.1" -mecha = ">=0.67.0" +beet = ">=0.87.0" +mecha = ">=0.74.0" [[package]] name = "bolt-expressions" @@ -97,111 +97,111 @@ nbtlib = "1.12.1" [[package]] name = "certifi" -version = "2023.5.7" +version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2023.5.7-py3-none-any.whl", hash = "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"}, - {file = "certifi-2023.5.7.tar.gz", hash = "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7"}, + {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, + {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, ] [[package]] name = "charset-normalizer" -version = "3.1.0" +version = "3.2.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false python-versions = ">=3.7.0" files = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, + {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"}, + {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, ] [[package]] name = "click" -version = "8.1.3" +version = "8.1.7" description = "Composable command line interface toolkit" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, - {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, ] [package.dependencies] @@ -209,14 +209,14 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} [[package]] name = "click-help-colors" -version = "0.9.1" +version = "0.9.2" description = "Colorization of help messages in Click" category = "main" optional = false python-versions = "*" files = [ - {file = "click-help-colors-0.9.1.tar.gz", hash = "sha256:78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d"}, - {file = "click_help_colors-0.9.1-py3-none-any.whl", hash = "sha256:25a6bd22d8abbc72c18a416a1cf21ab65b6120bee48e9637829666cbad22d51d"}, + {file = "click-help-colors-0.9.2.tar.gz", hash = "sha256:756245e542d29226bb3bc056bfa58886f212ba2b82f4e8cf5fc884176ac96d72"}, + {file = "click_help_colors-0.9.2-py3-none-any.whl", hash = "sha256:82ef028cb0a332a154fa42fd7cca2c728a019b32bcb5a26bb32367551014a16f"}, ] [package.dependencies] @@ -347,19 +347,19 @@ files = [ [[package]] name = "mecha" -version = "0.67.0" +version = "0.76.2" description = "A powerful Minecraft command library" category = "main" optional = false python-versions = ">=3.10,<4.0" files = [ - {file = "mecha-0.67.0-py3-none-any.whl", hash = "sha256:89c99bdfd34c8731d0781327fc882d1b5dde6e61565fa39f9db09c01ebc9da55"}, - {file = "mecha-0.67.0.tar.gz", hash = "sha256:49a95e34be23495731fb996ff87479b0addca3729e77258be1fb2d5dcc007a9b"}, + {file = "mecha-0.76.2-py3-none-any.whl", hash = "sha256:1970cfdc72aceb982a6520e246288cc4a15a9b197328bc380724c029c8393bbc"}, + {file = "mecha-0.76.2.tar.gz", hash = "sha256:da737323c08fd7b3cd7dce8f5ca2b239c8ad5342972b01b553fb14ccfaed79b1"}, ] [package.dependencies] -beet = ">=0.83.1" -tokenstream = ">=1.5.0,<2.0.0" +beet = ">=0.86.0" +tokenstream = ">=1.7.0,<2.0.0" [[package]] name = "mypy-extensions" @@ -390,114 +390,179 @@ numpy = "*" [[package]] name = "numpy" -version = "1.24.3" +version = "1.25.2" description = "Fundamental package for array computing in Python" category = "main" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "numpy-1.24.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3c1104d3c036fb81ab923f507536daedc718d0ad5a8707c6061cdfd6d184e570"}, - {file = "numpy-1.24.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:202de8f38fc4a45a3eea4b63e2f376e5f2dc64ef0fa692838e31a808520efaf7"}, - {file = "numpy-1.24.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8535303847b89aa6b0f00aa1dc62867b5a32923e4d1681a35b5eef2d9591a463"}, - {file = "numpy-1.24.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2d926b52ba1367f9acb76b0df6ed21f0b16a1ad87c6720a1121674e5cf63e2b6"}, - {file = "numpy-1.24.3-cp310-cp310-win32.whl", hash = "sha256:f21c442fdd2805e91799fbe044a7b999b8571bb0ab0f7850d0cb9641a687092b"}, - {file = "numpy-1.24.3-cp310-cp310-win_amd64.whl", hash = "sha256:ab5f23af8c16022663a652d3b25dcdc272ac3f83c3af4c02eb8b824e6b3ab9d7"}, - {file = "numpy-1.24.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9a7721ec204d3a237225db3e194c25268faf92e19338a35f3a224469cb6039a3"}, - {file = "numpy-1.24.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d6cc757de514c00b24ae8cf5c876af2a7c3df189028d68c0cb4eaa9cd5afc2bf"}, - {file = "numpy-1.24.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76e3f4e85fc5d4fd311f6e9b794d0c00e7002ec122be271f2019d63376f1d385"}, - {file = "numpy-1.24.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1d3c026f57ceaad42f8231305d4653d5f05dc6332a730ae5c0bea3513de0950"}, - {file = "numpy-1.24.3-cp311-cp311-win32.whl", hash = "sha256:c91c4afd8abc3908e00a44b2672718905b8611503f7ff87390cc0ac3423fb096"}, - {file = "numpy-1.24.3-cp311-cp311-win_amd64.whl", hash = "sha256:5342cf6aad47943286afa6f1609cad9b4266a05e7f2ec408e2cf7aea7ff69d80"}, - {file = "numpy-1.24.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7776ea65423ca6a15255ba1872d82d207bd1e09f6d0894ee4a64678dd2204078"}, - {file = "numpy-1.24.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ae8d0be48d1b6ed82588934aaaa179875e7dc4f3d84da18d7eae6eb3f06c242c"}, - {file = "numpy-1.24.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ecde0f8adef7dfdec993fd54b0f78183051b6580f606111a6d789cd14c61ea0c"}, - {file = "numpy-1.24.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4749e053a29364d3452c034827102ee100986903263e89884922ef01a0a6fd2f"}, - {file = "numpy-1.24.3-cp38-cp38-win32.whl", hash = "sha256:d933fabd8f6a319e8530d0de4fcc2e6a61917e0b0c271fded460032db42a0fe4"}, - {file = "numpy-1.24.3-cp38-cp38-win_amd64.whl", hash = "sha256:56e48aec79ae238f6e4395886b5eaed058abb7231fb3361ddd7bfdf4eed54289"}, - {file = "numpy-1.24.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4719d5aefb5189f50887773699eaf94e7d1e02bf36c1a9d353d9f46703758ca4"}, - {file = "numpy-1.24.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0ec87a7084caa559c36e0a2309e4ecb1baa03b687201d0a847c8b0ed476a7187"}, - {file = "numpy-1.24.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea8282b9bcfe2b5e7d491d0bf7f3e2da29700cec05b49e64d6246923329f2b02"}, - {file = "numpy-1.24.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:210461d87fb02a84ef243cac5e814aad2b7f4be953b32cb53327bb49fd77fbb4"}, - {file = "numpy-1.24.3-cp39-cp39-win32.whl", hash = "sha256:784c6da1a07818491b0ffd63c6bbe5a33deaa0e25a20e1b3ea20cf0e43f8046c"}, - {file = "numpy-1.24.3-cp39-cp39-win_amd64.whl", hash = "sha256:d5036197ecae68d7f491fcdb4df90082b0d4960ca6599ba2659957aafced7c17"}, - {file = "numpy-1.24.3-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:352ee00c7f8387b44d19f4cada524586f07379c0d49270f87233983bc5087ca0"}, - {file = "numpy-1.24.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a7d6acc2e7524c9955e5c903160aa4ea083736fde7e91276b0e5d98e6332812"}, - {file = "numpy-1.24.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:35400e6a8d102fd07c71ed7dcadd9eb62ee9a6e84ec159bd48c28235bbb0f8e4"}, - {file = "numpy-1.24.3.tar.gz", hash = "sha256:ab344f1bf21f140adab8e47fdbc7c35a477dc01408791f8ba00d018dd0bc5155"}, + {file = "numpy-1.25.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db3ccc4e37a6873045580d413fe79b68e47a681af8db2e046f1dacfa11f86eb3"}, + {file = "numpy-1.25.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:90319e4f002795ccfc9050110bbbaa16c944b1c37c0baeea43c5fb881693ae1f"}, + {file = "numpy-1.25.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dfe4a913e29b418d096e696ddd422d8a5d13ffba4ea91f9f60440a3b759b0187"}, + {file = "numpy-1.25.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f08f2e037bba04e707eebf4bc934f1972a315c883a9e0ebfa8a7756eabf9e357"}, + {file = "numpy-1.25.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bec1e7213c7cb00d67093247f8c4db156fd03075f49876957dca4711306d39c9"}, + {file = "numpy-1.25.2-cp310-cp310-win32.whl", hash = "sha256:7dc869c0c75988e1c693d0e2d5b26034644399dd929bc049db55395b1379e044"}, + {file = "numpy-1.25.2-cp310-cp310-win_amd64.whl", hash = "sha256:834b386f2b8210dca38c71a6e0f4fd6922f7d3fcff935dbe3a570945acb1b545"}, + {file = "numpy-1.25.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c5462d19336db4560041517dbb7759c21d181a67cb01b36ca109b2ae37d32418"}, + {file = "numpy-1.25.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c5652ea24d33585ea39eb6a6a15dac87a1206a692719ff45d53c5282e66d4a8f"}, + {file = "numpy-1.25.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d60fbae8e0019865fc4784745814cff1c421df5afee233db6d88ab4f14655a2"}, + {file = "numpy-1.25.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60e7f0f7f6d0eee8364b9a6304c2845b9c491ac706048c7e8cf47b83123b8dbf"}, + {file = "numpy-1.25.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:bb33d5a1cf360304754913a350edda36d5b8c5331a8237268c48f91253c3a364"}, + {file = "numpy-1.25.2-cp311-cp311-win32.whl", hash = "sha256:5883c06bb92f2e6c8181df7b39971a5fb436288db58b5a1c3967702d4278691d"}, + {file = "numpy-1.25.2-cp311-cp311-win_amd64.whl", hash = "sha256:5c97325a0ba6f9d041feb9390924614b60b99209a71a69c876f71052521d42a4"}, + {file = "numpy-1.25.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b79e513d7aac42ae918db3ad1341a015488530d0bb2a6abcbdd10a3a829ccfd3"}, + {file = "numpy-1.25.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:eb942bfb6f84df5ce05dbf4b46673ffed0d3da59f13635ea9b926af3deb76926"}, + {file = "numpy-1.25.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e0746410e73384e70d286f93abf2520035250aad8c5714240b0492a7302fdca"}, + {file = "numpy-1.25.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7806500e4f5bdd04095e849265e55de20d8cc4b661b038957354327f6d9b295"}, + {file = "numpy-1.25.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8b77775f4b7df768967a7c8b3567e309f617dd5e99aeb886fa14dc1a0791141f"}, + {file = "numpy-1.25.2-cp39-cp39-win32.whl", hash = "sha256:2792d23d62ec51e50ce4d4b7d73de8f67a2fd3ea710dcbc8563a51a03fb07b01"}, + {file = "numpy-1.25.2-cp39-cp39-win_amd64.whl", hash = "sha256:76b4115d42a7dfc5d485d358728cdd8719be33cc5ec6ec08632a5d6fca2ed380"}, + {file = "numpy-1.25.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1a1329e26f46230bf77b02cc19e900db9b52f398d6722ca853349a782d4cff55"}, + {file = "numpy-1.25.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c3abc71e8b6edba80a01a52e66d83c5d14433cbcd26a40c329ec7ed09f37901"}, + {file = "numpy-1.25.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:1b9735c27cea5d995496f46a8b1cd7b408b3f34b6d50459d9ac8fe3a20cc17bf"}, + {file = "numpy-1.25.2.tar.gz", hash = "sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760"}, ] [[package]] name = "pathspec" -version = "0.11.1" +version = "0.11.2" description = "Utility library for gitignore style pattern matching of file paths." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "pathspec-0.11.1-py3-none-any.whl", hash = "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293"}, - {file = "pathspec-0.11.1.tar.gz", hash = "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687"}, + {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"}, + {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"}, +] + +[[package]] +name = "pillow" +version = "10.0.0" +description = "Python Imaging Library (Fork)" +category = "main" +optional = false +python-versions = ">=3.8" +files = [ + {file = "Pillow-10.0.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:1f62406a884ae75fb2f818694469519fb685cc7eaff05d3451a9ebe55c646891"}, + {file = "Pillow-10.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d5db32e2a6ccbb3d34d87c87b432959e0db29755727afb37290e10f6e8e62614"}, + {file = "Pillow-10.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edf4392b77bdc81f36e92d3a07a5cd072f90253197f4a52a55a8cec48a12483b"}, + {file = "Pillow-10.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:520f2a520dc040512699f20fa1c363eed506e94248d71f85412b625026f6142c"}, + {file = "Pillow-10.0.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:8c11160913e3dd06c8ffdb5f233a4f254cb449f4dfc0f8f4549eda9e542c93d1"}, + {file = "Pillow-10.0.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:a74ba0c356aaa3bb8e3eb79606a87669e7ec6444be352870623025d75a14a2bf"}, + {file = "Pillow-10.0.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d0dae4cfd56969d23d94dc8e89fb6a217be461c69090768227beb8ed28c0a3"}, + {file = "Pillow-10.0.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22c10cc517668d44b211717fd9775799ccec4124b9a7f7b3635fc5386e584992"}, + {file = "Pillow-10.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:dffe31a7f47b603318c609f378ebcd57f1554a3a6a8effbc59c3c69f804296de"}, + {file = "Pillow-10.0.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:9fb218c8a12e51d7ead2a7c9e101a04982237d4855716af2e9499306728fb485"}, + {file = "Pillow-10.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d35e3c8d9b1268cbf5d3670285feb3528f6680420eafe35cccc686b73c1e330f"}, + {file = "Pillow-10.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ed64f9ca2f0a95411e88a4efbd7a29e5ce2cea36072c53dd9d26d9c76f753b3"}, + {file = "Pillow-10.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b6eb5502f45a60a3f411c63187db83a3d3107887ad0d036c13ce836f8a36f1d"}, + {file = "Pillow-10.0.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:c1fbe7621c167ecaa38ad29643d77a9ce7311583761abf7836e1510c580bf3dd"}, + {file = "Pillow-10.0.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cd25d2a9d2b36fcb318882481367956d2cf91329f6892fe5d385c346c0649629"}, + {file = "Pillow-10.0.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3b08d4cc24f471b2c8ca24ec060abf4bebc6b144cb89cba638c720546b1cf538"}, + {file = "Pillow-10.0.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d737a602fbd82afd892ca746392401b634e278cb65d55c4b7a8f48e9ef8d008d"}, + {file = "Pillow-10.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:3a82c40d706d9aa9734289740ce26460a11aeec2d9c79b7af87bb35f0073c12f"}, + {file = "Pillow-10.0.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:d80cf684b541685fccdd84c485b31ce73fc5c9b5d7523bf1394ce134a60c6883"}, + {file = "Pillow-10.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:76de421f9c326da8f43d690110f0e79fe3ad1e54be811545d7d91898b4c8493e"}, + {file = "Pillow-10.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81ff539a12457809666fef6624684c008e00ff6bf455b4b89fd00a140eecd640"}, + {file = "Pillow-10.0.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce543ed15570eedbb85df19b0a1a7314a9c8141a36ce089c0a894adbfccb4568"}, + {file = "Pillow-10.0.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:685ac03cc4ed5ebc15ad5c23bc555d68a87777586d970c2c3e216619a5476223"}, + {file = "Pillow-10.0.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:d72e2ecc68a942e8cf9739619b7f408cc7b272b279b56b2c83c6123fcfa5cdff"}, + {file = "Pillow-10.0.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d50b6aec14bc737742ca96e85d6d0a5f9bfbded018264b3b70ff9d8c33485551"}, + {file = "Pillow-10.0.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:00e65f5e822decd501e374b0650146063fbb30a7264b4d2744bdd7b913e0cab5"}, + {file = "Pillow-10.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:f31f9fdbfecb042d046f9d91270a0ba28368a723302786c0009ee9b9f1f60199"}, + {file = "Pillow-10.0.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:349930d6e9c685c089284b013478d6f76e3a534e36ddfa912cde493f235372f3"}, + {file = "Pillow-10.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3a684105f7c32488f7153905a4e3015a3b6c7182e106fe3c37fbb5ef3e6994c3"}, + {file = "Pillow-10.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4f69b3700201b80bb82c3a97d5e9254084f6dd5fb5b16fc1a7b974260f89f43"}, + {file = "Pillow-10.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f07ea8d2f827d7d2a49ecf1639ec02d75ffd1b88dcc5b3a61bbb37a8759ad8d"}, + {file = "Pillow-10.0.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:040586f7d37b34547153fa383f7f9aed68b738992380ac911447bb78f2abe530"}, + {file = "Pillow-10.0.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:f88a0b92277de8e3ca715a0d79d68dc82807457dae3ab8699c758f07c20b3c51"}, + {file = "Pillow-10.0.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c7cf14a27b0d6adfaebb3ae4153f1e516df54e47e42dcc073d7b3d76111a8d86"}, + {file = "Pillow-10.0.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3400aae60685b06bb96f99a21e1ada7bc7a413d5f49bce739828ecd9391bb8f7"}, + {file = "Pillow-10.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:dbc02381779d412145331789b40cc7b11fdf449e5d94f6bc0b080db0a56ea3f0"}, + {file = "Pillow-10.0.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:9211e7ad69d7c9401cfc0e23d49b69ca65ddd898976d660a2fa5904e3d7a9baa"}, + {file = "Pillow-10.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:faaf07ea35355b01a35cb442dd950d8f1bb5b040a7787791a535de13db15ed90"}, + {file = "Pillow-10.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9f72a021fbb792ce98306ffb0c348b3c9cb967dce0f12a49aa4c3d3fdefa967"}, + {file = "Pillow-10.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f7c16705f44e0504a3a2a14197c1f0b32a95731d251777dcb060aa83022cb2d"}, + {file = "Pillow-10.0.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:76edb0a1fa2b4745fb0c99fb9fb98f8b180a1bbceb8be49b087e0b21867e77d3"}, + {file = "Pillow-10.0.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:368ab3dfb5f49e312231b6f27b8820c823652b7cd29cfbd34090565a015e99ba"}, + {file = "Pillow-10.0.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:608bfdee0d57cf297d32bcbb3c728dc1da0907519d1784962c5f0c68bb93e5a3"}, + {file = "Pillow-10.0.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5c6e3df6bdd396749bafd45314871b3d0af81ff935b2d188385e970052091017"}, + {file = "Pillow-10.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:7be600823e4c8631b74e4a0d38384c73f680e6105a7d3c6824fcf226c178c7e6"}, + {file = "Pillow-10.0.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:92be919bbc9f7d09f7ae343c38f5bb21c973d2576c1d45600fce4b74bafa7ac0"}, + {file = "Pillow-10.0.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f8182b523b2289f7c415f589118228d30ac8c355baa2f3194ced084dac2dbba"}, + {file = "Pillow-10.0.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:38250a349b6b390ee6047a62c086d3817ac69022c127f8a5dc058c31ccef17f3"}, + {file = "Pillow-10.0.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:88af2003543cc40c80f6fca01411892ec52b11021b3dc22ec3bc9d5afd1c5334"}, + {file = "Pillow-10.0.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:c189af0545965fa8d3b9613cfdb0cd37f9d71349e0f7750e1fd704648d475ed2"}, + {file = "Pillow-10.0.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce7b031a6fc11365970e6a5686d7ba8c63e4c1cf1ea143811acbb524295eabed"}, + {file = "Pillow-10.0.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:db24668940f82321e746773a4bc617bfac06ec831e5c88b643f91f122a785684"}, + {file = "Pillow-10.0.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:efe8c0681042536e0d06c11f48cebe759707c9e9abf880ee213541c5b46c5bf3"}, + {file = "Pillow-10.0.0.tar.gz", hash = "sha256:9c82b5b3e043c7af0d95792d0d20ccf68f61a1fec6b3530e718b688422727396"}, ] +[package.extras] +docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"] +tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] + [[package]] name = "platformdirs" -version = "3.5.3" +version = "3.10.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.5.3-py3-none-any.whl", hash = "sha256:0ade98a4895e87dc51d47151f7d2ec290365a585151d97b4d8d6312ed6132fed"}, - {file = "platformdirs-3.5.3.tar.gz", hash = "sha256:e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e"}, + {file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"}, + {file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"}, ] [package.extras] -docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] [[package]] name = "pydantic" -version = "1.10.9" +version = "1.10.12" description = "Data validation and settings management using python type hints" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "pydantic-1.10.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e692dec4a40bfb40ca530e07805b1208c1de071a18d26af4a2a0d79015b352ca"}, - {file = "pydantic-1.10.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3c52eb595db83e189419bf337b59154bdcca642ee4b2a09e5d7797e41ace783f"}, - {file = "pydantic-1.10.9-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:939328fd539b8d0edf244327398a667b6b140afd3bf7e347cf9813c736211896"}, - {file = "pydantic-1.10.9-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b48d3d634bca23b172f47f2335c617d3fcb4b3ba18481c96b7943a4c634f5c8d"}, - {file = "pydantic-1.10.9-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f0b7628fb8efe60fe66fd4adadd7ad2304014770cdc1f4934db41fe46cc8825f"}, - {file = "pydantic-1.10.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e1aa5c2410769ca28aa9a7841b80d9d9a1c5f223928ca8bec7e7c9a34d26b1d4"}, - {file = "pydantic-1.10.9-cp310-cp310-win_amd64.whl", hash = "sha256:eec39224b2b2e861259d6f3c8b6290d4e0fbdce147adb797484a42278a1a486f"}, - {file = "pydantic-1.10.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d111a21bbbfd85c17248130deac02bbd9b5e20b303338e0dbe0faa78330e37e0"}, - {file = "pydantic-1.10.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2e9aec8627a1a6823fc62fb96480abe3eb10168fd0d859ee3d3b395105ae19a7"}, - {file = "pydantic-1.10.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07293ab08e7b4d3c9d7de4949a0ea571f11e4557d19ea24dd3ae0c524c0c334d"}, - {file = "pydantic-1.10.9-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ee829b86ce984261d99ff2fd6e88f2230068d96c2a582f29583ed602ef3fc2c"}, - {file = "pydantic-1.10.9-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4b466a23009ff5cdd7076eb56aca537c745ca491293cc38e72bf1e0e00de5b91"}, - {file = "pydantic-1.10.9-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7847ca62e581e6088d9000f3c497267868ca2fa89432714e21a4fb33a04d52e8"}, - {file = "pydantic-1.10.9-cp311-cp311-win_amd64.whl", hash = "sha256:7845b31959468bc5b78d7b95ec52fe5be32b55d0d09983a877cca6aedc51068f"}, - {file = "pydantic-1.10.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:517a681919bf880ce1dac7e5bc0c3af1e58ba118fd774da2ffcd93c5f96eaece"}, - {file = "pydantic-1.10.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67195274fd27780f15c4c372f4ba9a5c02dad6d50647b917b6a92bf00b3d301a"}, - {file = "pydantic-1.10.9-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2196c06484da2b3fded1ab6dbe182bdabeb09f6318b7fdc412609ee2b564c49a"}, - {file = "pydantic-1.10.9-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6257bb45ad78abacda13f15bde5886efd6bf549dd71085e64b8dcf9919c38b60"}, - {file = "pydantic-1.10.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3283b574b01e8dbc982080d8287c968489d25329a463b29a90d4157de4f2baaf"}, - {file = "pydantic-1.10.9-cp37-cp37m-win_amd64.whl", hash = "sha256:5f8bbaf4013b9a50e8100333cc4e3fa2f81214033e05ac5aa44fa24a98670a29"}, - {file = "pydantic-1.10.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b9cd67fb763248cbe38f0593cd8611bfe4b8ad82acb3bdf2b0898c23415a1f82"}, - {file = "pydantic-1.10.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f50e1764ce9353be67267e7fd0da08349397c7db17a562ad036aa7c8f4adfdb6"}, - {file = "pydantic-1.10.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:73ef93e5e1d3c8e83f1ff2e7fdd026d9e063c7e089394869a6e2985696693766"}, - {file = "pydantic-1.10.9-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:128d9453d92e6e81e881dd7e2484e08d8b164da5507f62d06ceecf84bf2e21d3"}, - {file = "pydantic-1.10.9-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ad428e92ab68798d9326bb3e5515bc927444a3d71a93b4a2ca02a8a5d795c572"}, - {file = "pydantic-1.10.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fab81a92f42d6d525dd47ced310b0c3e10c416bbfae5d59523e63ea22f82b31e"}, - {file = "pydantic-1.10.9-cp38-cp38-win_amd64.whl", hash = "sha256:963671eda0b6ba6926d8fc759e3e10335e1dc1b71ff2a43ed2efd6996634dafb"}, - {file = "pydantic-1.10.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:970b1bdc6243ef663ba5c7e36ac9ab1f2bfecb8ad297c9824b542d41a750b298"}, - {file = "pydantic-1.10.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7e1d5290044f620f80cf1c969c542a5468f3656de47b41aa78100c5baa2b8276"}, - {file = "pydantic-1.10.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:83fcff3c7df7adff880622a98022626f4f6dbce6639a88a15a3ce0f96466cb60"}, - {file = "pydantic-1.10.9-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0da48717dc9495d3a8f215e0d012599db6b8092db02acac5e0d58a65248ec5bc"}, - {file = "pydantic-1.10.9-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0a2aabdc73c2a5960e87c3ffebca6ccde88665616d1fd6d3db3178ef427b267a"}, - {file = "pydantic-1.10.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9863b9420d99dfa9c064042304868e8ba08e89081428a1c471858aa2af6f57c4"}, - {file = "pydantic-1.10.9-cp39-cp39-win_amd64.whl", hash = "sha256:e7c9900b43ac14110efa977be3da28931ffc74c27e96ee89fbcaaf0b0fe338e1"}, - {file = "pydantic-1.10.9-py3-none-any.whl", hash = "sha256:6cafde02f6699ce4ff643417d1a9223716ec25e228ddc3b436fe7e2d25a1f305"}, - {file = "pydantic-1.10.9.tar.gz", hash = "sha256:95c70da2cd3b6ddf3b9645ecaa8d98f3d80c606624b6d245558d202cd23ea3be"}, + {file = "pydantic-1.10.12-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a1fcb59f2f355ec350073af41d927bf83a63b50e640f4dbaa01053a28b7a7718"}, + {file = "pydantic-1.10.12-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b7ccf02d7eb340b216ec33e53a3a629856afe1c6e0ef91d84a4e6f2fb2ca70fe"}, + {file = "pydantic-1.10.12-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fb2aa3ab3728d950bcc885a2e9eff6c8fc40bc0b7bb434e555c215491bcf48b"}, + {file = "pydantic-1.10.12-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:771735dc43cf8383959dc9b90aa281f0b6092321ca98677c5fb6125a6f56d58d"}, + {file = "pydantic-1.10.12-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ca48477862372ac3770969b9d75f1bf66131d386dba79506c46d75e6b48c1e09"}, + {file = "pydantic-1.10.12-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a5e7add47a5b5a40c49b3036d464e3c7802f8ae0d1e66035ea16aa5b7a3923ed"}, + {file = "pydantic-1.10.12-cp310-cp310-win_amd64.whl", hash = "sha256:e4129b528c6baa99a429f97ce733fff478ec955513630e61b49804b6cf9b224a"}, + {file = "pydantic-1.10.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b0d191db0f92dfcb1dec210ca244fdae5cbe918c6050b342d619c09d31eea0cc"}, + {file = "pydantic-1.10.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:795e34e6cc065f8f498c89b894a3c6da294a936ee71e644e4bd44de048af1405"}, + {file = "pydantic-1.10.12-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:69328e15cfda2c392da4e713443c7dbffa1505bc9d566e71e55abe14c97ddc62"}, + {file = "pydantic-1.10.12-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2031de0967c279df0d8a1c72b4ffc411ecd06bac607a212892757db7462fc494"}, + {file = "pydantic-1.10.12-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ba5b2e6fe6ca2b7e013398bc7d7b170e21cce322d266ffcd57cca313e54fb246"}, + {file = "pydantic-1.10.12-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:2a7bac939fa326db1ab741c9d7f44c565a1d1e80908b3797f7f81a4f86bc8d33"}, + {file = "pydantic-1.10.12-cp311-cp311-win_amd64.whl", hash = "sha256:87afda5539d5140cb8ba9e8b8c8865cb5b1463924d38490d73d3ccfd80896b3f"}, + {file = "pydantic-1.10.12-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:549a8e3d81df0a85226963611950b12d2d334f214436a19537b2efed61b7639a"}, + {file = "pydantic-1.10.12-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:598da88dfa127b666852bef6d0d796573a8cf5009ffd62104094a4fe39599565"}, + {file = "pydantic-1.10.12-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba5c4a8552bff16c61882db58544116d021d0b31ee7c66958d14cf386a5b5350"}, + {file = "pydantic-1.10.12-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c79e6a11a07da7374f46970410b41d5e266f7f38f6a17a9c4823db80dadf4303"}, + {file = "pydantic-1.10.12-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ab26038b8375581dc832a63c948f261ae0aa21f1d34c1293469f135fa92972a5"}, + {file = "pydantic-1.10.12-cp37-cp37m-win_amd64.whl", hash = "sha256:e0a16d274b588767602b7646fa05af2782576a6cf1022f4ba74cbb4db66f6ca8"}, + {file = "pydantic-1.10.12-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6a9dfa722316f4acf4460afdf5d41d5246a80e249c7ff475c43a3a1e9d75cf62"}, + {file = "pydantic-1.10.12-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a73f489aebd0c2121ed974054cb2759af8a9f747de120acd2c3394cf84176ccb"}, + {file = "pydantic-1.10.12-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b30bcb8cbfccfcf02acb8f1a261143fab622831d9c0989707e0e659f77a18e0"}, + {file = "pydantic-1.10.12-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2fcfb5296d7877af406ba1547dfde9943b1256d8928732267e2653c26938cd9c"}, + {file = "pydantic-1.10.12-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2f9a6fab5f82ada41d56b0602606a5506aab165ca54e52bc4545028382ef1c5d"}, + {file = "pydantic-1.10.12-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:dea7adcc33d5d105896401a1f37d56b47d443a2b2605ff8a969a0ed5543f7e33"}, + {file = "pydantic-1.10.12-cp38-cp38-win_amd64.whl", hash = "sha256:1eb2085c13bce1612da8537b2d90f549c8cbb05c67e8f22854e201bde5d98a47"}, + {file = "pydantic-1.10.12-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ef6c96b2baa2100ec91a4b428f80d8f28a3c9e53568219b6c298c1125572ebc6"}, + {file = "pydantic-1.10.12-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6c076be61cd0177a8433c0adcb03475baf4ee91edf5a4e550161ad57fc90f523"}, + {file = "pydantic-1.10.12-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2d5a58feb9a39f481eda4d5ca220aa8b9d4f21a41274760b9bc66bfd72595b86"}, + {file = "pydantic-1.10.12-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e5f805d2d5d0a41633651a73fa4ecdd0b3d7a49de4ec3fadf062fe16501ddbf1"}, + {file = "pydantic-1.10.12-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:1289c180abd4bd4555bb927c42ee42abc3aee02b0fb2d1223fb7c6e5bef87dbe"}, + {file = "pydantic-1.10.12-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5d1197e462e0364906cbc19681605cb7c036f2475c899b6f296104ad42b9f5fb"}, + {file = "pydantic-1.10.12-cp39-cp39-win_amd64.whl", hash = "sha256:fdbdd1d630195689f325c9ef1a12900524dceb503b00a987663ff4f58669b93d"}, + {file = "pydantic-1.10.12-py3-none-any.whl", hash = "sha256:b749a43aa51e32839c9d71dc67eb1e4221bb04af1033a32e3923d46f9effa942"}, + {file = "pydantic-1.10.12.tar.gz", hash = "sha256:0fe8a415cea8f340e7a9af9c54fc71a649b43e8ca3cc732986116b3cb135d303"}, ] [package.dependencies] @@ -509,52 +574,62 @@ email = ["email-validator (>=1.0.3)"] [[package]] name = "pyyaml" -version = "6.0" +version = "6.0.1" description = "YAML parser and emitter for Python" category = "main" optional = false python-versions = ">=3.6" files = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, - {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, - {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, + {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, + {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, ] [[package]] @@ -600,14 +675,14 @@ pydantic = ">=1.10.2,<2.0.0" [[package]] name = "tokenstream" -version = "1.5.0" +version = "1.7.0" description = "A versatile token stream for handwritten parsers" category = "main" optional = false python-versions = ">=3.10,<4.0" files = [ - {file = "tokenstream-1.5.0-py3-none-any.whl", hash = "sha256:adf5805f3e734c863a535c5cfc31fed4bd831647b1f51d1aab69e5a81eb63b8e"}, - {file = "tokenstream-1.5.0.tar.gz", hash = "sha256:3cb57c810f2fd1e57653c8270251a3df47656ef04f07eb3d4fc442f64f9ff0c0"}, + {file = "tokenstream-1.7.0-py3-none-any.whl", hash = "sha256:fdbb20e8a99b07e94ce88016e5f243a1582630a7459bd2e7a1c786f33543fcf9"}, + {file = "tokenstream-1.7.0.tar.gz", hash = "sha256:9f98387c7e74d224f7cca874ce77bb775ece6cb585e9ba18441960e2b35fae61"}, ] [[package]] @@ -636,26 +711,26 @@ files = [ [[package]] name = "typing-extensions" -version = "4.6.3" +version = "4.7.1" description = "Backported and Experimental Type Hints for Python 3.7+" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "typing_extensions-4.6.3-py3-none-any.whl", hash = "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26"}, - {file = "typing_extensions-4.6.3.tar.gz", hash = "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5"}, + {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, + {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, ] [[package]] name = "urllib3" -version = "2.0.3" +version = "2.0.4" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "urllib3-2.0.3-py3-none-any.whl", hash = "sha256:48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1"}, - {file = "urllib3-2.0.3.tar.gz", hash = "sha256:bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825"}, + {file = "urllib3-2.0.4-py3-none-any.whl", hash = "sha256:de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4"}, + {file = "urllib3-2.0.4.tar.gz", hash = "sha256:8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11"}, ] [package.extras] @@ -667,4 +742,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "4d193875bfbd90270e722261c24918cefa108e352944810264772bf82d87b7a0" +content-hash = "1002fbe323615f3b2088f55abb39188bf8d6bd39e0dc31306b09740d4a4f8de2" diff --git a/pyproject.toml b/pyproject.toml index ee2d0a6d4e..f9bef8cd00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,12 +7,13 @@ authors = ["Gamemode 4 Contributors"] [tool.poetry.dependencies] python = "^3.10" beet = "0.92.0" -mecha = "^0.67.0" +mecha = "^0.76.0" bolt = ">=0.20.1" PyYAML = "^6.0" pydantic = "^1.10.2" smithed-libraries = "^0.6.0" requests = "^2.28.1" +pillow = "^10.0.0" [tool.poetry.dev-dependencies] black = "^22.6.0"