From 053db047a053cfa4b510d872802434a922275326 Mon Sep 17 00:00:00 2001 From: inglettronald Date: Tue, 18 Jul 2023 12:27:13 -0500 Subject: More Entity/Animation fixes --- src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt | 6 ++++++ src/main/kotlin/com/dulkirfabric/features/RenderTest.kt | 6 ++---- src/main/kotlin/com/dulkirfabric/util/GlowingEntityInterface.kt | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/main/kotlin/com') diff --git a/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt b/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt index b612156..0b04c0f 100644 --- a/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt +++ b/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt @@ -189,6 +189,11 @@ class DulkirConfig { } .build() ) + animations.addEntry( + entryBuilder.startIntSlider(Text.literal("rotationZ"), configOptions.handSwingDuration, 2, 15) + .setSaveConsumer { newValue -> configOptions.handSwingDuration = newValue } + .build() + ) builder.transparentBackground() @@ -222,6 +227,7 @@ class DulkirConfig { var heldItemScale: Float = 0f, var duraCooldown: Boolean = false, var alarmTimeout: Int = 300, + var handSwingDuration: Int = 6 ) @Serializable diff --git a/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt b/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt index 7b6c5e6..8d941d1 100644 --- a/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt +++ b/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt @@ -2,14 +2,12 @@ package com.dulkirfabric.features import com.dulkirfabric.events.EntityLoadEvent import com.dulkirfabric.events.WorldRenderLastEvent -import com.dulkirfabric.util.GlowingEntityInterface import com.dulkirfabric.util.WorldRenderUtils import meteordevelopment.orbit.EventHandler import net.minecraft.text.Style import net.minecraft.text.Text import net.minecraft.util.math.Vec3d import java.awt.Color -import kotlin.random.Random object RenderTest { @@ -28,7 +26,7 @@ object RenderTest { @EventHandler fun onLoadEnt(event: EntityLoadEvent) { - if (event.entity !is GlowingEntityInterface) return - event.entity.setDulkirEntityGlow(true, Color(255, 255, 255, 255), Random(event.entity.id).nextBoolean()) +// if (event.entity !is GlowingEntityInterface) return +// event.entity.setDulkirEntityGlow(true, Color(255, 255, 255, 255),false) } } \ No newline at end of file diff --git a/src/main/kotlin/com/dulkirfabric/util/GlowingEntityInterface.kt b/src/main/kotlin/com/dulkirfabric/util/GlowingEntityInterface.kt index 5a76890..9b129fd 100644 --- a/src/main/kotlin/com/dulkirfabric/util/GlowingEntityInterface.kt +++ b/src/main/kotlin/com/dulkirfabric/util/GlowingEntityInterface.kt @@ -3,7 +3,7 @@ package com.dulkirfabric.util import java.awt.Color interface GlowingEntityInterface { - fun setDulkirEntityGlow(shouldGlow: Boolean, glowColor: Color, shouldESP: Boolean = false) + fun setDulkirEntityGlow(shouldGlow: Boolean = false, glowColor: Color, shouldESP: Boolean = false) fun shouldDulkirEntityGlow() : Boolean -- cgit