Commit graph

14 commits

Author SHA1 Message Date
PepperCode1
473b1af5c6 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/backend/Backend.java
	src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java
	src/main/java/com/jozufozu/flywheel/mixin/FrustumMixin.java
	src/main/resources/META-INF/mods.toml
2022-07-16 21:00:15 -07:00
PepperCode1
f5b15f3dff Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertex.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java
	src/main/java/com/jozufozu/flywheel/util/RenderMath.java
2022-02-21 15:28:26 -08:00
PepperCode1
59c4ac3cb8 Fix and optimize model hacks
- Remove isVanillaAdapter check from CullingBakingModel.wrap
- Optimize model wrapping in ModelUtil.getBufferBuilderFromTemplate
2022-02-06 16:28:33 -08:00
PepperCode1
2b5e71e172 Fix Sodium mixin not being remapped in prod 2022-02-06 12:38:47 -08:00
IMS
bbc5cc60bf
Fix Sodium block entity support (#108)
* Fix Sodium block entity support

* Fix production remapping

* Make sodium modCompileOnly

* Finalize Sodium compatibility

- Improve mixin to redirect getting of renderer instead of adding of
block entity
- Move mixins from mixin.sodium to fabric.mixin.sodium
- Remove Joml dependency

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
2022-02-03 19:49:24 -08:00
PepperCode1
e48ecccf32 Improve Iris compatibility
- Use config-based areShadersEnabled when choosing the engine
2022-02-03 17:12:50 -08:00
PepperCode1
8fcc1df383 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/FlywheelClient.java
	src/main/java/com/jozufozu/flywheel/backend/Backend.java
	src/main/java/com/jozufozu/flywheel/backend/Loader.java
	src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/config/FlwConfig.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
2022-02-01 21:32:31 -08:00
PepperCode1
c38d66e867 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	gradle.properties
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfig.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfigCommand.java
	src/main/java/com/jozufozu/flywheel/config/BooleanDirective.java
	src/main/java/com/jozufozu/flywheel/config/EngineArgument.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/resources/META-INF/mods.toml
2022-01-31 18:18:24 -08:00
PepperCode1
eeab6543da Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	src/main/java/com/jozufozu/flywheel/FlywheelClient.java
	src/main/java/com/jozufozu/flywheel/backend/Backend.java
	src/main/java/com/jozufozu/flywheel/backend/Loader.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/java/com/jozufozu/flywheel/event/GatherContextEvent.java
	src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
2022-01-17 21:55:55 -08:00
PepperCode1
44f3358f3e Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	src/main/java/com/jozufozu/flywheel/FlywheelClient.java
	src/main/java/com/jozufozu/flywheel/event/EntityWorldHandler.java
2021-12-31 12:57:19 -08:00
PepperCode1
c4ef94f5f5 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev
Conflicts:
	build.gradle
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/config/FlwPackets.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelTransformer.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
2021-12-28 16:19:53 -08:00
PepperCode1
a2b6c4fd9d Fix BufferBuilderReader endianness
- Set split ByteBuffer's order to that of the BufferBuilder's ByteBuffer
in BufferBuilderReader
- Move Fabric-only mixins from mixin.fabric to fabric.mixin and create
separate mixin config
2021-12-24 16:21:57 -08:00
PepperCode1
09f3c495e9 Fix virtual model rendering
- Add various utility classes to allow FRAPI-compatible virtual
rendering
- Fix PartialModel using field instead of getter method
2021-12-21 23:37:52 -08:00
PepperBell
9a1c381f70 Port to Fabric 2021-10-14 16:20:56 -07:00