Add redstone trim support for elytra and horses

Bawnorton · Jul 29, 2023 · a2784d7 · a2784d7
1 parent 94c6dd4
commit a2784d7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20+build.1
 loader_version=0.14.21
 
 # Mod Properties
-mod_version=1.0.3
+mod_version=1.1.0
 maven_group=com.bawnorton
 archives_base_name=bettertrims
 

diff --git a/src/main/java/com/bawnorton/mixin/LivingEntityMixin.java b/src/main/java/com/bawnorton/mixin/LivingEntityMixin.java
@@ -3,15 +3,20 @@
 import com.bawnorton.config.Config;
 import com.bawnorton.effect.ArmorTrimEffects;
 import com.bawnorton.util.Wrapper;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @SuppressWarnings("unused")
@@ -29,11 +34,34 @@ private float modifySwimSpeed(float speed) {
 
     @Inject(method = "getMovementSpeed()F", at = @At("RETURN"), cancellable = true)
     private void modifyMovementSpeed(CallbackInfoReturnable<Float> cir) {
+        if(((LivingEntity) (Object) this) instanceof AbstractHorseEntity horseEntity) {
+            System.out.println("a");
+            if(horseEntity.getControllingPassenger() instanceof PlayerEntity player) {
+                System.out.println("b");
+                Wrapper<Float> increase = Wrapper.of(1f);
+                ArmorTrimEffects.REDSTONE.apply(player.getArmorItems(), stack -> {
+                    System.out.println("c");
+                    increase.set(increase.get() + Config.getInstance().redstoneMovementSpeedIncrease);
+                });
+                cir.setReturnValue(cir.getReturnValue() * increase.get());
+            }
+        }
         Wrapper<Float> increase = Wrapper.of(1f);
         ArmorTrimEffects.REDSTONE.apply(getArmorItems(), stack -> increase.set(increase.get() + Config.getInstance().redstoneMovementSpeedIncrease));
         cir.setReturnValue(cir.getReturnValue() * increase.get());
     }
 
+    @ModifyExpressionValue(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getVelocity()Lnet/minecraft/util/math/Vec3d;", ordinal = 2), slice =
+    @Slice(
+            from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;isFallFlying()Z"),
+            to = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getWorld()Lnet/minecraft/world/World;", ordinal = 1)
+    ))
+    private Vec3d modifyFlightSpeed(Vec3d original) {
+        Wrapper<Float> increase = Wrapper.of(1f);
+        ArmorTrimEffects.REDSTONE.apply(getArmorItems(), stack -> increase.set(increase.get() + Config.getInstance().redstoneMovementSpeedIncrease));
+        return original.multiply(increase.get(), 1, increase.get());
+    }
+
     @WrapOperation(method = "applyArmorToDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/DamageUtil;getDamageLeft(FFF)F"))
     private float modifyDamage(float damage, float armor, float armorToughness, Operation<Float> original) {
         float orignal = original.call(damage, armor, armorToughness);