From 86ed8ccb3e54025bb641ee6ee4db69560ed511b1 Mon Sep 17 00:00:00 2001 From: haykam821 <24855774+haykam821@users.noreply.github.com> Date: Wed, 20 Apr 2022 08:20:26 -0400 Subject: [PATCH] Rename the HorseBaseEntity class to AbstractHorseEntity (#3098) * Rename the HorseBaseEntity class to AbstractHorseEntity Fixes #3082 * Rename the HorseBaseEntityRenderer class to AbstractHorseEntityRenderer --- ...pping => AbstractHorseEntityRenderer.mapping} | 2 +- .../net/minecraft/entity/LivingEntity.mapping | 2 +- ...ntity.mapping => AbstractHorseEntity.mapping} | 2 +- unpick-definitions/entity_flags.unpick | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) rename mappings/net/minecraft/client/render/entity/{HorseBaseEntityRenderer.mapping => AbstractHorseEntityRenderer.mapping} (87%) rename mappings/net/minecraft/entity/passive/{HorseBaseEntity.mapping => AbstractHorseEntity.mapping} (98%) diff --git a/mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/AbstractHorseEntityRenderer.mapping similarity index 87% rename from mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping rename to mappings/net/minecraft/client/render/entity/AbstractHorseEntityRenderer.mapping index 1b3005673c..62097d261b 100644 --- a/mappings/net/minecraft/client/render/entity/HorseBaseEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/AbstractHorseEntityRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_875 net/minecraft/client/render/entity/HorseBaseEntityRenderer +CLASS net/minecraft/class_875 net/minecraft/client/render/entity/AbstractHorseEntityRenderer FIELD field_4641 scale F METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_549;F)V ARG 1 ctx diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 4e2ea00dbd..407ce093f6 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -507,7 +507,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6091 travel (Lnet/minecraft/class_243;)V COMMENT Allows you to do certain speed and velocity calculations. This is useful for custom vehicle behavior, or custom entity movement. This is not to be confused with AI. COMMENT - COMMENT

See vanilla examples of {@linkplain net.minecraft.entity.passive.HorseBaseEntity#travel + COMMENT

See vanilla examples of {@linkplain net.minecraft.entity.passive.AbstractHorseEntity#travel COMMENT custom horse vehicle} and {@linkplain net.minecraft.entity.mob.FlyingEntity#travel COMMENT flying entities}. ARG 1 movementInput diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping similarity index 98% rename from mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping rename to mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index b55f2392da..e59cb0c747 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity +CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_18118 PARENT_HORSE_PREDICATE Lnet/minecraft/class_4051; FIELD field_25374 BREEDING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_30419 TAMED_FLAG I diff --git a/unpick-definitions/entity_flags.unpick b/unpick-definitions/entity_flags.unpick index f4ea93c656..d4ecba1d44 100644 --- a/unpick-definitions/entity_flags.unpick +++ b/unpick-definitions/entity_flags.unpick @@ -24,16 +24,16 @@ target_method net/minecraft/entity/passive/FoxEntity setFoxFlag (IZ)V param 0 fox_flags -constant horse_flags net/minecraft/entity/passive/HorseBaseEntity TAMED_FLAG -constant horse_flags net/minecraft/entity/passive/HorseBaseEntity SADDLED_FLAG -constant horse_flags net/minecraft/entity/passive/HorseBaseEntity BRED_FLAG -constant horse_flags net/minecraft/entity/passive/HorseBaseEntity EATING_GRASS_FLAG -constant horse_flags net/minecraft/entity/passive/HorseBaseEntity ANGRY_FLAG -constant horse_flags net/minecraft/entity/passive/HorseBaseEntity EATING_FLAG +constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity TAMED_FLAG +constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity SADDLED_FLAG +constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity BRED_FLAG +constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity EATING_GRASS_FLAG +constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity ANGRY_FLAG +constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity EATING_FLAG -target_method net/minecraft/entity/passive/HorseBaseEntity getHorseFlag (I)Z +target_method net/minecraft/entity/passive/AbstractHorseEntity getHorseFlag (I)Z param 0 horse_flags -target_method net/minecraft/entity/passive/HorseBaseEntity setHorseFlag (IZ)V +target_method net/minecraft/entity/passive/AbstractHorseEntity setHorseFlag (IZ)V param 0 horse_flags