mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-26 06:57:02 +01:00
Code Issues Projects Releases Packages Wiki Activity
2406 commits 22 branches 0 tags 42 MiB
Commit graph

116 commits

Author SHA1 Message Date
PepperCode1
9da4fc5b60 Merge remote-tracking branch 'origin/1.19/dev' into 1.19/fabric/dev 2024-09-01 17:32:05 -07:00
PepperCode1
4eb36f77f7 Bump version and remove unnecessary code after fence fix 2024-09-01 17:21:26 -07:00
IThundxr
548ad49433
1.19 0.6.10 (#213) 
* 1.19 0.6.10

* fix refmap

* Fix merge mistakes

* chore: Drop remap changes commits, not needed

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
 2023-11-26 13:46:23 -08:00
PepperCode1
23860ad857 Merge branch '1.18/dev' into 1.19/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/core/virtual/VirtualChunk.java
	src/main/java/com/jozufozu/flywheel/core/virtual/VirtualRenderWorld.java
	src/main/java/com/jozufozu/flywheel/mixin/instancemanage/ChunkRebuildHooksMixin.java
	src/main/resources/flywheel.mixins.json
 2023-08-23 11:50:49 -07:00
PepperCode1
6709870456 Improve and fix VirtualRenderWorld 
- Fix calling VirtualRenderWorld#getExistingBlockEntity causing a crash
- Bump version
 2023-08-21 13:17:47 -07:00
PepperCode1
20e23aff8f Merge remote-tracking branch 'origin/1.19/dev' into 1.19/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
 2023-07-07 14:53:51 -06:00
PepperCode1
fd8038035d Merge branch '1.18/fabric/dev' into 1.19/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
	src/main/java/com/jozufozu/flywheel/core/model/Bufferable.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertex.java
	src/main/resources/fabric.mod.json
 2023-07-07 14:49:48 -06:00
PepperCode1
95cf9dbe78 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/model/ShadeSeparatedBufferBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertex.java
 2023-07-07 11:46:29 -06:00
PepperCode1
5ae96be11a Merge branch '1.18/dev' into 1.19/dev 
Conflicts:
	build.gradle
	gradle.properties
 2023-06-26 19:08:11 -07:00
PepperCode1
873facfd34 Fix crumbling 
- Use vanilla's approach of determining crumbling UVs from vertex
positions instead of scaling existing UVs
- Bump version
- Update buildscript and Gradle
 2023-06-26 18:55:00 -07:00
PepperCode1
583f6ed9e0 Merge remote-tracking branch 'origin/1.19/dev' into 1.19/fabric/dev 
Conflicts:
	src/main/resources/META-INF/mods.toml
 2023-01-26 11:19:36 -08:00
PepperCode1
59c11949e8 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	src/main/resources/META-INF/mods.toml
 2023-01-26 11:17:06 -08:00
PepperCode1
0e198ab8c7 Merge branch '1.18/dev' into 1.19/dev 
Conflicts:
	gradle.properties
 2023-01-13 16:09:34 -08:00
PepperCode1
f370e85d6d Increment version 2023-01-13 16:08:32 -08:00
PepperCode1
954d1d77fb Merge remote-tracking branch 'origin/1.19/dev' into 1.19/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/backend/Loader.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/core/PartialModel.java
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/model/ShadeSeparatedBufferBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertex.java
	src/main/java/com/jozufozu/flywheel/event/EntityWorldHandler.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/java/com/jozufozu/flywheel/util/RenderMath.java
	src/main/resources/META-INF/mods.toml
	src/main/resources/pack.mcmeta
 2022-11-11 00:11:58 -08:00
PepperCode1
e78158925e Update Loom, Loader, Fabric API 2022-11-10 20:59:12 -08:00
PepperCode1
7c757fee80 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
	src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/java/com/jozufozu/flywheel/mixin/ChunkRebuildHooksMixin.java
	src/main/java/com/jozufozu/flywheel/mixin/InstanceAddMixin.java
	src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
 2022-11-10 18:05:46 -08:00
PepperCode1
88135d8715 Tiniest of discrepancies 
- Re-add default implementation of Model#createEBO
- Remove old commented methods in VirtualChunk
- Update Forge
 2022-11-10 16:56:23 -08:00
PepperCode1
8c36613738 Merge branch '1.18/dev' into 1.19/dev 
# Conflicts:
#	gradle.properties
#	src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java
#	src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
#	src/main/java/com/jozufozu/flywheel/core/model/Model.java
#	src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
#	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
#	src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
#	src/main/java/com/jozufozu/flywheel/mixin/instancemanage/ChunkRebuildHooksMixin.java
#	src/main/resources/flywheel.mixins.json
 2022-11-10 16:41:02 -08:00
PepperCode1
f6d5ed01e7 A bit of backporting 
- Backport general changes from 1.19
- Fix Javadoc of PartialModel
- Remove default Model#getType implementation
- Increment version to 0.6.8
- Update Parchment
 2022-11-10 16:30:30 -08:00
PepperCode1
adcb61526b Fix crash with Optifine 
- Bump version
 2022-09-28 20:04:04 -07:00
PepperCode1
bc5084b2d8 Merge branch '1.18/dev' into 1.19/dev 
Conflicts:
	gradle.properties
 2022-09-21 15:52:08 -07:00
PepperCode1
098cb3ee70 Porting from all directions 
- Diagonal-port restore state changes from 1.18/next
- Back-port buffer uploader changes and RenderLayerEvent dispatch point
change from 1.19/dev
- Make CrumblingRenderer return earlier if there is nothing to render
- Bump version
 2022-09-21 15:34:58 -07:00
PepperCode1
d51c373568 1.19.2 and more fixes 
- Update to 1.19.2
- Unbind VAO before restoring GL state
- Shift RenderLayerEvent dispatching point after vanilla VBO and VAO
clean-up
- Fix BlockModel's check for an index buffer being inverted
- The RenderedBuffer returned from ModelUtil#endShadeSeparated is no
longer nullable
- Allow unshadedStartVertex to be 0
- Remove BufferUploaderMixin
- Fix PartialModel javadoc referencing the old bake event
- Switch back to Parchment mappings
 2022-08-13 23:26:39 -07:00
PepperCode1
055ae6c04b Merge branch '1.18/dev' into 1.19/dev 
Conflicts:
	gradle.properties
 2022-08-13 14:03:56 -07:00
PepperCode1
70616d381a Fix crash with Rubidium when using batching 
- Backport fix from 1.18/next
- Downgrade and lock ForgeGradle version to fix build
- Update Forge to match 1.18/next
- Bump version
 2022-08-13 13:54:52 -07:00
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
Jozufozu
be78f92df6 Merge branch '1.18/dev' into 1.19/dev 
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/jozufozu/flywheel/backend/Loader.java
#	src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java
 2022-07-16 21:43:00 -04:00
PepperCode1
a42c027b6f Scheme-a-version 
- Fix Resources not being closed properly
- Change versioning scheme to match Create
- Add LICENSE to built jar
- Fix mods.toml version sync
- Move JOML code to non-src directory
- Update Gradle
- Organize imports
 2022-07-15 00:00:54 -07:00
PepperCode1
b5ea5f561e Port to 1.19 (mostly) 
- BufferBuilder manipulation code has not been ported
 2022-07-12 14:44:31 -07:00
Jozufozu
c3b1a43beb One more thing... 
- Missed a level param in LightVolume
 - Public removeAndMark
 - Remove batching warning
 - Bump forge and parchment builds
 2022-07-10 15:22:02 -04:00
Jozufozu
055802160f Update light updates 
- ... to address the nullpointer with create pulleys
 - LightListeners track their own levels
 - Remove BasicProvider and LightProvider
 - Rename MovingListener to better match functionality
 - Remove ListenerStatus in favor of a boolean
 - Instances keep track of their removal status and properly report it via LightListener#isListenerInvalid
 - Bump version - 0.6.4
 2022-07-09 13:25:24 -04:00
PepperCode1
e0aa5dd7ce Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	.github/ISSUE_TEMPLATE/bug_report.yml
	build.gradle
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/config/FlwConfig.java
 2022-06-30 19:38:14 -07:00
Jozufozu
e26195169f Closing the blinds 
- Prevent LightUpdater from interacting with invalid levels.
 - Bump version - 0.6.3
 2022-06-22 13:29:28 -07:00
PepperCode1
a6d0dd8a39 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/resources/META-INF/mods.toml
 2022-03-14 11:22:58 -07:00
PepperCode1
a419eab484 Update to 1.18.2 
- Switch to SLF4J logging
- Bump version
- Add 0.6.1 changelog
 2022-03-14 10:52:28 -07: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
Jozufozu
9219fef20a Toggleable update limiting 
- Extract update limiting behavior to interface
 - Move original impl to BandedPrimeLimiter
 - Add dummy NonLimiter impl
 - Add command/config to toggle update limiting
 - Refactor InstanceManager to be more consistent between frame updates and tick updates
 - Bump version - 0.6.1
 2022-02-01 13:56:08 -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
Jozufozu
c490d15876 Initial move to client commands. 
- Nothing fancy, just inlining packets.
 2022-01-24 10:46:17 -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
Jozufozu
26ea6bd315 Bump version - 0.6.0 2022-01-17 18:26:28 -08:00
PepperCode1
b2bc5fd438 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/config/BooleanConfig.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertex.java
 2022-01-04 10:56:09 -08:00
PepperCode1
eb8dc6bc07 Switch to instancing controllers 
- Combine InstanceFactories and FlywheelRendered into
InstancingControllers
- Store these controllers directly in the BlockEntity/Entity type
instead of a map for efficiency
- Redo InstancedRenderRegistry to fit these changes
- Rename all tile to block entity
- Remove all interface I prefixes
- Organize imports
- Bump version to 0.5.1
 2022-01-03 21:41:08 -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
Jozufozu
1d8a5dc84e Bump version - 0.5.0a 2021-12-29 10:59:34 -08:00
PepperCode1
0d79ee8638 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/Loader.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfig.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/config/FlwPackets.java
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelModel.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
	src/main/java/com/jozufozu/flywheel/util/BakedQuadWrapper.java
	src/main/java/com/jozufozu/flywheel/util/BufferBuilderReader.java
	src/main/java/com/jozufozu/flywheel/util/RenderUtil.java
 2021-12-24 22:55:44 -08:00
Jozufozu
1377732df4 Merge branch '1.18/dev' into 1.18/batching 2021-12-23 23:23:04 -08:00
Jozufozu
082fe8cdd8 Switch back to parchment, update forge 2021-12-23 23:09:51 -08:00
Jozufozu
5cca71332d Bump version - 0.5.0 2021-12-22 22:37:27 -08:00