Skip to content

Commit cf50bf7

Browse files
lowercasebtwlowercasebtw
committed
Kotlin <3
1 parent ec4502b commit cf50bf7

44 files changed

Lines changed: 702 additions & 650 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/org/visuals/legacy/animatium/config/category/ExtrasConfigCategory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import dev.isxander.yacl3.api.ConfigCategory;
2929
import net.minecraft.client.Minecraft;
3030
import net.minecraft.network.chat.Component;
31-
import org.visuals.legacy.animatium.util.compatibility.Mods;
31+
import org.visuals.legacy.animatium.util.compatibility.ModsKt;
3232
import org.visuals.legacy.animatium.util.config.EntryBundle;
3333
import org.visuals.legacy.animatium.util.enums.ServerFeature;
3434

@@ -98,7 +98,7 @@ public EntryBundle bundle() {
9898
.booleanEntry("offhandUsageSwinging")
9999
.booleanEntry("alwaysUsageSwing")
100100
.booleanEntry("alwaysSharpParticles");
101-
if (!Mods.HAS_SODIUM_EXTRAS) {
101+
if (!ModsKt.HAS_SODIUM_EXTRAS) {
102102
bundle.booleanEntry("disableRecipeAndTutorialToasts");
103103
}
104104

‎src/main/java/org/visuals/legacy/animatium/config/category/FixesConfigCategory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import dev.isxander.yacl3.api.ConfigCategory;
2929
import net.minecraft.network.chat.Component;
30-
import org.visuals.legacy.animatium.util.compatibility.Mods;
30+
import org.visuals.legacy.animatium.util.compatibility.ModsKt;
3131
import org.visuals.legacy.animatium.util.config.EntryBundle;
3232

3333
public final class FixesConfigCategory extends Category {
@@ -63,7 +63,7 @@ public EntryBundle bundle() {
6363
bundle.booleanEntry("fixCastLineCheck");
6464
bundle.booleanEntry("fixCastLineSwing");
6565
bundle.booleanEntry("fixFireballClientsideVisual");
66-
if (!Mods.HAS_VIAFABRICPLUS) {
66+
if (!ModsKt.HAS_VFP) {
6767
bundle.booleanEntry("fixTextStrikethroughStyle");
6868
}
6969

‎src/main/java/org/visuals/legacy/animatium/config/category/OtherConfigCategory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import net.minecraft.client.renderer.texture.OverlayTexture;
3131
import net.minecraft.network.chat.Component;
3232
import org.visuals.legacy.animatium.mixins.accessor.GameRendererAccessor;
33-
import org.visuals.legacy.animatium.util.compatibility.Mods;
33+
import org.visuals.legacy.animatium.util.compatibility.ModsKt;
3434
import org.visuals.legacy.animatium.util.config.EntryBundle;
3535
import org.visuals.legacy.animatium.util.enums.DamageTintSetting;
3636
import org.visuals.legacy.animatium.util.enums.VoidFogSetting;
@@ -95,7 +95,7 @@ public EntryBundle bundle() {
9595
bundle.booleanEntry("disableInventoryEntityScissor");
9696
bundle.booleanEntry("blockOutlineRendering");
9797
bundle.booleanEntry("disableModelWhilstSleeping");
98-
if (!Mods.HAS_LUNAR_CLIENT) {
98+
if (!ModsKt.HAS_LUNAR_CLIENT) {
9999
bundle.booleanEntry("damageTintArmor");
100100
}
101101

‎src/main/java/org/visuals/legacy/animatium/config/category/ScreenConfigCategory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import dev.isxander.yacl3.api.ConfigCategory;
2929
import net.minecraft.network.chat.Component;
30-
import org.visuals.legacy.animatium.util.Utils;
30+
import org.visuals.legacy.animatium.util.UtilsKt;
3131
import org.visuals.legacy.animatium.util.config.EntryBundle;
3232
import org.visuals.legacy.animatium.util.enums.CameraVersionSetting;
3333

@@ -83,7 +83,7 @@ public EntryBundle bundle() {
8383
bundle.booleanEntry("oldChatPosition");
8484
bundle.booleanEntry("oldCrosshairPosition");
8585
bundle.booleanEntry("disconnectServerToTitleScreen");
86-
bundle.booleanEntry("oldCraftingSlotsPosition", (option, event) -> Utils.reinitializeInventorySlots());
86+
bundle.booleanEntry("oldCraftingSlotsPosition", (option, event) -> UtilsKt.reinitializeInventorySlots());
8787

8888
return bundle;
8989
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/MixinLivingEntityRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public abstract class MixinLivingEntityRenderer<S extends LivingEntityRenderStat
6464
&& (Minecraft.getInstance().gui.screen() == null /* Disable when in inventory/not in-game */)) {
6565
final EntityDimensions standingDimensions = armedEntityRenderState.animatium$getStandingDimensions();
6666
if (standingDimensions != null) {
67-
final float cameraLerpValue = CameraUtilKt.lerpPosition(cameraRenderState);
67+
final float cameraLerpValue = CameraUtilKt.getPositionLerped(cameraRenderState);
6868
poseStack.translate(0.0F, (standingDimensions.eyeHeight() * livingEntityRenderState.scale) - cameraLerpValue, 0.0F);
6969
}
7070
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/flame/MixinFlameFeatureRenderer_OldFlameDimensions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public abstract class MixinFlameFeatureRenderer_OldFlameDimensions {
6969

7070
float value = original;
7171
if (shouldSyncPlayerModelWithEyeHeight) {
72-
final float cameraLerpValue = CameraUtilKt.lerpPosition(camera);
72+
final float cameraLerpValue = CameraUtilKt.getPositionLerped(camera);
7373
value = (avatarRenderState.eyeHeight * avatarRenderState.scale) - cameraLerpValue;
7474
}
7575

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/particles/MixinLivingEntity_Particles.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.visuals.legacy.animatium.Animatium;
5050
import org.visuals.legacy.animatium.config.AnimatiumConfig;
5151
import org.visuals.legacy.animatium.util.EntityUtilKt;
52-
import org.visuals.legacy.animatium.util.Utils;
5352

5453
import java.util.Map;
5554

@@ -70,11 +69,11 @@ public MixinLivingEntity_Particles(final EntityType<?> entityType, final Level l
7069
}
7170

7271
@WrapOperation(method = "tickEffects", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addParticle(Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V"))
73-
private void animatium$blendPotionParticleColors(final Level instance, final ParticleOptions particle, final double x, final double y, final double z, final double xd, final double yd, final double zd, final Operation<Void> original, @Local(name = "isAmbient") final boolean hasAmbience) {
72+
private void animatium$blendPotionParticleColors(final Level instance, final ParticleOptions particle, final double x, final double y, final double z, final double velocityX, final double velocityY, final double velocityZ, final Operation<Void> original, @Local(name = "isAmbient") final boolean hasAmbience) {
7473
ParticleOptions options = particle;
75-
double red = xd;
76-
double green = yd;
77-
double blue = zd;
74+
double red = velocityX;
75+
double green = velocityY;
76+
double blue = velocityZ;
7877
if (Animatium.isEnabled() && AnimatiumConfig.instance().other.restoreParticleBlending) {
7978
int color;
8079
if (this.activeEffects.isEmpty()) {

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/old_inventory_rendering/MixinGuiGraphics_ToolTipItemBar.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.visuals.legacy.animatium.Animatium;
4141
import org.visuals.legacy.animatium.config.AnimatiumConfig;
4242
import org.visuals.legacy.animatium.util.ItemUtilKt;
43-
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
43+
import org.visuals.legacy.animatium.util.rendering.RenderUtilsKt;
4444

4545
@Mixin(GuiGraphicsExtractor.class)
4646
public abstract class MixinGuiGraphics_ToolTipItemBar {
@@ -53,12 +53,12 @@ public abstract class MixinGuiGraphics_ToolTipItemBar {
5353
int q = h + 6;
5454
// TODO/NOTE: Figure out good names for these variables LOL
5555
final int lineColor = -267386864;
56-
RenderUtils.fillHorizontalLine(graphics, n, o - 1, p, lineColor);
57-
RenderUtils.fillHorizontalLine(graphics, n, o + q, p, lineColor);
58-
RenderUtils.fillRectangle(graphics, n, o, p, q, lineColor);
59-
RenderUtils.fillVerticalLine(graphics, n - 1, o, q, lineColor);
60-
RenderUtils.fillVerticalLine(graphics, n + p, o, q, lineColor);
61-
RenderUtils.fillFrameGradient(graphics, n, o + 1, p, q, 0x505000FF, 0x5028007F);
56+
RenderUtilsKt.fillHorizontalLine(graphics, n, o - 1, p, lineColor);
57+
RenderUtilsKt.fillHorizontalLine(graphics, n, o + q, p, lineColor);
58+
RenderUtilsKt.fillRectangle(graphics, n, o, p, q, lineColor);
59+
RenderUtilsKt.fillVerticalLine(graphics, n - 1, o, q, lineColor);
60+
RenderUtilsKt.fillVerticalLine(graphics, n + p, o, q, lineColor);
61+
RenderUtilsKt.fillFrameGradient(graphics, n, o + 1, p, q, 0x505000FF, 0x5028007F);
6262
} else {
6363
original.call(graphics, x, y, w, h, style);
6464
}
@@ -68,7 +68,7 @@ public abstract class MixinGuiGraphics_ToolTipItemBar {
6868
private void animatium$oldDurabilityBar(final ItemStack itemStack, final int x, final int y, final CallbackInfo ci, @Local(name = "left") final int left, final @Local(name = "top") int top) {
6969
if (Animatium.isEnabled() && AnimatiumConfig.instance().items.durabilityBarColors && !(itemStack.getItem() instanceof BundleItem)) {
7070
final int color = ARGB.opaque(ARGB.color((255 - ItemUtilKt.getLegacyDurabilityColorValue(itemStack)) / 4, 64, 0));
71-
RenderUtils.fillRectangle((GuiGraphicsExtractor) (Object) this, left, top, 12, 1, color);
71+
RenderUtilsKt.fillRectangle((GuiGraphicsExtractor) (Object) this, left, top, 12, 1, color);
7272
}
7373
}
7474
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/rendering/fog/MixinFogRenderer_Darkness.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public abstract class MixinFogRenderer_Darkness {
4444
private int animatium$fogDarkness(final FogEnvironment instance, final ClientLevel level, final Camera camera, final int renderDistance, final float tickDelta, final Operation<Integer> original) {
4545
final int color = original.call(instance, level, camera, renderDistance, tickDelta);
4646
if (Animatium.isEnabled() && AnimatiumConfig.instance().other.legacyFogDarkness) {
47-
final float darkness = LegacyFogDarkness.INSTANCE.getDarkness(tickDelta);
47+
final float darkness = LegacyFogDarkness.getInstance().getDarkness(tickDelta);
4848
return ARGB.multiply(color, ARGB.colorFromFloat(1.0F, darkness, darkness, darkness));
4949
} else {
5050
return color;

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/rendering/fog/MixinFogRenderer_VoidFog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.spongepowered.asm.mixin.injection.At;
4242
import org.visuals.legacy.animatium.Animatium;
4343
import org.visuals.legacy.animatium.config.AnimatiumConfig;
44-
import org.visuals.legacy.animatium.util.Utils;
44+
import org.visuals.legacy.animatium.util.UtilsKt;
4545

4646
@Mixin(FogRenderer.class)
4747
public abstract class MixinFogRenderer_VoidFog {
@@ -53,7 +53,7 @@ public abstract class MixinFogRenderer_VoidFog {
5353
private float animatium$voidFog(final float original, final Camera camera, final int renderDistanceInChunks, final DeltaTracker deltaTracker, final float darkenWorldAmount, final ClientLevel level) {
5454
final Entity entity = camera.entity();
5555
final boolean isVoidFogAllowed = entity instanceof Player player && !(player.isCreative() || player.isSpectator());
56-
if (Animatium.isEnabled() && AnimatiumConfig.instance().other.voidFog.hasFog() && Utils.hasFog1_7(level) && isVoidFogAllowed) {
56+
if (Animatium.isEnabled() && AnimatiumConfig.instance().other.voidFog.hasFog() && UtilsKt.hasVoidFog(level) && isVoidFogAllowed) {
5757
final double light = level.getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(entity.blockPosition()) / 16.0;
5858
final double yOffset = (Mth.lerp(deltaTracker.getGameTimeDeltaPartialTick(true), entity.yo, entity.getY()) + 4.0) / 32.0;
5959
if (light + yOffset < 1.0) {

0 commit comments

Comments
 (0)