mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-28 20:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev

Browse source 
Conflicts:
	settings.gradle
This commit is contained in:
PepperBell 2021-11-27 12:02:21 -08:00
commit 4f19fdddde
3 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
README.md
View file

@ -2,7 +2,7 @@
<img src="https://i.imgur.com/yVFgPpr.png" alt="Logo by @voxel_dani on Twitter" width="250">
<h1>Flywheel</h1>
<h6>A modern engine for modded Minecraft.</h6>
<a href='https://ci.tterrag.com/job/Flywheel/job/Forge/job/1.16/'><img src='https://ci.tterrag.com/job/Flywheel/job/Forge/job/1.16/badge/icon' alt="Jenkins"></a>
<a href='https://ci.tterrag.com/job/Flywheel/job/Fabric/job/1.17/'><img src='https://ci.tterrag.com/job/Flywheel/job/Fabric/job/1.17/badge/icon' alt="Jenkins"></a>
<a href="https://discord.gg/xjD59ThnXy"><img src="https://img.shields.io/discord/841464837406195712?color=5865f2&label=Discord&style=flat" alt="Discord"></a>
<a href="https://www.curseforge.com/minecraft/mc-mods/flywheel"><img src="http://cf.way2muchnoise.eu/486392.svg" alt="Curseforge Downloads"></a>
<br>
@ -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/).

2
settings.gradle
View file

@ -8,4 +8,4 @@ pluginManagement {
}
}
rootProject.name = 'Flywheel'
rootProject.name = 'Flywheel-Fabric'

25
src/main/java/com/jozufozu/flywheel/mixin/matrix/PoseStackMixin.java
View file

@ -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;
}
}