Architectury Multi-Loader Setup #236
Merged
Conversation
This file contains 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
|
Is the jsr dependency necessary for other dependencies? We use jetbrains annotations for all immediate flywheel stuff |
The jsr is the only place I could find the |
- Move common gradle business from each subproject into the rootProject.subprojects closure - Add fabric.mod.json - Register forge mixin configs - Make blaze3d mixins remap = false - Separate common, forge, and fabric mod entrypoints
- Use ClientPlatform to: - Dispatch events - Create iris/oculus handler - Move VisualizationEventHandler into forge project
- Move loom.runs into subprojects closure - Move common code sharing into subprojects closure - Apply java plugin - Fix runs not being generated by moving generatePackageInfos to the bottom
- Trying to get xplat forge working, fabric can wait until the common project compiles - Move backend manager event handling to separate class - Move commands into forge for now - Make FlwConfig an interface and move concrete impl into forge - Remove event parameters from handlers than don't actually use them - Add platform specific blockstate light emission for uniforms - Remove example effect - Add accessor for LevelRenderer#ticks
- Make model builders abstract - Move BakedModelBufferer as is into forge project - Create Forge*ModelBuilders with modeldata parameters - Wrap ModelBuilder ctors in factory methods - Add FlywheelLibPlatform api, similar to api.internal package but for lib-only/platform specific stuff - Move TransformStack wrapping into FlywheelLibPlatform - Create vanilla renderer through FlywheelLibPlatform - Handle partial model initialization in separate event handler class - Fix test configuration in common project
- Apply java, maven-publish to all projects - Prefer the tasks.named() syntax for configuring tasks - Separate shared configuration for platform projects into a separate configure block - Add more fields to processResources - Make helper methods static - Exclude duplicated package infos
- Actually init vanilla visuals
- Move common build script stuff to buildSrc - Set ideaSyncTask finalizedBy generatePackageInfos directly in package-infos.gradle - Enable loom multiproject optimization, though not sure if it makes a difference for us yet
- Organize almost all remaining code into one of four modules - Fix some incorrect inter-module dependencies - Get Fabric into a working state - The config, client commands, and model builders are still missing and registry freezing happens too late
- Separate common project into 4 source sets - Declare outgoing configurations for forge/fabric to depend on - Re-compile source from each source set in each platform's compileJava
- Use convention plugins for common build logic - Convention plugins get to be applied in the plugins block and can load other plugins - Move GeneratePackageInfosTask to its own file in buildSrc - Apply GeneratePackageInfosTask to every sourceSet
- Upgrade platform script plugin to pre-compiled groovy plugin - It was getting really difficult to manage all the logic/plugins/types from the basic script, and implementing a real plugin gives us much better type safety and IDE access to upstream plugins - Separate api/lib/backend/impl in platform projects - Add platform module output to main runtime classpath so the fabric loader recognizes our additional modules
- Also fix crash buffering fluids in BakedModelBufferer#bufferMultiBlock (Forge) - The mesh order in models created by model builders is currently incorrect and will be fixed later
- Convert existing binary plugins to kotlin - Move each plugin to a different package
- Expose desired behaviors from platform plugin via an extension - Move PlatformPlugin to platform package
- Refine capabilities checks - To compile with glsl 150: - Instancing needs ARB_shader_bit_encoding - Indirect needs gpu_shader5 and shading_language_420pack - Require extensions instead of just enable, probably doesn't make a difference since we check for their presence first but require aligns with our intent better
- Compile with progressively lower glsl versions to test which are available. - Properly returns 460 on my machine even with a gl version of 320 - Remove glsl enums below 150
- Port java/subproject convention plugins to kotlin binary plugin - Fix licence bundling in jars - Update licence year
- Port to kotlin gradle
- Use cool kotlin dsl extension methods in plugins where possible
- Address warnings generated by javadocs and mixin remaps for joml
- Merge package-infos, jar-sets, and transitive-source-sets plugins - Move publishing logic into JarTaskSet - Do not eagerly add all jarsets to assemble - Significantly reduces build times - Add separate helper method for creating outgoing jarsets
- Create separate remap tasks for the common mojmap api to get loom to populate its manifest file - Add helper method to fork a JarTaskSet and generate new remap tasks - Remove non-remap publish method - Set assemble to depend on published jar tasks again - Add companion methods to create individual jar tasks
Jozufozu
force-pushed
the
feat/multi-loader-1
branch
from
094e8dc
to
83d0934
Compare
- Use immutable lists for backend extensions - Copy the contents of indirect base extensions into compute extensions - Move uniform block binding to Uniforms class and make magic strings static final
- Add rudimentary JSON parsing to load a config on fabric - Save the config file after a config command changes
- Remove changelog.txt - Remove old gradle properties - Update readme but nothing comprehensive
This reverts commit c5a6fe9.
- Move registry freezing to right before start of initial resource reload - Also warn if Fabric config JSON is not an object - Move Flywheel.java to API - Remove Flywheel.LOGGER and others; add impl-specific and backend-specific loggers - Remove unused mixins - Organize imports
Meshes are now always sorted by chunk layer first, then in order of how the BakedModel returned quads. This should exactly match vanilla's chunk buffering and avoid any rendering issues.
Jozufozu
approved these changes
May 17, 2024
PepperCode1
approved these changes
May 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR
This PR merges the Flywheel Fabric and Forge branches into a single branch, using an Architectury-based multi-project setup.