Item Swing Speed / Refactoring

Author: lowercasebtw

.editorconfig

@@ -2,7 +2,9 @@ root = true
 
 [*]
 end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
 
-[{*.json,*.toml}]
+[{*.json,*.toml,*.mcmeta}]
 indent_style = tab
-indent_size = 4
+indent_size = 4

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## General
 
-- Reworked a lot of code
+- Reworked a lot of code & Moved a lot of it to Kotlin (kotlin da goat g)
 - Config setting names are more generalized
 - Scrapped the config data packet idea (no replacement)
 

build.gradle.kts

@@ -46,8 +46,8 @@ class ModData {
 class Dependencies {
     val fabricLoaderVersion = property("deps.fabric_loader_version") as String?
     val fabricApiVersion = property("deps.fabric_api_version") as String?
+    val languageKotlinVersion = property("deps.language_kotlin_version") as String?
     val devAuthVersion = property("deps.devauth_version") as String?
-    val lombokVersion = property("deps.lombok_version") as String?
     val mixinConstraintsVersion = property("deps.mixinconstraints_version") as String?
     val mixinSquaredVersion = property("deps.mixinsquared_version") as String?
 }
@@ -131,18 +131,17 @@ dependencies {
         })
     }
 
-    compileOnly("org.projectlombok:lombok:${deps.lombokVersion}")
-    annotationProcessor("org.projectlombok:lombok:${deps.lombokVersion}")
     modRuntimeOnly("me.djtheredstoner:DevAuth-${loader.name}:${deps.devAuthVersion}")
-
-    include(implementation("com.moulberry:mixinconstraints:${deps.mixinConstraintsVersion}")!!)!!
+    include(implementation("com.moulberry:mixinconstraints:${deps.mixinConstraintsVersion}")!!)
     include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-${loader.name}:${deps.mixinSquaredVersion}")!!)!!)
+
     modImplementation("net.fabricmc:fabric-loader:${deps.fabricLoaderVersion}")!!
     modImplementation("net.fabricmc.fabric-api:fabric-api:${deps.fabricApiVersion}")
     optionalProp("deps.modmenu_version") { prop ->
         modImplementation("com.terraformersmc:modmenu:$prop")
     }
 
+    include(implementation("net.fabricmc:fabric-language-kotlin:${deps.languageKotlinVersion}")!!)
     optionalProp("deps.yacl_version") { prop ->
         modImplementation("dev.isxander:yet-another-config-lib:$prop")
     }

gradle.properties

@@ -26,7 +26,6 @@ publish.curseforge=1311114
 # Dependencies
 deps.fabric_loader_version=0.19.0
 deps.devauth_version=1.2.2
-deps.lombok_version=1.18.42
 deps.mixinconstraints_version=1.1.0
 deps.mixinsquared_version=0.2.0
 
@@ -40,4 +39,5 @@ mod.mc_version=[VERSIONED]
 # Versioned
 deps.parchment_version=[VERSIONED]
 deps.fabric_api_version=[VERSIONED]
+deps.language_kotlin_version=[VERSIONED]
 deps.neoforge_version=[VERSIONED]

src/main/java/btw/lowercase/renderer/Renderer.java

@@ -40,7 +40,6 @@
 import com.mojang.blaze3d.textures.GpuSampler;
 import com.mojang.blaze3d.textures.GpuTextureView;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.render.TextureSetup;
 import net.minecraft.client.renderer.ProjectionMatrixBuffer;
@@ -59,13 +58,9 @@ public final class Renderer implements AutoCloseable {
     private final Map<String, TextureAndSampler> textures = new Object2ObjectOpenHashMap<>();
     private final Map<String, GpuBufferSlice> uniforms = new Object2ObjectOpenHashMap<>();
 
-    @Getter
     private final Supplier<String> name;
-    @Getter
     private final RenderDescriptor descriptor;
-    @Getter
     private RenderPipeline pipeline = null;
-    @Getter
     private @Nullable Matrix4f projectionMatrix;
 
     // Internal

src/main/java/org/visuals/legacy/animatium/Animatium.java

@@ -28,6 +28,8 @@
 import dev.kikugie.fletching_table.annotation.fabric.Entrypoint;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
+import net.fabricmc.fabric.api.client.model.loading.v1.SimpleUnbakedExtraModel;
 import net.fabricmc.fabric.api.client.networking.v1.*;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
@@ -53,7 +55,7 @@ public void onInitializeClient() {
             ResourceLoader.registerBuiltinPack(Animatium.location(pack), modContainer, PackActivationType.NORMAL);
         }
 
-        // TODO 26.2: ModelLoadingPlugin.register(context -> context.addModel(AnimatiumConstants.FAST_GRASS_MODEL_KEY, SimpleUnbakedExtraModel.blockStateModel(AnimatiumConstants.FAST_GRASS_MODEL_LOCATION)));
+        ModelLoadingPlugin.register(context -> context.addModel(AnimatiumConstants.FAST_GRASS_MODEL_KEY, SimpleUnbakedExtraModel.blockStateModel(AnimatiumConstants.FAST_GRASS_MODEL_LOCATION)));
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, context) -> dispatcher.register(AnimatiumCommand.create()));
         AnimatiumKeybinds.register();
         this.registerPayloads();

src/main/java/org/visuals/legacy/animatium/AnimatiumFabricClient.java

@@ -33,7 +33,6 @@
 import dev.isxander.yacl3.api.controller.EnumControllerBuilder;
 import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
 import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder;
-import lombok.Getter;
 import net.minecraft.network.chat.Component;
 import org.visuals.legacy.animatium.AnimatiumConstants;
 import org.visuals.legacy.animatium.util.config.EntryBundle;
@@ -43,7 +42,6 @@
 import java.util.function.Function;
 
 public abstract class Category {
-    @Getter
     public enum OptionType {
         BOOLEAN(false),
         FLOAT(true),
@@ -91,7 +89,7 @@ public OptionBuilder<T> type(final OptionType type) {
         }
 
         public <S> OptionBuilder<T> slider(final S min, final S max, final S step) {
-            if (this.type == null || !this.type.isSliderCapable()) {
+            if (this.type == null || !this.type.sliderCapable) {
                 throw new RuntimeException("Option doesn't allow slider.");
             } else {
                 this.slider = true;

src/main/java/org/visuals/legacy/animatium/config/category/Category.java

@@ -63,6 +63,7 @@ public final class ExtrasConfigCategory extends Category {
     public boolean damageTintItems = false;
     public boolean damageTintCape = false;
     // Item Swing
+    public boolean customSwingSpeed = false;
     public float itemSwingSpeed = 0.0F;
     public float hasteSwingSpeed = 0.0F;
     public float miningFatigueSwingSpeed = 0.0F;
@@ -123,9 +124,10 @@ public EntryBundle bundle() {
                 .booleanEntry("damageTintCape"));
 
         bundle.group((EntryBundle.Group) new EntryBundle.Group("item_swing")
-                .floatEntry("itemSwingSpeed", -1.0F, 1.0F, 0.1F)
-                .floatEntry("hasteSwingSpeed", -1.0F, 1.0F, 0.1F)
-                .floatEntry("miningFatigueSwingSpeed", -1.0F, 1.0F, 0.1F)
+                .booleanEntry("customSwingSpeed")
+                .floatEntry("itemSwingSpeed", -2.0F, 1.0F, 0.1F)
+                .floatEntry("hasteSwingSpeed", -2.0F, 1.0F, 0.1F)
+                .floatEntry("miningFatigueSwingSpeed", -2.0F, 1.0F, 0.1F)
                 .booleanEntry("ignoreHasteSpeed")
                 .booleanEntry("ignoreMiningFatigueSpeed"));
 

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

@@ -47,7 +47,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.visuals.legacy.animatium.Animatium;
 import org.visuals.legacy.animatium.config.AnimatiumConfig;
-import org.visuals.legacy.animatium.util.Utils;
+import org.visuals.legacy.animatium.util.EntityUtilKt;
 import org.visuals.legacy.animatium.util.enums.SneakAnimationSetting;
 
 import java.util.function.Function;
@@ -113,7 +113,7 @@ protected MixinHumanoidModel(final ModelPart modelPart, final Function<Identifie
     @ModifyExpressionValue(method = "setupAttackAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;sin(D)F", ordinal = 5))
     public float animatium$fixMirrorArmSwing$sin(final float original, @Local(argsOnly = true, name = "state") final T state) {
         if (Animatium.isEnabled() && AnimatiumConfig.instance().fixes.fixMirrorArmSwing) {
-            return original * Utils.getArmMultiplier(state.attackArm);
+            return original * EntityUtilKt.getArmMultiplier(state.attackArm);
         } else {
             return original;
         }