Skip to content

Commit

Permalink
Port to 1.21.4
Browse files Browse the repository at this point in the history
* Removed the rubberBand feature as it was fixed in 1.21.4 (snapshot 24w45a)
* Removed rubberBand from lang-files
* Updated README. Moved rubberBand feature to the legacy section
  • Loading branch information
joakibj committed Dec 26, 2024
1 parent 46a44b9 commit 297c3f6
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 58 deletions.
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ Improve horses by removing stupid stuff and adding useful stuff.
![player sitting in a bamboo raft in a river with a horse](https://cdn.modrinth.com/data/cached_images/d2faef4b56e873ee8a20816b5276e52aa1b20bbc.png)
</details>

<details>
<summary>
Fix rubber banding on stairs/slabs "Horse moved wrongly!"
<a href="https://bugs.mojang.com/browse/MC-100830">(MC-100830)</a>
</summary>

![side by side comparison of going up a staircase with/without the mod. The without frequently goes back a couple of steps in a disorienting manner. The with doesn't have that and results in travel being faster](https://i.imgur.com/bXu7lt4.gif)
</details>

<details>
<summary> Saddled Horses don't wander</summary>

Expand Down Expand Up @@ -105,6 +96,14 @@ Improve horses by removing stupid stuff and adding useful stuff.
</details>

### Legacy features (removed due to them being added to the game officially)
<details>
<summary>
[Server Side] Fix rubber banding on stairs/slabs "Horse moved wrongly!"
<a href="https://bugs.mojang.com/browse/MC-100830">(<s>MC-100830</s>)</a> (1.16.5 - 1.21.3)
</summary>

![side by side comparison of going up a staircase with/without the mod. The without frequently goes back a couple of steps in a disorienting manner. The with doesn't have that and results in travel being faster](https://i.imgur.com/bXu7lt4.gif)
</details>
<details>
<summary>
[Server Side]
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version=1.21.3
yarn_mappings=1.21.3+build.2
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.2
loader_version=0.16.9
# Mod Properties
mod_version=2.2.0
maven_group=com.HorseBuff
archives_base_name=HorseBuff
# Dependencies
fabric_version=0.112.1+1.21.3
cloth_config_version=16.0.143
mod_menu_version=12.0.0
mixinextras_version=0.4.1
fabric_version=0.112.2+1.21.4
cloth_config_version=17.0.144
mod_menu_version=13.0.0-beta.1
mixinextras_version=0.3.5
4 changes: 0 additions & 4 deletions src/main/java/net/F53/HorseBuff/config/ModConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ public class ModConfig implements ConfigData{
@ConfigEntry.Gui.Tooltip
public boolean noWander = true;

@ConfigEntry.Category("Server")
@ConfigEntry.Gui.Tooltip
public boolean rubberBand = true;

@ConfigEntry.Category("Server")
@ConfigEntry.Gui.Tooltip
public boolean breakSpeed = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@Mixin(value = LlamaDecorFeatureRenderer.class, priority = 960)
public class LlamaDecorFeatureRendererMixin {

@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/render/entity/state/LlamaEntityRenderState;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Identifier;I)V",
@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/render/entity/state/LlamaEntityRenderState;Lnet/minecraft/item/ItemStack;Lnet/minecraft/registry/RegistryKey;I)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/LlamaEntityModel;setAngles(Lnet/minecraft/client/render/entity/state/LlamaEntityRenderState;)V",
shift = At.Shift.AFTER))
void updatePlayerPassenger(CallbackInfo callbackInfo, @Local(argsOnly = true) LlamaEntityRenderState llamaEntityRenderState, @Local LlamaEntityModel llamaEntityModel) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Mixin(value = EquipmentRenderer.class, priority = 960)
public abstract class TransparentEquipment {

@WrapOperation(method = "render(Lnet/minecraft/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;)V",
@WrapOperation(method = "render(Lnet/minecraft/client/render/entity/equipment/EquipmentModel$LayerType;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayer;getArmorCutoutNoCull(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/RenderLayer;"))
RenderLayer makeRenderLayerTranslucent(Identifier texture, Operation<RenderLayer> original, @Local(argsOnly = true) Model model, @Share("alpha") LocalIntRef alpha) {
if(model instanceof ExtendedRideableEquippableEntityModel extendedRideableEquippableEntityModel) {
Expand All @@ -31,7 +31,7 @@ RenderLayer makeRenderLayerTranslucent(Identifier texture, Operation<RenderLayer
return RenderLayer.getItemEntityTranslucentCull(texture);
}

@ModifyArg(method = "render(Lnet/minecraft/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;)V",
@ModifyArg(method = "render(Lnet/minecraft/client/render/entity/equipment/EquipmentModel$LayerType;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/Model;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;III)V"),
index = 4)
int setOpacityForRender(int color, @Local(argsOnly = true) Model model, @Share("alpha") LocalIntRef alpha) {
Expand Down
25 changes: 0 additions & 25 deletions src/main/java/net/F53/HorseBuff/mixin/Server/MovementCheck.java

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/resources/assets/horsebuff/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"text.autoconfig.HorseBuff.option.noWander": "No Horse Wandering",
"text.autoconfig.HorseBuff.option.noWander.@Tooltip": "Yes - saddled horses wont wander.\nNo - saddled horses will wander",

"text.autoconfig.HorseBuff.option.rubberBand": "Fix Rubberbanding on Stairs",
"text.autoconfig.HorseBuff.option.rubberBand.@Tooltip": "Yes - Increases server tolerance for Horse movement speed, fixing rubberbanding.\nNo - vanilla behavior",

"text.autoconfig.HorseBuff.option.breakSpeed": "Remove Riding Breakspeed Debuff",
"text.autoconfig.HorseBuff.option.breakSpeed.@Tooltip": "Yes - Allows mining at full speed while on horseback.\nNo - Dramatically slows mining speed while on horseback (vanilla behavior)",

Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/assets/horsebuff/lang/es_mx.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"text.autoconfig.HorseBuff.option.noWander": "Los Caballos no vagan",
"text.autoconfig.HorseBuff.option.noWander.@Tooltip": "Sí: los caballos con silla no vagarán. No: los caballos con silla vagarán",

"text.autoconfig.HorseBuff.option.rubberBand": "Corregir el Retroceso en las Escaleras",
"text.autoconfig.HorseBuff.option.rubberBand.@Tooltip": "Sí: aumenta la tolerancia del servidor para la velocidad de movimiento del caballo, corrigiendo el retroceso. No: comportamiento estándar",

"text.autoconfig.HorseBuff.option.breakSpeed": "Eliminar la Penalización de Velocidad al Minar",
"text.autoconfig.HorseBuff.option.breakSpeed.@Tooltip": "Sí: permite minar a velocidad máxima mientras estás montado en un caballo. No: reduce drásticamente la velocidad de minería mientras estás montado en un caballo (comportamiento estándar)",

Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/assets/horsebuff/lang/ru_ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"text.autoconfig.HorseBuff.option.noWander": "Отключить блуждание лошадей",
"text.autoconfig.HorseBuff.option.noWander.@Tooltip": "Да — осёдланные лошади не будут блуждать.\nНет — осёдланные лошади будут блуждать.",

"text.autoconfig.HorseBuff.option.rubberBand": "Исправить застревание на ступеньках",
"text.autoconfig.HorseBuff.option.rubberBand.@Tooltip": "Да — Увеличивает толерантность сервера к скорости передвижения лошади, устраняя застревание.\nНет — ванильное поведение.",

"text.autoconfig.HorseBuff.option.breakSpeed": "Снять ограничение скорости копания при езде верхом",
"text.autoconfig.HorseBuff.option.breakSpeed.@Tooltip": "Да — Позволяет вести копание на полной скорости верхом на лошади.\nНет — Значительно замедляет скорость копания во время езды верхом (ванильное поведение).",

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
],
"depends": {
"fabricloader": ">=0.15.11",
"minecraft": ">=1.21.3",
"minecraft": ">=1.21.4",
"java": ">=21",
"fabric-api": "*",
"cloth-config": "*"
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/horsebuff.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"mixins": [
"Server.AllowRaft",
"Server.MountedModifiers",
"Server.MovementCheck",
"Server.NoBuck",
"Server.NoWander"
],
Expand Down

0 comments on commit 297c3f6

Please sign in to comment.