-
-
Notifications
You must be signed in to change notification settings - Fork 52
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
Port to 1.21.1 #240
base: 1.20/dev
Are you sure you want to change the base?
Port to 1.21.1 #240
Conversation
- Fix ObfuscationReflectionHelper#setPrivateValue using SRG mapped names, Neoforge has switched to mojmap at runtime
34eba91
to
2f83dcc
Compare
# Conflicts: # gradle.properties
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
# Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java # forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java # gradle.properties
# Conflicts: # forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java
64a0c0d
to
4c5894c
Compare
4c5894c
to
ae4e4e7
Compare
forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
Outdated
Show resolved
Hide resolved
forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
Outdated
Show resolved
Hide resolved
common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMods.java
Outdated
Show resolved
Hide resolved
common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMods.java
Outdated
Show resolved
Hide resolved
forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
Outdated
Show resolved
Hide resolved
buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt
Outdated
Show resolved
Hide resolved
common/src/lib/java/dev/engine_room/flywheel/lib/model/part/VertexWriter.java
Show resolved
Hide resolved
forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java
Show resolved
Hide resolved
This PR seems to have a bug that compleatly breaks the hitbox entity component. The fire one might also be broken, but I have no easy repro. Repro steps:
The issue disappears after reloading chunks with F3+A and sometimes reappears in after rejoining the game. An alternative form of the bug can also appear after F3+A with some combination of reloads and hitbox toggles, which looks like this: I was unable to reliably reproduce this form.I have no idea what's going on, but its very broken. |
fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java
Outdated
Show resolved
Hide resolved
forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java
Outdated
Show resolved
Hide resolved
fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java
Show resolved
Hide resolved
…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
No description provided.