🔧 Fix some dependency management.

This commit is contained in:
LambdAurora
2020-01-14 11:33:19 +01:00
parent a8c969b176
commit 7bfff00841
8 changed files with 25 additions and 12 deletions

View File

@@ -29,6 +29,10 @@ repositories {
}
}
configurations {
shadow
}
dependencies {
//to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -46,8 +50,8 @@ dependencies {
// Compatibility mods
modCompile "io.github.joaoh1:okzoomer:2.0.1"
api project(":common")
include project(":common")
api project(":core")
shadow project(":core")
include "org.jetbrains:annotations:17.0.0"
include "org.aperlambda:lambdajcommon:1.7.2"
include "com.electronwill.night-config:core:3.5.3"
@@ -74,4 +78,12 @@ java {
jar {
from "../LICENSE"
from {
configurations.shadow.filter {
it.getName().contains("lambdacontrols")
}.collect {
it.isDirectory() ? it : zipTree(it)
}
}
}

View File

@@ -30,9 +30,8 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
{
private boolean lambdacontrols_drifting_prevented = false;
// Can be mapped as `hasMovementInput` for example.
@Shadow
protected abstract boolean method_22120();
protected abstract boolean hasMovementInput();
public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile)
{
@@ -45,7 +44,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
LambdaControlsClient mod = LambdaControlsClient.get();
if (type == MovementType.SELF) {
if (this.abilities.flying && !mod.config.has_fly_drifting()) {
if (!this.method_22120()) {
if (!this.hasMovementInput()) {
if (!this.lambdacontrols_drifting_prevented) {
this.setVelocity(this.getVelocity().multiply(0, 1.0, 0));
}