diff --git a/README.md b/README.md index 0764d418a..90ad0d683 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,16 +46,9 @@ repositories { } dependencies { - implementation fg.deobf("com.jozufozu.flywheel:Flywheel:${flywheel_version}") + implementation fg.deobf("com.jozufozu.flywheel:Flywheel-Fabric:${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.5` -For a list of available Flywheel versions, you can check [the maven](https://maven.tterrag.com/com/jozufozu/flywheel/Flywheel/). - -If you aren't using mixed mappings (or just want to be safe), add the following properties to your run configurations: -```groovy -property 'mixin.env.remapRefMap', 'true' -property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" -``` -This ensures that Flywheel's mixins get properly loaded in your dev env. +For a list of available Flywheel versions, you can check [the maven](https://maven.tterrag.com/com/jozufozu/flywheel/Flywheel-Fabric/). diff --git a/settings.gradle b/settings.gradle index 38d002346..3ce7978be 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,4 @@ pluginManagement { } } -rootProject.name = 'Flywheel' +rootProject.name = 'Flywheel-Fabric' 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..781540838 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.mixin.matrix; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; @@ -9,48 +8,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; } }