From 4ee6a8c9aaad7b1ba935ba5a2b0795f7e1fb3940 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Sat, 27 Nov 2021 11:30:38 -0800 Subject: [PATCH 1/2] Shadows causing trouble? No more shadows --- .../flywheel/mixin/matrix/PoseStackMixin.java | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java index 8588b9546..40db441c4 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java @@ -9,48 +9,34 @@ import com.mojang.math.Quaternion; @Mixin(PoseStack.class) public abstract class PoseStackMixin implements TransformStack { - @Shadow - public abstract void mulPose(Quaternion pQuaternion); - - @Shadow - public abstract void shadow$scale(float factorX, float factorY, float factorZ); - - @Shadow - public abstract void shadow$pushPose(); - - @Shadow - public abstract void shadow$popPose(); - - @Shadow - public abstract void shadow$translate(double x, double y, double z); @Override public TransformStack multiply(Quaternion quaternion) { - mulPose(quaternion); + ((PoseStack)(Object) this).mulPose(quaternion); return this; } @Override public TransformStack scale(float factorX, float factorY, float factorZ) { - shadow$scale(factorX, factorY, factorZ); + ((PoseStack)(Object) this).scale(factorX, factorY, factorZ); return this; } @Override public TransformStack pushPose() { - shadow$pushPose(); + ((PoseStack)(Object) this).pushPose(); return this; } @Override public TransformStack popPose() { - shadow$popPose(); + ((PoseStack)(Object) this).popPose(); return this; } @Override public TransformStack translate(double x, double y, double z) { - shadow$translate(x, y, z); + ((PoseStack)(Object) this).translate(x, y, z); return this; } } From b11da57834c05d0304af0bc342d9ed38cd893431 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Sat, 27 Nov 2021 11:31:50 -0800 Subject: [PATCH 2/2] Change project name, update ci badge --- README.md | 8 ++++---- settings.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0764d418a..393a70fc7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Logo by @voxel_dani on Twitter

Flywheel

A modern engine for modded Minecraft.
-Jenkins +Jenkins Discord Curseforge Downloads
@@ -46,12 +46,12 @@ repositories { } dependencies { - implementation fg.deobf("com.jozufozu.flywheel:Flywheel:${flywheel_version}") + implementation fg.deobf("com.jozufozu.flywheel:Flywheel-Forge:${flywheel_version}") } ``` -`${flywheel_version}` gets replaced by the version of Flywheel you want to use, eg. `0.0.3.18` +`${flywheel_version}` gets replaced by the version of Flywheel you want to use, eg. `0.3.0.17` -For a list of available Flywheel versions, you can check [the maven](https://maven.tterrag.com/com/jozufozu/flywheel/Flywheel/). +For a list of available Flywheel versions, you can check [the maven](https://maven.tterrag.com/com/jozufozu/flywheel/Flywheel-Forge/). If you aren't using mixed mappings (or just want to be safe), add the following properties to your run configurations: ```groovy diff --git a/settings.gradle b/settings.gradle index 012ca9ac4..6d647c44e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'Flywheel' +rootProject.name = 'Flywheel-Forge'