Port to 1.21.1 #240
Open
Port to 1.21.1 #240
+1,412
−1,725
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
- Fix ObfuscationReflectionHelper#setPrivateValue using SRG mapped names, Neoforge has switched to mojmap at runtime
IThundxr
force-pushed
the
feat/multi-loader-1.21
branch
from
34eba91 to
2f83dcc
Compare
# Conflicts: # gradle.properties
IThundxr
force-pushed
the
feat/multi-loader-1.21
branch
from
2f04d9b to
a9c4e5c
Compare
…at/multi-loader-1.21
…at/multi-loader-1.21 # Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshHelper.java # common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/SectionCompilerMixin.java # forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java # forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java # forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java
…at/multi-loader-1.21
Jozufozu
reviewed
Dec 12, 2024
| this.level = level; | ||
| this.positions = positions; | ||
| } | ||
|
|
||
| public static MultiBlockModelBuilder create(BlockAndTintGetter level, Iterable<BlockPos> positions) { |
There was a problem hiding this comment.
Do we trust that we won't need these factory methods in the future? It's easy to change what the contents of a function point to while changing constructors is much more delicate.
…er-1.21 # Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibXplat.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/Models.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBakedModelBuilder.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBlockModelBuilder.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMultiBlockModelBuilder.java # fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java # neoforge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java # neoforge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java
…ader-1.21 # Conflicts: # neoforge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java # neoforge/src/main/java/dev/engine_room/flywheel/impl/NeoForgeFlwConfig.java
- Add @apiNotes explaining that flywheel/ is prepended to each shader ResourceLocation's path - Document all InstanceType fields
- Move common vanillin stuffs to a "vanillin" sourceset - Add vanillinForge and vanillinFabric subprojects - Mostly do gradling from scratch - Export remap jars from platform projects to `include` in vanillin projects
- Replace outgoing jars by directly consuming classes/resources from common - Add vanillin logo - Move subproject plugin logic to an extension so it can be configured - Rename "mod_" properties to "flywheel_"
- Loom gets angry when a mod* dependency doesn't immediately exist so use a regular runtime dependency with the devlibs jar - Strangely, the include dependency is just fine with the remap jar - Move outgoing remapJar/jar configuration generation to JarTaskSet - Don't actually need evaluationDependsOn - Fix test mod id
- Glob over all jars from libs when running the test mod - Add vanillin jars to artifacts
- Assume group/version are behind properties in subproject.init - Force each subproject to manually specify their base archive name - Don't generate mod/api artifact ids, just write them out by hand - Remove DependentProject
- Move source set bundling/common source set sharing logic into transitiveSourceSets and make it more flexible - Remove commonProject field from platform extension
- Add model id debug view - Want to be able to visually check that instances are pointing to the same model
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.
No description provided.