aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/dulkirmod
diff options
context:
space:
mode:
authoringlettronald <71849533+inglettronald@users.noreply.github.com>2022-11-04 01:00:10 -0500
committerGitHub <noreply@github.com>2022-11-04 01:00:10 -0500
commitc8dd376ff027606aab980a7da4049be61368a86c (patch)
tree323ee312f129b61a6de6e154c4bab6dd2cba820b /src/main/java/dulkirmod
parent91ee32e41b3e1be0959c879ba8f93876fbfaf9af (diff)
parent633c11c642b331e3a54060f06188bff35dab20d7 (diff)
downloadDulkirMod-c8dd376ff027606aab980a7da4049be61368a86c.tar.gz
DulkirMod-c8dd376ff027606aab980a7da4049be61368a86c.tar.bz2
DulkirMod-c8dd376ff027606aab980a7da4049be61368a86c.zip
Merge pull request #2 from hannibal002/kotlin_reformat
Kotlin Reformat
Diffstat (limited to 'src/main/java/dulkirmod')
-rw-r--r--src/main/java/dulkirmod/mixins/ItemRendererMixin.java8
-rw-r--r--src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java2
-rw-r--r--src/main/java/dulkirmod/mixins/MixinGuiContainer.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/dulkirmod/mixins/ItemRendererMixin.java b/src/main/java/dulkirmod/mixins/ItemRendererMixin.java
index 458668e..0fb56e4 100644
--- a/src/main/java/dulkirmod/mixins/ItemRendererMixin.java
+++ b/src/main/java/dulkirmod/mixins/ItemRendererMixin.java
@@ -19,17 +19,17 @@ public class ItemRendererMixin {
@Shadow private ItemStack itemToRender;
- @Inject(method = {"transformFirstPersonItem(FF)V"}, at = @At("HEAD"), cancellable = true)
+ @Inject(method = "transformFirstPersonItem(FF)V", at = @At("HEAD"), cancellable = true)
public void itemTransform(float equipProgress, float swingProgress, CallbackInfo ci) {
if (ItemAnimations.INSTANCE.itemTransforHook(equipProgress, swingProgress)) ci.cancel();
}
- @Inject(method = {"doItemUsedTransformations"}, at = @At("HEAD"), cancellable = true)
- public void useTransform(float swingProgress, CallbackInfo ci) {
+ @Inject(method = "doItemUsedTransformations", at = @At("HEAD"), cancellable = true)
+ public void useTransform(float swingProgress, CallbackInfo ci){
if (ItemAnimations.INSTANCE.scaledSwing(swingProgress)) ci.cancel();
}
- @Inject(method = {"performDrinking"}, at = @At("HEAD"), cancellable = true)
+ @Inject(method ="performDrinking", at = @At("HEAD"), cancellable = true)
public void drinkTransform(AbstractClientPlayer clientPlayer, float partialTicks, CallbackInfo ci) {
if (ItemAnimations.INSTANCE.rotationlessDrink(clientPlayer, partialTicks)) ci.cancel();
if (ItemAnimations.INSTANCE.scaledDrinking(clientPlayer, partialTicks, itemToRender)) ci.cancel();
diff --git a/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java b/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
index c43bcd2..d746c23 100644
--- a/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
+++ b/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
@@ -18,7 +18,7 @@ public abstract class MixinEntityLivingBase extends MixinEntity {
@Shadow public abstract PotionEffect getActivePotionEffect(Potion potionIn);
- @Inject(method = {"getArmSwingAnimationEnd()I"}, at = @At("HEAD"), cancellable = true)
+ @Inject(method = "getArmSwingAnimationEnd()I", at = @At("HEAD"), cancellable = true)
public void adjustSwingLength(CallbackInfoReturnable<Integer> cir) {
if (!DulkirMod.Companion.getConfig().getCustomAnimations()) return;
int length = DulkirMod.Companion.getConfig().getIgnoreHaste() ? 6 : this.isPotionActive(Potion.digSpeed) ?
diff --git a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
index 2b9b070..4a50163 100644
--- a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
+++ b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GuiContainer.class)
public abstract class MixinGuiContainer extends GuiScreen {
- @Inject(at = @At("HEAD"), method = "drawSlot", cancellable = true)
+ @Inject(method="drawSlot", at=@At("HEAD"), cancellable = true)
public void drawSlot(Slot slotIn, CallbackInfo ci) {
if (Croesus.Companion.inCroesus() && Croesus.Companion.isChestOpened(slotIn)) {
ci.cancel();