Better data- and worldgen handling (1.21.1 edition) & Knuckles (New Funky Mode) (Featuring Dante From The Devil May Cry Series) - #5217
Open
screret wants to merge 69 commits into
Conversation
Co-authored-by: screret <68943070+screret@users.noreply.github.com> Co-authored-by: DilithiumThoride <lilithiumathena@gmail.com> Co-authored-by: Jurre Groenendijk <jurre@jilles.com>
…r/veins/VeinedVeinGenerator.java
…andling/1.20' into sc/better-datagen-and-worldgen-handling/1.21 # Conflicts: # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/generated/resources/data/gtceu/worldgen/placed_feature/rubber_checked.json # src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java # src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java # src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java # src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java # src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java # src/main/java/com/gregtechceu/gtceu/api/placeholder/MultiLineComponent.java # src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java # src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java # src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java # src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java # src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java # src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java # src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java # src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java # src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java # src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTConfiguredFeatures.java # src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTDensityFunctions.java # src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java # src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/AOEConfigUIBehavior.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ObjectHolderMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java # src/main/java/com/gregtechceu/gtceu/common/mui/GTMultiblockTextUtil.java # src/main/java/com/gregtechceu/gtceu/common/registry/GTRegistration.java # src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/BiomeDependentPlacement.java # src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/RubberTreeChancePlacement.java # src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/package-info.java # src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java # src/main/java/com/gregtechceu/gtceu/data/loot/ChestGenHooks.java # src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java # src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java # src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java # src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java # src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java # src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java # src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSWrappingMultiblockBuilder.java # src/main/resources/gtceu.mixins.json
…stry at the correct time
… rendering PR so fluid blocks don't need separate lang keys for no good reason
# Conflicts: # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java
# Conflicts: # src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerLateMixin.java
# Conflicts: # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/generated/resources/data/c/tags/item/lenses/black.json # src/generated/resources/data/c/tags/item/lenses/brown.json # src/generated/resources/data/c/tags/item/lenses/cyan.json # src/generated/resources/data/c/tags/item/lenses/gray.json # src/generated/resources/data/c/tags/item/lenses/light_gray.json # src/generated/resources/data/c/tags/item/lenses/lime.json # src/generated/resources/data/c/tags/item/lenses/magenta.json # src/generated/resources/data/c/tags/item/lenses/orange.json # src/generated/resources/data/c/tags/item/lenses/pink.json # src/generated/resources/data/c/tags/item/lenses/yellow.json # src/generated/resources/data/forge/tags/items/lenses/black.json # src/generated/resources/data/forge/tags/items/lenses/brown.json # src/generated/resources/data/forge/tags/items/lenses/cyan.json # src/generated/resources/data/forge/tags/items/lenses/gray.json # src/generated/resources/data/forge/tags/items/lenses/light_gray.json # src/generated/resources/data/forge/tags/items/lenses/lime.json # src/generated/resources/data/forge/tags/items/lenses/magenta.json # src/generated/resources/data/forge/tags/items/lenses/orange.json # src/generated/resources/data/forge/tags/items/lenses/pink.json # src/generated/resources/data/forge/tags/items/lenses/yellow.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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.
What
Clean up worldgen-type objects' registration (e.g. stop bypassing deferred registers) and chest loot injection
& fix datagen not running because of some duplicate language keys & unregistered biome modifier types.
Implementation Details
Step 1 was merging #5096 into a 1.21-based branch.
Step 2 was cherry-picking the language key fix (along with a few others) from #5139.
The fluid builder changes were primarily taken from #5021, as I did all the necessary changes there already. (removed duplicate fluid language keys & the duplicate translation key registration error)
AI Usage
Outcome
WAY, WAY cleaner handling of chest loot addition and feature placement registration
Datagen works again
no log spam from invalid reslocs
How Was This Tested
ran datagen
Additional Information
Supersedes #5214.
Potential Compatibility Issues
Anyone still using the removed placement modifiers will have to copy them. IDK that anyone is using them, though, as GT addons don't tend to have custom worldgen features (especially with special placement rules).