aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/dulkirmod
diff options
context:
space:
mode:
authoringlettronald <71849533+inglettronald@users.noreply.github.com>2022-11-04 00:52:28 -0500
committerGitHub <noreply@github.com>2022-11-04 00:52:28 -0500
commit91ee32e41b3e1be0959c879ba8f93876fbfaf9af (patch)
tree04b9f07f661135b5d56403cdfc1d82ed26d3d3f5 /src/main/java/dulkirmod
parent21171955bde8025ad31b72ebfaf57019d0cecf36 (diff)
parent7c58ed97df75ad721fd14133a49b1a64de257179 (diff)
downloadDulkirMod-91ee32e41b3e1be0959c879ba8f93876fbfaf9af.tar.gz
DulkirMod-91ee32e41b3e1be0959c879ba8f93876fbfaf9af.tar.bz2
DulkirMod-91ee32e41b3e1be0959c879ba8f93876fbfaf9af.zip
Merge pull request #3 from hannibal002/java_reformat
Java Reformat
Diffstat (limited to 'src/main/java/dulkirmod')
-rw-r--r--src/main/java/dulkirmod/mixins/ItemRendererMixin.java4
-rw-r--r--src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java2
-rw-r--r--src/main/java/dulkirmod/mixins/MixinGuiContainer.java32
-rw-r--r--src/main/java/dulkirmod/mixins/MixinRendererManager.java2
-rw-r--r--src/main/java/dulkirmod/mixins/MixinWorld.java3
5 files changed, 21 insertions, 22 deletions
diff --git a/src/main/java/dulkirmod/mixins/ItemRendererMixin.java b/src/main/java/dulkirmod/mixins/ItemRendererMixin.java
index 18fd72a..458668e 100644
--- a/src/main/java/dulkirmod/mixins/ItemRendererMixin.java
+++ b/src/main/java/dulkirmod/mixins/ItemRendererMixin.java
@@ -25,11 +25,11 @@ public class ItemRendererMixin {
}
@Inject(method = {"doItemUsedTransformations"}, at = @At("HEAD"), cancellable = true)
- public void useTransform(float swingProgress, CallbackInfo ci){
+ 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 43a6c27..c43bcd2 100644
--- a/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
+++ b/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
@@ -26,6 +26,6 @@ public abstract class MixinEntityLivingBase extends MixinEntity {
(this.isPotionActive(Potion.digSlowdown) ?
6 + (1 + this.getActivePotionEffect(Potion.digSlowdown).getAmplifier()) * 2 :
6);
- cir.setReturnValue(Math.max((int)(length* Math.exp(-DulkirMod.Companion.getConfig().getCustomSpeed())), 1));
+ cir.setReturnValue(Math.max((int) (length * Math.exp(-DulkirMod.Companion.getConfig().getCustomSpeed())), 1));
}
}
diff --git a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
index 2ffa02d..2b9b070 100644
--- a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
+++ b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
@@ -16,31 +16,31 @@ 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(at = @At("HEAD"), method = "drawSlot", cancellable = true)
public void drawSlot(Slot slotIn, CallbackInfo ci) {
if (Croesus.Companion.inCroesus() && Croesus.Companion.isChestOpened(slotIn)) {
ci.cancel();
}
if (DungeonLeap.Companion.inLeapMenu() && DungeonLeap.Companion.isHighlightedLeapPlayer(slotIn)) {
- ci.cancel();
+ ci.cancel();
- ItemStack stack = new ItemStack(Blocks.wool, 1, EnumDyeColor.GREEN.getMetadata());
+ ItemStack stack = new ItemStack(Blocks.wool, 1, EnumDyeColor.GREEN.getMetadata());
- this.zLevel = 100.0F;
- this.itemRender.zLevel = 100.0F;
+ this.zLevel = 100.0F;
+ this.itemRender.zLevel = 100.0F;
- GlStateManager.enableDepth();
- this.itemRender.renderItemAndEffectIntoGUI(
- stack,
- slotIn.xDisplayPosition,
- slotIn.yDisplayPosition
- );
- this.itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, stack,
- slotIn.xDisplayPosition, slotIn.yDisplayPosition, ""
- );
+ GlStateManager.enableDepth();
+ this.itemRender.renderItemAndEffectIntoGUI(
+ stack,
+ slotIn.xDisplayPosition,
+ slotIn.yDisplayPosition
+ );
+ this.itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, stack,
+ slotIn.xDisplayPosition, slotIn.yDisplayPosition, ""
+ );
- this.itemRender.zLevel = 0.0F;
- this.zLevel = 0.0F;
+ this.itemRender.zLevel = 0.0F;
+ this.zLevel = 0.0F;
}
}
}
diff --git a/src/main/java/dulkirmod/mixins/MixinRendererManager.java b/src/main/java/dulkirmod/mixins/MixinRendererManager.java
index c695ed2..964e690 100644
--- a/src/main/java/dulkirmod/mixins/MixinRendererManager.java
+++ b/src/main/java/dulkirmod/mixins/MixinRendererManager.java
@@ -26,7 +26,7 @@ public class MixinRendererManager {
boolean p_147939_10_,
CallbackInfoReturnable<Boolean> cir
) {
- if(!DulkirMod.Companion.getConfig().getHideHealerFairy()) return;
+ if (!DulkirMod.Companion.getConfig().getHideHealerFairy()) return;
if (entity instanceof EntityArmorStand) {
if (((EntityArmorStand) entity).getHeldItem() != null && ((EntityArmorStand) entity).getHeldItem().getItem() == Items.skull) {
ItemStack stack = ((EntityArmorStand) entity).getHeldItem();
diff --git a/src/main/java/dulkirmod/mixins/MixinWorld.java b/src/main/java/dulkirmod/mixins/MixinWorld.java
index 97133e1..1502e38 100644
--- a/src/main/java/dulkirmod/mixins/MixinWorld.java
+++ b/src/main/java/dulkirmod/mixins/MixinWorld.java
@@ -15,8 +15,7 @@ public class MixinWorld {
double xOffset, double yOffset, double zOffset, int[] p_175720_15_, CallbackInfo ci) {
if (particleID == 25 && DulkirMod.Companion.getConfig().getHideEnchantRune()) {
ci.cancel();
- }
- else if (particleID == 34 && DulkirMod.Companion.getConfig().getHideHeartParticles()) {
+ } else if (particleID == 34 && DulkirMod.Companion.getConfig().getHideHeartParticles()) {
ci.cancel();
}
}