Skip to content

Commit 6926ec8

Browse files
lowercasebtwlowercasebtw
committed
Continue working on presets for onboarding
1 parent 9e0f8d3 commit 6926ec8

File tree

16 files changed

+391
-141
lines changed

16 files changed

+391
-141
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class ItemsConfigCategory {
7070
public boolean swingOnEntityInteract = false;
7171
public boolean itemUsingTextureInGui = true;
7272
public boolean durabilityBarColors = true;
73-
public boolean itemRarities = true;
73+
public boolean legacyItemRarities = true;
7474
public boolean heldItemVisibilityInBoat = true;
7575
public boolean itemPickupPosition = true;
7676

@@ -374,12 +374,12 @@ public static ConfigCategory setup(ItemsConfigCategory defaults, ItemsConfigCate
374374
.controller(TickBoxControllerBuilder::create)
375375
.build());
376376
otherGroup.option(Option.<Boolean>createBuilder()
377-
.name(Component.translatable("animatium.itemRarities"))
378-
.description(OptionDescription.of(Component.translatable("animatium.itemRarities.description")))
377+
.name(Component.translatable("animatium.legacyItemRarities"))
378+
.description(OptionDescription.of(Component.translatable("animatium.legacyItemRarities.description")))
379379
.binding(
380-
defaults.itemRarities,
381-
() -> config.itemRarities,
382-
(newVal) -> config.itemRarities = newVal)
380+
defaults.legacyItemRarities,
381+
() -> config.legacyItemRarities,
382+
(newVal) -> config.legacyItemRarities = newVal)
383383
.controller(TickBoxControllerBuilder::create)
384384
.build());
385385
otherGroup.option(Option.<Boolean>createBuilder()

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public class MovementConfigCategory {
4343
public boolean sneakAnimationWhileFlying = true;
4444
// (Movement) Cape
4545
public boolean capeMovement = true;
46-
public boolean clampCapeLean = false;
46+
public boolean disableCapeLean = false;
4747
public boolean capeSwingRotation = true;
4848
public boolean capeChestplateTranslation = true;
4949
public boolean capeSneakPosition = true;
5050
// (Movement) Other
5151
public boolean rotateBackwardsWalking = true;
5252
public boolean uncapBlockingHeadRotation = true;
5353
public boolean disableHeadRotationInterpolation = true;
54-
public boolean viewBobbing = true;
54+
public boolean handViewBobbingMovement = true;
5555
public boolean deathLimbs = true;
5656
public boolean bowArmMovement = true;
5757
public boolean legacyDamageTilt = true;
@@ -135,12 +135,12 @@ public static ConfigCategory setup(MovementConfigCategory defaults, MovementConf
135135
.controller(TickBoxControllerBuilder::create)
136136
.build());
137137
capeGroup.option(Option.<Boolean>createBuilder()
138-
.name(Component.translatable("animatium.clampCapeLean"))
139-
.description(OptionDescription.of(Component.translatable("animatium.clampCapeLean.description")))
138+
.name(Component.translatable("animatium.disableCapeLean"))
139+
.description(OptionDescription.of(Component.translatable("animatium.disableCapeLean.description")))
140140
.binding(
141-
defaults.clampCapeLean,
142-
() -> config.clampCapeLean,
143-
(newVal) -> config.clampCapeLean = newVal)
141+
defaults.disableCapeLean,
142+
() -> config.disableCapeLean,
143+
(newVal) -> config.disableCapeLean = newVal)
144144
.controller(TickBoxControllerBuilder::create)
145145
.build());
146146
capeGroup.option(Option.<Boolean>createBuilder()
@@ -205,12 +205,12 @@ public static ConfigCategory setup(MovementConfigCategory defaults, MovementConf
205205
.controller(TickBoxControllerBuilder::create)
206206
.build());
207207
otherGroup.option(Option.<Boolean>createBuilder()
208-
.name(Component.translatable("animatium.viewBobbing"))
209-
.description(OptionDescription.of(Component.translatable("animatium.viewBobbing.description")))
208+
.name(Component.translatable("animatium.handViewBobbingMovement"))
209+
.description(OptionDescription.of(Component.translatable("animatium.handViewBobbingMovement.description")))
210210
.binding(
211-
defaults.viewBobbing,
212-
() -> config.viewBobbing,
213-
(newVal) -> config.viewBobbing = newVal)
211+
defaults.handViewBobbingMovement,
212+
() -> config.handViewBobbingMovement,
213+
(newVal) -> config.handViewBobbingMovement = newVal)
214214
.controller(TickBoxControllerBuilder::create)
215215
.build());
216216
otherGroup.option(Option.<Boolean>createBuilder()

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public class OtherConfigCategory {
3737
public boolean lockBlockingArmRotation = true;
3838
public boolean projectileAgeCheck = false;
3939
public boolean blockMiningProgress = true;
40-
public boolean inventoryEntityScissor = false;
40+
public boolean disableInventoryEntityScissor = false;
4141
public boolean blockOutlineRendering = true;
4242
public boolean modelWhilstSleeping = false;
4343
public boolean entityArmorHurtTint = true;
4444
public boolean itemGlintOnEntity = true;
4545
public boolean maxGlintProperties = true;
4646
public boolean armorHurtRendering = false;
4747
public boolean highAttackSpeedVisual = false;
48-
public boolean entityGlowOutline = true;
48+
public boolean disableEntityGlowOutline = false;
4949
public boolean modernCombatSounds = true;
5050
public boolean modernCombatParticles = true; // TODO/NOTE: Fix, it's broken on servers
5151
public boolean restoreParticleBlending = true;
@@ -145,9 +145,9 @@ public static ConfigCategory setup(OtherConfigCategory defaults, OtherConfigCate
145145
.name(Component.translatable("animatium.inventoryEntityScissor"))
146146
.description(OptionDescription.of(Component.translatable("animatium.inventoryEntityScissor.description")))
147147
.binding(
148-
defaults.inventoryEntityScissor,
149-
() -> config.inventoryEntityScissor,
150-
(newVal) -> config.inventoryEntityScissor = newVal)
148+
defaults.disableInventoryEntityScissor,
149+
() -> config.disableInventoryEntityScissor,
150+
(newVal) -> config.disableInventoryEntityScissor = newVal)
151151
.controller(TickBoxControllerBuilder::create)
152152
.build());
153153
category.option(Option.<Boolean>createBuilder()
@@ -217,9 +217,9 @@ public static ConfigCategory setup(OtherConfigCategory defaults, OtherConfigCate
217217
.name(Component.translatable("animatium.entityGlowOutline"))
218218
.description(OptionDescription.of(Component.translatable("animatium.entityGlowOutline.description")))
219219
.binding(
220-
defaults.entityGlowOutline,
221-
() -> config.entityGlowOutline,
222-
(newVal) -> config.entityGlowOutline = newVal)
220+
defaults.disableEntityGlowOutline,
221+
() -> config.disableEntityGlowOutline,
222+
(newVal) -> config.disableEntityGlowOutline = newVal)
223223
.controller(TickBoxControllerBuilder::create)
224224
.build());
225225
category.option(Option.<Boolean>createBuilder()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ScreenConfigCategory {
3939
public boolean heartFlash = true;
4040
public boolean centerScrollableListWidgets = true;
4141
public boolean listWidgetSelectedBorderColor = true;
42-
public boolean buttonTextColors = true;
42+
public boolean legacyButtonHoverTextColor = true;
4343
public boolean disableDebugHudBackground = true;
4444
public boolean debugHudTextShadow = true;
4545
public boolean cameraTransparentPassthrough = true;
@@ -92,12 +92,12 @@ public static ConfigCategory setup(ScreenConfigCategory defaults, ScreenConfigCa
9292
.controller(TickBoxControllerBuilder::create)
9393
.build());
9494
category.option(Option.<Boolean>createBuilder()
95-
.name(Component.translatable("animatium.buttonTextColors"))
96-
.description(OptionDescription.of(Component.translatable("animatium.buttonTextColors.description")))
95+
.name(Component.translatable("animatium.legacyButtonHoverTextColor"))
96+
.description(OptionDescription.of(Component.translatable("animatium.legacyButtonHoverTextColor.description")))
9797
.binding(
98-
defaults.buttonTextColors,
99-
() -> config.buttonTextColors,
100-
(newVal) -> config.buttonTextColors = newVal)
98+
defaults.legacyButtonHoverTextColor,
99+
() -> config.legacyButtonHoverTextColor,
100+
(newVal) -> config.legacyButtonHoverTextColor = newVal)
101101
.controller(TickBoxControllerBuilder::create)
102102
.build());
103103
category.option(Option.<Boolean>createBuilder()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public MixinAvatarRenderer(EntityRendererProvider.Context context, boolean slim)
7575

7676
@ModifyArg(method = "extractCapeState", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;clamp(FFF)F", ordinal = 1), index = 2)
7777
private static float animatium$uncapRotation(float original) {
78-
if (Animatium.ENABLED && !AnimatiumConfig.instance().movement.clampCapeLean) {
78+
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.disableCapeLean) {
7979
return Float.MAX_VALUE;
8080
} else {
8181
return original;

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/general/camera/view_bobbing/MixinEntity_HorizontalViewBobbing.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ public abstract class MixinEntity_HorizontalViewBobbing implements ViewBobbingSt
4848

4949
@Inject(method = "baseTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;handlePortal()V", shift = At.Shift.AFTER))
5050
private void animatium$storePreviousHorizontalSpeed(CallbackInfo ci) {
51-
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.viewBobbing) {
51+
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.handViewBobbingMovement) {
5252
this.animatium$previousHorizontalSpeed = this.animatium$horizontalSpeed;
5353
}
5454
}
5555

5656
@Inject(method = "applyMovementEmissionAndPlaySound", at = @At("HEAD"))
5757
private void animatium$storeHorizontalSpeed(Entity.MovementEmission movementEmission, Vec3 vec3d, BlockPos blockPos, BlockState blockState, CallbackInfo ci) {
58-
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.viewBobbing) {
58+
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.handViewBobbingMovement) {
5959
this.animatium$horizontalSpeed = this.animatium$horizontalSpeed + (float) vec3d.horizontalDistance() * 0.6F;
6060
}
6161
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/general/camera/view_bobbing/MixinGameRenderer_ModifyViewBobbing.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public abstract class MixinGameRenderer_ModifyViewBobbing {
8989

9090
@WrapOperation(method = "bobView", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/ClientAvatarState;getBackwardsInterpolatedWalkDistance(F)F"))
9191
private float animatium$viewBobbing$changeDistance(ClientAvatarState instance, float partialTicks, Operation<Float> original) {
92-
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.viewBobbing && this.minecraft.getCameraEntity() instanceof AbstractClientPlayer abstractClientPlayer) {
92+
if (Animatium.ENABLED && AnimatiumConfig.instance().movement.handViewBobbingMovement && this.minecraft.getCameraEntity() instanceof AbstractClientPlayer abstractClientPlayer) {
9393
final float walkDist = ((ViewBobbingStorage) abstractClientPlayer).animatium$getHorizontalSpeed();
9494
final float walkDistO = ((ViewBobbingStorage) abstractClientPlayer).animatium$getPreviousHorizontalSpeed();
9595
return -(walkDist + (walkDist - walkDistO) * partialTicks);

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/general/items/MixinItemStack.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
public abstract class MixinItemStack {
4040
@WrapOperation(method = "getStyledHoverName", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;getRarity()Lnet/minecraft/world/item/Rarity;"))
4141
private Rarity animatium$itemRarities$getFormattedName(ItemStack instance, Operation<Rarity> original) {
42-
if (Animatium.ENABLED && AnimatiumConfig.instance().items.itemRarities) {
42+
if (Animatium.ENABLED && AnimatiumConfig.instance().items.legacyItemRarities) {
4343
return ItemUtils.getLegacyItemRarity((ItemStack) (Object) this);
4444
} else {
4545
return original.call(instance);
@@ -48,7 +48,7 @@ public abstract class MixinItemStack {
4848

4949
@WrapOperation(method = "getDisplayName", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;getRarity()Lnet/minecraft/world/item/Rarity;"))
5050
private Rarity animatium$itemRarities$toHoverableText(ItemStack instance, Operation<Rarity> original) {
51-
if (Animatium.ENABLED && AnimatiumConfig.instance().items.itemRarities) {
51+
if (Animatium.ENABLED && AnimatiumConfig.instance().items.legacyItemRarities) {
5252
return ItemUtils.getLegacyItemRarity((ItemStack) (Object) this);
5353
} else {
5454
return original.call(instance);

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/general/outlines/MixinLevelRenderer_EntityOutlines.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public abstract class MixinLevelRenderer_EntityOutlines {
5151
@WrapOperation(method = "doEntityOutline", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/pipeline/RenderTarget;blitAndBlendToTexture(Lcom/mojang/blaze3d/textures/GpuTextureView;)V"))
5252
private void animatium$entityGlowOutline(RenderTarget instance, GpuTextureView gpuTextureView, Operation<Void> original) {
5353
GpuTextureView textureView = gpuTextureView;
54-
if (Animatium.ENABLED && !AnimatiumConfig.instance().other.entityGlowOutline && RenderSystem.getDevice() instanceof GlDevice glDevice) {
54+
if (Animatium.ENABLED && AnimatiumConfig.instance().other.disableEntityGlowOutline && RenderSystem.getDevice() instanceof GlDevice glDevice) {
5555
if (this.animatium$blankTexture == null) {
5656
this.animatium$blankTexture = glDevice.createTexture(() -> "Blank", 15, TextureFormat.RGBA8, 1, 1, 1, 1);
5757
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/hover_text_color/MixinAbstractButton_LegacyTextHoverColor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public MixinAbstractButton_LegacyTextHoverColor(int x, int y, int width, int hei
4242

4343
@ModifyConstant(method = "renderWidget", constant = @Constant(intValue = 0xFFFFFFFF))
4444
private int animatium$renderWidget$old$textColor(int constant) {
45-
if (Animatium.ENABLED && AnimatiumConfig.instance().screen.buttonTextColors) {
45+
if (Animatium.ENABLED && AnimatiumConfig.instance().screen.legacyButtonHoverTextColor) {
4646
return !active ? 0xFFE0E0E0 : (isHoveredOrFocused() ? 0xFFFFFFA0 : 0xFFE0E0E0);
4747
} else {
4848
return constant;

0 commit comments

Comments
 (0)