Finish Version presets and Add backwards-compat to SetFeaturesPayloadPacket

lowercasebtw · lowercasebtw · commit 97c0833235c8 · 2025-11-23T05:10:31.000-05:00
diff --git a/TODO.md b/TODO.md
@@ -1,2 +1 @@
-- Particle blending!!!
 - Potion model offset? // TODO: mixces what was this again rahhh
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -94,6 +94,7 @@ loom.runs {
             property("mixin.hotSwap", "true")
             property("mixin.debug.export", "true") // Puts mixin outputs in /run/.mixin.out
             property("devauth.enabled", "true")
+            property("devauth.account", "main")
         }
     }
 }
diff --git a/src/main/java/org/visuals/legacy/animatium/command/AnimatiumCommand.java b/src/main/java/org/visuals/legacy/animatium/command/AnimatiumCommand.java
@@ -37,6 +37,7 @@
 import org.visuals.legacy.animatium.Animatium;
 import org.visuals.legacy.animatium.config.AnimatiumConfig;
 import org.visuals.legacy.animatium.mixins.accessor.GameRendererAccessor;
+import org.visuals.legacy.animatium.screens.OnboardingScreen;
 import org.visuals.legacy.animatium.util.config.ConfigUtil;
 
 import java.util.Random;
@@ -75,13 +76,20 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> create() {
             return Command.SINGLE_SUCCESS;
         }));
 
+        command.then(LiteralArgumentBuilder.<FabricClientCommandSource>literal("onboarding").executes((context) -> {
+            ConfigUtil.put("onboarding", true);
+            final Minecraft minecraft = context.getSource().getClient();
+            minecraft.schedule(() -> minecraft.setScreen(new OnboardingScreen(minecraft.screen)));
+            return Command.SINGLE_SUCCESS;
+        }));
+
         return command;
     }
 
     @Override
     public int run(CommandContext<FabricClientCommandSource> context) {
         context.getSource().sendFeedback(Component.literal("Opening config menu...").withColor(new Random().nextInt(0xFFFFFF)));
-        Minecraft minecraft = Minecraft.getInstance();
+        final Minecraft minecraft = context.getSource().getClient();
         minecraft.schedule(() -> minecraft.setScreen(AnimatiumConfig.getConfigScreen(null)));
         return Command.SINGLE_SUCCESS;
     }
diff --git a/src/main/java/org/visuals/legacy/animatium/config/AnimatiumConfig.java b/src/main/java/org/visuals/legacy/animatium/config/AnimatiumConfig.java
@@ -59,6 +59,10 @@ public static void load() {
         CONFIG.load();
     }
 
+    public static void save() {
+        CONFIG.save();
+    }
+
     public static AnimatiumConfig instance() {
         return CONFIG.instance();
     }
diff --git a/src/main/java/org/visuals/legacy/animatium/config/category/ExtrasConfigCategory.java b/src/main/java/org/visuals/legacy/animatium/config/category/ExtrasConfigCategory.java
@@ -56,8 +56,8 @@ public class ExtrasConfigCategory {
     public boolean dontClearChat = false;
     public boolean dontCloseChat = false;
 
-    public static ConfigCategory setup(ExtrasConfigCategory defaults, ExtrasConfigCategory config) {
-        ConfigCategory.Builder category = ConfigCategory.createBuilder();
+    public static ConfigCategory setup(final ExtrasConfigCategory defaults, final ExtrasConfigCategory config) {
+        final ConfigCategory.Builder category = ConfigCategory.createBuilder();
         category.name(Component.translatable("animatium.category.extras"));
         category.option(Option.<Boolean>createBuilder()
                 .name(Component.translatable("animatium.minimalViewBobbing"))
diff --git a/src/main/java/org/visuals/legacy/animatium/config/category/FixesConfigCategory.java b/src/main/java/org/visuals/legacy/animatium/config/category/FixesConfigCategory.java
@@ -45,9 +45,11 @@ public class FixesConfigCategory {
     public boolean fixHighAttackSpeedIndicator = true;
     public boolean fixVerticalBobbingTilt = true;
     public boolean upMinPixelTransparencyLimit = true;
+    public boolean fixEquipAnimationOnItemUse = true;
+    public boolean fixItemUsageVisualInGUI = true;
 
-    public static ConfigCategory setup(FixesConfigCategory defaults, FixesConfigCategory config) {
-        ConfigCategory.Builder category = ConfigCategory.createBuilder();
+    public static ConfigCategory setup(final FixesConfigCategory defaults, final FixesConfigCategory config) {
+        final ConfigCategory.Builder category = ConfigCategory.createBuilder();
         category.name(Component.translatable("animatium.category.fixes"));
         category.option(Option.<Boolean>createBuilder()
                 .name(Component.translatable("animatium.fixSneakingFeetPosition"))
@@ -153,6 +155,24 @@ public static ConfigCategory setup(FixesConfigCategory defaults, FixesConfigCate
                         })
                 .controller(TickBoxControllerBuilder::create)
                 .build());
+        category.option(Option.<Boolean>createBuilder()
+                .name(Component.translatable("animatium.fixEquipAnimationOnItemUse"))
+                .description(OptionDescription.of(Component.translatable("animatium.fixEquipAnimationOnItemUse.description")))
+                .binding(
+                        defaults.fixEquipAnimationOnItemUse,
+                        () -> config.fixEquipAnimationOnItemUse,
+                        (newVal) -> config.fixEquipAnimationOnItemUse = newVal)
+                .controller(TickBoxControllerBuilder::create)
+                .build());
+        category.option(Option.<Boolean>createBuilder()
+                .name(Component.translatable("animatium.fixItemUsageVisualInGUI"))
+                .description(OptionDescription.of(Component.translatable("animatium.fixItemUsageVisualInGUI.description")))
+                .binding(
+                        defaults.fixItemUsageVisualInGUI,
+                        () -> config.fixItemUsageVisualInGUI,
+                        (newVal) -> config.fixItemUsageVisualInGUI = newVal)
+                .controller(TickBoxControllerBuilder::create)
+                .build());
         return category.build();
     }
 }
diff --git a/src/main/java/org/visuals/legacy/animatium/config/category/ItemsConfigCategory.java b/src/main/java/org/visuals/legacy/animatium/config/category/ItemsConfigCategory.java
@@ -44,11 +44,8 @@ public class ItemsConfigCategory {
     public boolean fishingRodLineThickness = true;
     public boolean thinFishingRodLineThickness = false;
     public boolean stickModelWhenCastInThirdperson = true;
-    // (Items) Fixes
-    public boolean equipAnimationOnItemUse = false;
-    public boolean itemUsageVisualInGUI = false;
     // (Items) Enchantment Glint
-    public boolean glintSpeed = true;
+    public boolean legacyGlintSpeed = true;
     public boolean glintOnItemDrops2D = true;
     public boolean glintOnItemFramed2D = true;
     // (Items) 2D Drops
@@ -74,13 +71,13 @@ public class ItemsConfigCategory {
     public boolean heldItemVisibilityInBoat = true;
     public boolean itemPickupPosition = true;
 
-    public static ConfigCategory setup(ItemsConfigCategory defaults, ItemsConfigCategory config) {
-        ConfigCategory.Builder category = ConfigCategory.createBuilder();
+    public static ConfigCategory setup(final ItemsConfigCategory defaults, final ItemsConfigCategory config) {
+        final ConfigCategory.Builder category = ConfigCategory.createBuilder();
         category.name(Component.translatable("animatium.category.items"));
 
         // Fishing Rod
         {
-            OptionGroup.Builder fishingRodGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder fishingRodGroup = OptionGroup.createBuilder();
             fishingRodGroup.name(Component.translatable("animatium.category.items.group.fishing_rod"));
             fishingRodGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.fishingRodTextureStackCheck"))
@@ -149,42 +146,17 @@ public static ConfigCategory setup(ItemsConfigCategory defaults, ItemsConfigCate
             category.group(fishingRodGroup.build());
         }
 
-        // Fixes
-        {
-            OptionGroup.Builder itemFixesGroup = OptionGroup.createBuilder();
-            itemFixesGroup.name(Component.translatable("animatium.category.items.group.item_fixes"));
-            itemFixesGroup.option(Option.<Boolean>createBuilder()
-                    .name(Component.translatable("animatium.equipAnimationOnItemUse"))
-                    .description(OptionDescription.of(Component.translatable("animatium.equipAnimationOnItemUse.description")))
-                    .binding(
-                            defaults.equipAnimationOnItemUse,
-                            () -> config.equipAnimationOnItemUse,
-                            (newVal) -> config.equipAnimationOnItemUse = newVal)
-                    .controller(TickBoxControllerBuilder::create)
-                    .build());
-            itemFixesGroup.option(Option.<Boolean>createBuilder()
-                    .name(Component.translatable("animatium.itemUsageVisualInGUI"))
-                    .description(OptionDescription.of(Component.translatable("animatium.itemUsageVisualInGUI.description")))
-                    .binding(
-                            defaults.itemUsageVisualInGUI,
-                            () -> config.itemUsageVisualInGUI,
-                            (newVal) -> config.itemUsageVisualInGUI = newVal)
-                    .controller(TickBoxControllerBuilder::create)
-                    .build());
-            category.group(itemFixesGroup.build());
-        }
-
         // Glint
         {
-            OptionGroup.Builder glintGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder glintGroup = OptionGroup.createBuilder();
             glintGroup.name(Component.translatable("animatium.category.items.group.glint"));
             glintGroup.option(Option.<Boolean>createBuilder()
-                    .name(Component.translatable("animatium.glintSpeed"))
-                    .description(OptionDescription.of(Component.translatable("animatium.glintSpeed.description")))
+                    .name(Component.translatable("animatium.legacyGlintSpeed"))
+                    .description(OptionDescription.of(Component.translatable("animatium.legacyGlintSpeed.description")))
                     .binding(
-                            defaults.glintSpeed,
-                            () -> config.glintSpeed,
-                            (newVal) -> config.glintSpeed = newVal)
+                            defaults.legacyGlintSpeed,
+                            () -> config.legacyGlintSpeed,
+                            (newVal) -> config.legacyGlintSpeed = newVal)
                     .controller(TickBoxControllerBuilder::create)
                     .build());
             glintGroup.option(Option.<Boolean>createBuilder()
@@ -210,7 +182,7 @@ public static ConfigCategory setup(ItemsConfigCategory defaults, ItemsConfigCate
 
         // 2D Drops
         {
-            OptionGroup.Builder drops2dGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder drops2dGroup = OptionGroup.createBuilder();
             drops2dGroup.name(Component.translatable("animatium.category.items.group.2d_drops"));
             drops2dGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.itemDropsFaceCamera"))
@@ -262,7 +234,7 @@ public static ConfigCategory setup(ItemsConfigCategory defaults, ItemsConfigCate
 
         // 2d Drops
         {
-            OptionGroup.Builder transformationsGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder transformationsGroup = OptionGroup.createBuilder();
             transformationsGroup.name(Component.translatable("animatium.category.items.group.transformations"));
             transformationsGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.itemPositions"))
@@ -317,7 +289,7 @@ public static ConfigCategory setup(ItemsConfigCategory defaults, ItemsConfigCate
 
         // Other
         {
-            OptionGroup.Builder otherGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder otherGroup = OptionGroup.createBuilder();
             otherGroup.name(Component.translatable("animatium.category.items.group.other"));
             otherGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.itemUsageSwinging"))
diff --git a/src/main/java/org/visuals/legacy/animatium/config/category/MovementConfigCategory.java b/src/main/java/org/visuals/legacy/animatium/config/category/MovementConfigCategory.java
@@ -57,13 +57,13 @@ public class MovementConfigCategory {
     public boolean legacyDamageTilt = true;
     public boolean offsetHurtTime = true;
 
-    public static ConfigCategory setup(MovementConfigCategory defaults, MovementConfigCategory config) {
-        ConfigCategory.Builder category = ConfigCategory.createBuilder();
+    public static ConfigCategory setup(final MovementConfigCategory defaults, final MovementConfigCategory config) {
+        final ConfigCategory.Builder category = ConfigCategory.createBuilder();
         category.name(Component.translatable("animatium.category.movement"));
 
         // Sneaking
         {
-            OptionGroup.Builder sneakingGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder sneakingGroup = OptionGroup.createBuilder();
             sneakingGroup.name(Component.translatable("animatium.category.movement.group.sneaking"));
             sneakingGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.smoothSneaking"))
@@ -123,7 +123,7 @@ public static ConfigCategory setup(MovementConfigCategory defaults, MovementConf
         }
 
         {
-            OptionGroup.Builder capeGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder capeGroup = OptionGroup.createBuilder();
             capeGroup.name(Component.translatable("animatium.category.movement.group.cape"));
             capeGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.capeMovement"))
@@ -175,7 +175,7 @@ public static ConfigCategory setup(MovementConfigCategory defaults, MovementConf
 
         // Other
         {
-            OptionGroup.Builder otherGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder otherGroup = OptionGroup.createBuilder();
             otherGroup.name(Component.translatable("animatium.category.movement.group.other"));
             otherGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.rotateBackwardsWalking"))
diff --git a/src/main/java/org/visuals/legacy/animatium/config/category/OtherConfigCategory.java b/src/main/java/org/visuals/legacy/animatium/config/category/OtherConfigCategory.java
@@ -58,13 +58,13 @@ public class OtherConfigCategory {
     public boolean planarSkyFog = true;
     public boolean cloudHeight = true;
 
-    public static ConfigCategory setup(OtherConfigCategory defaults, OtherConfigCategory config) {
-        ConfigCategory.Builder category = ConfigCategory.createBuilder();
+    public static ConfigCategory setup(final OtherConfigCategory defaults, final OtherConfigCategory config) {
+        final ConfigCategory.Builder category = ConfigCategory.createBuilder();
         category.name(Component.translatable("animatium.category.other"));
 
         // Sky
         {
-            OptionGroup.Builder skyGroup = OptionGroup.createBuilder();
+            final OptionGroup.Builder skyGroup = OptionGroup.createBuilder();
             skyGroup.name(Component.translatable("animatium.category.other.group.sky"));
             skyGroup.option(Option.<Boolean>createBuilder()
                     .name(Component.translatable("animatium.blueVoidSky"))
diff --git a/src/main/java/org/visuals/legacy/animatium/config/category/ScreenConfigCategory.java b/src/main/java/org/visuals/legacy/animatium/config/category/ScreenConfigCategory.java
@@ -52,8 +52,8 @@ public class ScreenConfigCategory {
     public boolean panoramaRendering = true;
     public CameraVersion cameraVersion = CameraVersion.V1_8;
 
-    public static ConfigCategory setup(ScreenConfigCategory defaults, ScreenConfigCategory config) {
-        ConfigCategory.Builder category = ConfigCategory.createBuilder();
+    public static ConfigCategory setup(final ScreenConfigCategory defaults, final ScreenConfigCategory config) {
+        final ConfigCategory.Builder category = ConfigCategory.createBuilder();
         category.name(Component.translatable("animatium.category.screen"));
         category.option(Option.<Boolean>createBuilder()
                 .name(Component.translatable("animatium.crosshairInThirdPerson"))
diff --git a/src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/glint/MixinRenderStateShard.java b/src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/glint/MixinRenderStateShard.java
@@ -47,7 +47,7 @@ public abstract class MixinRenderStateShard {
 
     @ModifyExpressionValue(method = "setupGlintTexturing", at = @At(value = "CONSTANT", args = "doubleValue=8.0"))
     private static double animatium$glintSpeed(double original, @Local(argsOnly = true) float f) {
-        if (Animatium.ENABLED && AnimatiumConfig.instance().items.glintSpeed && f == 8.0F) {
+        if (Animatium.ENABLED && AnimatiumConfig.instance().items.legacyGlintSpeed && f == 8.0F) {
             // Value taken from 1.8
             return 1.0D;
         } else {
@@ -57,7 +57,7 @@ public abstract class MixinRenderStateShard {
 
     @ModifyExpressionValue(method = "setupGlintTexturing", at = @At(value = "CONSTANT", args = "floatValue=110000.0"))
     private static float animatium$glintSpeed$horizontal(float original, @Local(argsOnly = true) float f) {
-        if (Animatium.ENABLED && AnimatiumConfig.instance().items.glintSpeed && f == 8.0F) {
+        if (Animatium.ENABLED && AnimatiumConfig.instance().items.legacyGlintSpeed && f == 8.0F) {
             // Value taken from 1.7/1.8
             return 4873.0F;
         } else {
@@ -67,7 +67,7 @@ public abstract class MixinRenderStateShard {
 
     @ModifyExpressionValue(method = "setupGlintTexturing", at = @At(value = "CONSTANT", args = "floatValue=30000.0"))
     private static float animatium$glintSpeed$diagonal(float original, @Local(argsOnly = true) float f) {
-        if (Animatium.ENABLED && AnimatiumConfig.instance().items.glintSpeed && f == 8.0F) {
+        if (Animatium.ENABLED && AnimatiumConfig.instance().items.legacyGlintSpeed && f == 8.0F) {
             // Value taken from 1.7/1.8
             return 3000.0F;
         } else {
diff --git a/src/main/java/org/visuals/legacy/animatium/mixins/v1/general/items/MixinItemInHandRenderer.java b/src/main/java/org/visuals/legacy/animatium/mixins/v1/general/items/MixinItemInHandRenderer.java
@@ -86,7 +86,7 @@ public abstract class MixinItemInHandRenderer {
 
     @WrapOperation(method = "renderArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isUsingItem()Z", ordinal = 1))
     private boolean animatium$itemUsageVisualInGUI(AbstractClientPlayer instance, Operation<Boolean> original) {
-        if (!AnimatiumConfig.instance().items.itemUsageVisualInGUI && this.minecraft.screen != null) {
+        if (AnimatiumConfig.instance().fixes.fixItemUsageVisualInGUI && this.minecraft.screen != null) {
             return false;
         } else {
             return original.call(instance);
diff --git a/src/main/java/org/visuals/legacy/animatium/mixins/v1/general/items/usage/MixinMinecraft.java b/src/main/java/org/visuals/legacy/animatium/mixins/v1/general/items/usage/MixinMinecraft.java
@@ -122,7 +122,7 @@ public abstract class MixinMinecraft {
     @WrapWithCondition(method = "startUseItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;itemUsed(Lnet/minecraft/world/InteractionHand;)V"))
     private boolean animatium$equipAnimationOnItemUse(ItemInHandRenderer instance, InteractionHand interactionHand) {
         // TODO: This fixes projectile equip, but it isn't going to be 100% accurate in some other areas. This needs to be worked on :)
-        if (Animatium.ENABLED && !AnimatiumConfig.instance().items.equipAnimationOnItemUse) {
+        if (Animatium.ENABLED && AnimatiumConfig.instance().fixes.fixEquipAnimationOnItemUse) {
             // The equip animation plays when right-clicking blocks in creative mode in <1.8.x
             final boolean isAimedAtBlock = this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK;
             // This might need to be revamped a bit. We are already checking for creative mode in the actual method,
diff --git a/src/main/java/org/visuals/legacy/animatium/packet/SetServerFeaturesPayloadPacket.java b/src/main/java/org/visuals/legacy/animatium/packet/SetServerFeaturesPayloadPacket.java
diff --git a/src/main/java/org/visuals/legacy/animatium/screens/OnboardingScreen.java b/src/main/java/org/visuals/legacy/animatium/screens/OnboardingScreen.java
diff --git a/src/main/java/org/visuals/legacy/animatium/util/AnimatiumDebugEntry.java b/src/main/java/org/visuals/legacy/animatium/util/AnimatiumDebugEntry.java
diff --git a/src/main/java/org/visuals/legacy/animatium/util/config/Version.java b/src/main/java/org/visuals/legacy/animatium/util/config/Version.java
diff --git a/src/main/java/org/visuals/legacy/animatium/util/enums/ServerFeature.java b/src/main/java/org/visuals/legacy/animatium/util/enums/ServerFeature.java
diff --git a/src/main/resources/assets/animatium/lang/en_us.json b/src/main/resources/assets/animatium/lang/en_us.json

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-- Particle blending!!!`
`2`	`1`	`- Potion model offset? // TODO: mixces what was this again rahhh`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ loom.runs {`
`94`	`94`	`property("mixin.hotSwap", "true")`
`95`	`95`	`property("mixin.debug.export", "true") // Puts mixin outputs in /run/.mixin.out`
`96`	`96`	`property("devauth.enabled", "true")`
	`97`	`+ property("devauth.account", "main")`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,10 @@ public static void load() {`
`59`	`59`	`CONFIG.load();`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ public static void save() {`
	`63`	`+ CONFIG.save();`
	`64`	`+ }`
	`65`	`+`
`62`	`66`	`public static AnimatiumConfig instance() {`
`63`	`67`	`return CONFIG.instance();`
`64`	`68`	`}`