-
-
Notifications
You must be signed in to change notification settings - Fork 56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Modernize (and Boltify) Liquid Tanks #1036
Open
SpecialBuilder32
wants to merge
77
commits into
Gamemode4Dev:master
Choose a base branch
from
SpecialBuilder32:liquid-tanks-1.20
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Modernize (and Boltify) Liquid Tanks #1036
SpecialBuilder32
wants to merge
77
commits into
Gamemode4Dev:master
from
SpecialBuilder32:liquid-tanks-1.20
Commits on Mar 6, 2024
-
author SpecialBuilder <[email protected]> 1668556612 -0500 committer SpecialBuilder <[email protected]> 1668556612 -0500 Update main.yml Rename folder to use new module id Fix typo Resources for Machine Blocks (Gamemode4Dev#56) Adds font-magic needed to make machine names look fancy in the future. Fix some typos (Gamemode4Dev#57) - probably fixes the warnings, hopefully doesn't break anything update script and bismutite_lump Machine blocks V1 machine changes part 2 hopper minecart items actual textures for the blocks Fix translate tags with the packager (Gamemode4Dev#59) Add Container GUIs (Gamemode4Dev#61) Adds Texture GUIs for Machine Blocks Machines. Textures by Hozz Fix Corrupted Image Update to 1.19 (Gamemode4Dev#63) * Fix TP anchors, update beet * Update to 1.19 Auto Crafter GUI (Gamemode4Dev#65) auto crafter gui should now look correct, but the CC container image is used as a placeholder Add auto crafter texture, and update optifine copy fix TP Jammer's name update phantom model Pack format and required atlases -Increments pack format to 1.19.3 version, -Adds atlas sources to properly load textures not in `items` or `blocks` directories Update pack.png (Gamemode4Dev#68) Replaces old pack.png with Custom Crafter Add shrieking textures to Orb of Ankou (Gamemode4Dev#67) Adds textures and a CMD path for the shrieking soul and shard Update pack_format and other versions Update GUI Font Magic for 1.19.4 (Gamemode4Dev#69) - uses JP's perfect TTF font - names are now exactly center align - non-latin alphanumeric characters should work now (not tested) - simplified the GUI name requirement - no more \u00a0 for spaces in container names Update to 1.20 Move apple trees and scuba assets to module-folder Move CMD-controlling item models to base Load RPs into beet and output final to /out Model config validation Adds a model_data field to meta, which allows for nested configs to inherit properties from their parent for ease of defining similar items Each module generates minecraft-model overrides for itself Model config `item` may be a list Allows for modules which wish to use the same integer value for multiple different items: ie shamir tools Start generating model overrides with original file Add and remove configured model data to global registry Assign new CMD values Attempt to use same cmd first Allow config for custom override predicates Transition existing processes to service object Process config options late, allowin for programatic generation Functional config validation and error reporting on inherited model_data Move index retrieval/assignment to class methods Simplify filter function syntax Basics of auto-model generation (templating) textures defaults to reference Outputs registry after build NOTE: uses the wrapped output style used in PlayerheadManagement, though that has not been merged as of yet Refactor some RP files into new spec Bugfix to model validation Github action fails if new CMD needs to be issued Fix CMD assignment/reassignment Logger revamp BROKEN: Attempt fix for vanilla override merging Fix vanilla model override merging Migrate many simple textures to their parent datapack Migrate more complex module textures Last uncomplex item config (to be redone) template_options pydantic models Reconfigure for extendable transform functions Transform designed for item_display calculations "block" model template Templates are classes, and textures can be specified by name template/transform combo for the common CC-like models ... class inheritance ended up working really nicely here. Cache registry during build Disassembler model move Custom templates support transforms First attempt at LT models using the new item_display transform dev pipeline fully defined in beet-dev.yaml Rewrite of textures field for list and dict support Optional pydantic fields processed in order Fix liquid tanks block and item models Ender hoppers without minecart Auto crafting models Ench Extractors models Teleportation anchors models Update block_compressors to use display entities block_compressors model data config Update tinkering_compressors to display entities tinkering_compressors model data Migrate remaining unused directional ender_hoppers models NOTE: item_displays actually allow for the remodelling of the player head item, even when shown with the "head" model variant. This removes the need for the stone-button model used previously Forming press models Smelteries models NOTE: This uses the expandability function of the item model templates, although it would be roughly as easy to implement programmatically in a generator plugin Tnt landmines entity models Leftover model cleanup Fix custom crafters relocators with display entity change Relocator models Trapped sign models Metallurgy bands and lumps Metallurgy tool shamir models This improperly handles shared CMD registration, and is solely to get the models more-or-less working in game Support different models for items sharing a CMD value New example syntax in apple_trees, to be cleaned up in the following commit Clean up example config Metallurgy shamir textures complete Move template class to Pydantic, for configurable tempaltes Refactor TemplateOptions for multiple model creation Shamir models, but correctly this time Glob pattern support for allocations Remove old metallurgy models Remove sky dimension textures/models Start of advancement icon models Continuation of advancement icons Fix old-format scuba gear models Final advancement icons Clean up old advancement models Restore end_fishing custom tuned sword offsets Merge config cleanup Basics of Mecha Transformer rule Pass jsonfiles through Mecha manually Better Diagnostics when manually parsing jsonfiles Adds a transformer name to the unique key used when registering a fake ComplilationUnit, to avoid overwriting previous rule's results Basic nbt transformations Port spreadsheet values to registry, pt 1 Move shamir bands to the same CMD/Reference as shamir tools Port metallurgy spreadsheet values to registry, pt2 Alphabetize and correct lingering shamir indexes Remove redundant metallurgy band model config Rename shamir references to `shamir/foo` to reflect multi-texture nature Use mecha rules in source packs: animi-boots_of_ostra Add rule for substitutions into `data modify ... value` Use mecha rules in source files: calling_bell-enchant_extractors Reconfig end fishing to share tool/armor CMD between different item types Rename end fishing textures to start at 1 Ensure vanilla overrides are added in ascending CMD order Update ender_hoppers to use item displays. Use mecha rules in source files Extend jsonfile mecha rules into overlays Use mecha rules in source files: liquid_minecarts-note_block_interface Update orb_of_ankou model references - shards and essences are shared ref Use mecha rules in source files : particles_pack-ziprails (the rest) Remaining migration cleanup/bugfixes Restore texture existance checks Add beet.contrib.optifine CMD reference lookup for optifine CIT .properties Migrate simple CIT textures Remove public-server only optifine textures End fishing optifine armor Zauber cauldrons optifine textures Fix animated zauber textures Shamirs generate optifine armor config files NOTE: during this commit a significant bug with file merging was discovered. It does not currently function completely as a result Migrate metallurgy armor optifine animations Optifine custom-entity-models This is a dumb simple migration of optifine CEM models. In the future, if more than one pack wishes to use the same entity, some clever beet merge rules could be written to make it work in our monorepo item_display machines set to full brightness Font-powered custom guis Cleanup last old RP files Setup RP as a module, with its own beet.yaml instructions Use beet autoload to ensure merge policies apply during broadcast merges Remove optifine metallurgy armor .properties - they are generated by the plugin Repair optifine cit spyglass and trident item retextures Resource pack plays nice with beet-dev Update beet-release.yaml Add babelbox for translations Port existing (outdated) translations to new spreadsheets Fix `beet readme-gen` to work and also only load the metadata Allow CMD prefix to be configured Framework for "interrupted" broadcast [Broken] Hash-based update detector Completed hash-based update detector Ensures builds are fully deterministic/reproducible so zipfile hashes can reliably be used to detect changes to a module. Run libraries through new patch system Rename plugin to `update_checker` Rename plugin to `worker` and run libraries and RP through new update checking Better organize new plugins, add repro-zipfile dependancy Descriptions for libraries, prevents addition of version number to mcmeta Move folder to `resource_pack` and finish patch tracking Add missing rename Skip writing RP version to datapack init functions Use mecha.contrib.json_files to get better diagnostics from LootTable processing Move json rules to class mixin Exclude block/fluid tag predicates from `tag` processing (easy way out) Allow proper parsing of newlines (like used in Guidebook) ill-formed nbt produces pretty diagnostic Translation key linting Add missing translations to babelbox shreadsheets Add warnings for unused translations Missing potion_liquids translations OOA Translations [babelbox makes nonfunctional atm] Add extra entries to item model files to return to the vanilla model on unused CMD values `generated` template supports creating the same model for multiple items Generate trapped signs model_data via plugin. Add simple hanging sign texture Update bolt to function Patch cache-less build Clear leftover item models Update beet to fix babelbox unicode loading Update mecha to fix orb_of_ankou build Copy vanilla model data first to prevent cross-build errors Restore CMD model padding Fix metallurgy shields and texture linting Various warning cleanup Github action debug Update translations.csv Revert "Github action debug" This reverts commit b489e57. Remove old tunnel bores placement, and its ascioated translation Add unripe golden apple texture Texture credit: Hozz Co-Authored-By: hozz8528 <[email protected]> Edit RP dev pack description Save beet-dev generated config in tempfile to fix watch Fix `beet dev -w` Repair `beet readme-gen` cli command with new config method Update zauber translations Migrate zauber armor textures Migrate zauber crystal textures Migrate zauber soulution textures Migrate zauber magicol CMD Migrate new zauber advancements Zauber Cauldron custom model. Model and Textures by @kyrkis Co-Authored-By: kyrius <[email protected]> Fallback translations include "Lingering" and "Splash" for potions Update zauber_cauldrons_paint_biome.json Update beet-dev.yaml Begin incorporation of guidebook textures Add copies of legacy guidebook gm4 items Guidebooks have arrows Textures by @kyrkis Co-Authored-By: kyrius <[email protected]> New Orb of Ankou Textures Image credit: Hozz Co-Authored-By: hozz8528 <[email protected]> Namespace custom crafter reference - avoids error with unusual autocrafter guidebook inclusion CLI option for auto-updating babelbox translations from source fallback. Intended for auto-propagating guidebook translations Repair some config issues Load test files during `beet dev` pipeline Correct metallurgy advancement icon config Mecha logging filter to limit single line length. Allow backfilling of unset translation keys Transfer guidebook translations into translations.csv Misc translation inconsistencies 1 Misc translation inconsistencies 2 Misc translation inconsistencies 3 Fix github test action by adding RP plugins Test build does not include complex beet tooling for update detection and patch number increments. Since tests dont check the update behavior currently this is acceptable, but may need to bae changed in the future Correct guidebook translation tag format Misc translation inconsistencies 4 Fix Gamemode4Dev#932 Skip mecha linting in beet-test.yaml Misc translation inconsistencies 5 Fix function tag leaks from worker-based update checker Use new pack.copy() from beet v0.104.0 config option for translation linter ignores Guidebook auto-generates advancement icons using module logos Guidebook item reference in all the places Texture gm4 root advancement Various cleanup Beet 0.104.1 fixes Unicode in beet.yaml on windows Update commands.py Prevent "worker reload" warning message on beet-release Optional `model_data.yaml` file for storing long config outside of beet.yaml Fix zauber cauldrons KeyError Fix RP worker merge Redundant `ignore` config Stably sort player heads skin cache Abstract dynamic config builder Separate RP and DP pack formats Correct ender hoppers cart display entity height
Configuration menu - View commit details
-
Copy full SHA for dbaf45f - Browse repository at this point
Copy the full SHA dbaf45fView commit details -
Configuration menu - View commit details
-
Copy full SHA for d9d1806 - Browse repository at this point
Copy the full SHA d9d1806View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8b0aa09 - Browse repository at this point
Copy the full SHA 8b0aa09View commit details
Commits on Mar 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 8f8318d - Browse repository at this point
Copy the full SHA 8f8318dView commit details
Commits on Mar 25, 2024
-
Configuration menu - View commit details
-
Copy full SHA for db01379 - Browse repository at this point
Copy the full SHA db01379View commit details -
Configuration menu - View commit details
-
Copy full SHA for c090154 - Browse repository at this point
Copy the full SHA c090154View commit details -
Configuration menu - View commit details
-
Copy full SHA for 267fe83 - Browse repository at this point
Copy the full SHA 267fe83View commit details -
Configuration menu - View commit details
-
Copy full SHA for 695b283 - Browse repository at this point
Copy the full SHA 695b283View commit details -
Configuration menu - View commit details
-
Copy full SHA for e1453de - Browse repository at this point
Copy the full SHA e1453deView commit details -
Configuration menu - View commit details
-
Copy full SHA for 71fdc50 - Browse repository at this point
Copy the full SHA 71fdc50View commit details
Commits on Jul 1, 2024
-
Configuration menu - View commit details
-
Copy full SHA for b7c1bac - Browse repository at this point
Copy the full SHA b7c1bacView commit details
Commits on Jul 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 626541f - Browse repository at this point
Copy the full SHA 626541fView commit details -
Configuration menu - View commit details
-
Copy full SHA for aad53b6 - Browse repository at this point
Copy the full SHA aad53b6View commit details
Commits on Jul 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 427a145 - Browse repository at this point
Copy the full SHA 427a145View commit details
Commits on Jul 9, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 79e830e - Browse repository at this point
Copy the full SHA 79e830eView commit details -
Configuration menu - View commit details
-
Copy full SHA for c1076a2 - Browse repository at this point
Copy the full SHA c1076a2View commit details
Commits on Jul 10, 2024
-
Configuration menu - View commit details
-
Copy full SHA for aa353bf - Browse repository at this point
Copy the full SHA aa353bfView commit details
Commits on Jul 11, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 3090742 - Browse repository at this point
Copy the full SHA 3090742View commit details -
Configuration menu - View commit details
-
Copy full SHA for eeb7468 - Browse repository at this point
Copy the full SHA eeb7468View commit details
Commits on Jul 12, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 8c30c4b - Browse repository at this point
Copy the full SHA 8c30c4bView commit details
Commits on Jul 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 2f9c97a - Browse repository at this point
Copy the full SHA 2f9c97aView commit details
Commits on Jul 17, 2024
-
Configuration menu - View commit details
-
Copy full SHA for ffa252f - Browse repository at this point
Copy the full SHA ffa252fView commit details
Commits on Jul 19, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 81ba8c8 - Browse repository at this point
Copy the full SHA 81ba8c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9f43cfb - Browse repository at this point
Copy the full SHA 9f43cfbView commit details -
Configuration menu - View commit details
-
Copy full SHA for ec6895c - Browse repository at this point
Copy the full SHA ec6895cView commit details
Commits on Jul 22, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 71a9cac - Browse repository at this point
Copy the full SHA 71a9cacView commit details -
Configuration menu - View commit details
-
Copy full SHA for d7858e0 - Browse repository at this point
Copy the full SHA d7858e0View commit details
Commits on Jul 23, 2024
-
Configuration menu - View commit details
-
Copy full SHA for c715bf4 - Browse repository at this point
Copy the full SHA c715bf4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 54002d5 - Browse repository at this point
Copy the full SHA 54002d5View commit details -
Configuration menu - View commit details
-
Copy full SHA for acf65c6 - Browse repository at this point
Copy the full SHA acf65c6View commit details
Commits on Jul 25, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 24e166b - Browse repository at this point
Copy the full SHA 24e166bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a75e5c4 - Browse repository at this point
Copy the full SHA a75e5c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for cb82e22 - Browse repository at this point
Copy the full SHA cb82e22View commit details
Commits on Jul 26, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 1882f5e - Browse repository at this point
Copy the full SHA 1882f5eView commit details
Commits on Aug 4, 2024
-
Configuration menu - View commit details
-
Copy full SHA for f431b9c - Browse repository at this point
Copy the full SHA f431b9cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 51bcf49 - Browse repository at this point
Copy the full SHA 51bcf49View commit details -
Configuration menu - View commit details
-
Copy full SHA for 14c4344 - Browse repository at this point
Copy the full SHA 14c4344View commit details -
Configuration menu - View commit details
-
Copy full SHA for 616a728 - Browse repository at this point
Copy the full SHA 616a728View commit details
Commits on Aug 6, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 7aba842 - Browse repository at this point
Copy the full SHA 7aba842View commit details -
Configuration menu - View commit details
-
Copy full SHA for 95bc21c - Browse repository at this point
Copy the full SHA 95bc21cView commit details
Commits on Aug 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d2dec67 - Browse repository at this point
Copy the full SHA d2dec67View commit details -
Configuration menu - View commit details
-
Copy full SHA for 13fce81 - Browse repository at this point
Copy the full SHA 13fce81View commit details
Commits on Aug 11, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 6c092ae - Browse repository at this point
Copy the full SHA 6c092aeView commit details -
Configuration menu - View commit details
-
Copy full SHA for fd9d460 - Browse repository at this point
Copy the full SHA fd9d460View commit details
Commits on Aug 15, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 01d9639 - Browse repository at this point
Copy the full SHA 01d9639View commit details -
Configuration menu - View commit details
-
Copy full SHA for f2ca573 - Browse repository at this point
Copy the full SHA f2ca573View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f31b8a - Browse repository at this point
Copy the full SHA 2f31b8aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 82323ac - Browse repository at this point
Copy the full SHA 82323acView commit details
Commits on Aug 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 4b401c7 - Browse repository at this point
Copy the full SHA 4b401c7View commit details
Commits on Aug 19, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 1a7b12a - Browse repository at this point
Copy the full SHA 1a7b12aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8716ed8 - Browse repository at this point
Copy the full SHA 8716ed8View commit details
Commits on Aug 22, 2024
-
Configuration menu - View commit details
-
Copy full SHA for cdfc2fe - Browse repository at this point
Copy the full SHA cdfc2feView commit details -
Configuration menu - View commit details
-
Copy full SHA for ff669bf - Browse repository at this point
Copy the full SHA ff669bfView commit details
Commits on Aug 28, 2024
-
Configuration menu - View commit details
-
Copy full SHA for a4f0e8d - Browse repository at this point
Copy the full SHA a4f0e8dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c4c626 - Browse repository at this point
Copy the full SHA 8c4c626View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3b4fe92 - Browse repository at this point
Copy the full SHA 3b4fe92View commit details
Commits on Aug 30, 2024
-
Configuration menu - View commit details
-
Copy full SHA for e69fd2d - Browse repository at this point
Copy the full SHA e69fd2dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 931896b - Browse repository at this point
Copy the full SHA 931896bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6022247 - Browse repository at this point
Copy the full SHA 6022247View commit details
Commits on Sep 4, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 575d2e2 - Browse repository at this point
Copy the full SHA 575d2e2View commit details
Commits on Sep 5, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 80cfdeb - Browse repository at this point
Copy the full SHA 80cfdebView commit details -
Configuration menu - View commit details
-
Copy full SHA for c7b2e29 - Browse repository at this point
Copy the full SHA c7b2e29View commit details -
Configuration menu - View commit details
-
Copy full SHA for aa63288 - Browse repository at this point
Copy the full SHA aa63288View commit details
Commits on Sep 6, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 7e2604c - Browse repository at this point
Copy the full SHA 7e2604cView commit details -
Configuration menu - View commit details
-
Copy full SHA for e0e3f05 - Browse repository at this point
Copy the full SHA e0e3f05View commit details -
Configuration menu - View commit details
-
Copy full SHA for 175240f - Browse repository at this point
Copy the full SHA 175240fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0779092 - Browse repository at this point
Copy the full SHA 0779092View commit details -
Configuration menu - View commit details
-
Copy full SHA for 924deb5 - Browse repository at this point
Copy the full SHA 924deb5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6ece8bd - Browse repository at this point
Copy the full SHA 6ece8bdView commit details -
Kyrius's new liquid skin textures
Co-Authored-By: Kyrius <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 70ec696 - Browse repository at this point
Copy the full SHA 70ec696View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7181138 - Browse repository at this point
Copy the full SHA 7181138View commit details -
Configuration menu - View commit details
-
Copy full SHA for cb181e3 - Browse repository at this point
Copy the full SHA cb181e3View commit details -
Configuration menu - View commit details
-
Copy full SHA for df5967e - Browse repository at this point
Copy the full SHA df5967eView commit details -
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapacks …
…into liquid-tanks-1.20
Configuration menu - View commit details
-
Copy full SHA for 1179237 - Browse repository at this point
Copy the full SHA 1179237View commit details
Commits on Sep 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for c540b39 - Browse repository at this point
Copy the full SHA c540b39View commit details
Commits on Sep 24, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 5ac40c6 - Browse repository at this point
Copy the full SHA 5ac40c6View commit details
Commits on Sep 30, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 213aa30 - Browse repository at this point
Copy the full SHA 213aa30View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.