Port to 1.21.1 #240
Open
Port to 1.21.1 #240
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
…er-1.21 # Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java # common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java # common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java # fabric/build.gradle.kts # fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java # fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java # fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java # fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java # fabric/src/main/resources/fabric.mod.json # forge/build.gradle.kts # forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java # forge/src/main/resources/META-INF/neoforge.mods.toml # gradle.properties # gradle/wrapper/gradle-wrapper.properties
- Post merge fixes - Remove stubs
IThundxr
force-pushed
the
feat/multi-loader-1.21
branch
from
90395f0 to
d881ba5
Compare
- Remove Stub SourceSet
- Clean up VertexWriter to closer match BufferBuilder - Clean up MeshEmitter on Fabric/NeoForge and remove BufferBuilderAccessor - Remove model data and model data lookup parameters in NeoForge model builders; use IBlockGetterExtension#getModelData instead - Fix artifact Minecraft version
…er-1.21 # Conflicts: # .github/workflows/build.yml # forge/src/main/resources/META-INF/neoforge.mods.toml
…er-1.21 # Conflicts: # forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java
post merge fixes
- Bump pack format in pack.mcmeta
|
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
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.