From 57f9d99fc18a5a5bb5a682533e2e330dca0286c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Tue, 18 Jun 2019 14:05:31 +0200 Subject: [PATCH] EntitySize -> EntityDimensions (#745) * EntitySize -> EntityDimensions * resizeable -> changing * constant -> fixed (fite me) * x/z -> width/height * EntityType.setSize -> setDimensions * Entity.getSize -> getDimensions * EnderDragonPart.partSize -> partDimensions * PlayerEntity.STANDING_SIZE -> STANDING_DIMENSIONS * LivingEntity.SLEEPING_SIZE -> SLEEPING_DIMENSIONS * PlayerEntity.SIZES -> POSE_DIMENSIONS (POSTURES?) * EntityType.size -> dimensions * Entity.size -> dimensions * EntityType.getDefaultSize -> getDimensions * Entity.refreshSize -> calculateDimensions * getActiveEyeHeight(pose,size) -> getActiveEyeHeight(pose,dimensions) --- mappings/net/minecraft/entity/Entity.mapping | 8 ++++---- ...tySize.mapping => EntityDimensions.mapping} | 18 +++++++++--------- .../net/minecraft/entity/EntityType.mapping | 9 +++++---- .../net/minecraft/entity/LivingEntity.mapping | 4 ++-- .../entity/boss/dragon/EnderDragonPart.mapping | 2 +- .../entity/player/PlayerEntity.mapping | 4 ++-- 6 files changed, 23 insertions(+), 22 deletions(-) rename mappings/net/minecraft/entity/{EntitySize.mapping => EntityDimensions.mapping} (50%) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 9e9e689d88..f71ed40608 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -25,7 +25,7 @@ CLASS ail net/minecraft/entity/Entity FIELD aE scoreboardTags Ljava/util/Set; FIELD aG pistonMovementDelta [D FIELD aH pistonMovementTick J - FIELD aI size Laim; + FIELD aI dimensions Laim; FIELD aJ standingEyeHeight F FIELD aa chunkY I FIELD ab chunkZ I @@ -140,11 +140,11 @@ CLASS ail net/minecraft/entity/Entity METHOD a move (Laiz;Lcsa;)V ARG 1 type ARG 2 offset - METHOD a getSize (Laje;)Laim; + METHOD a getDimensions (Laje;)Laim; ARG 1 pose METHOD a getEyeHeight (Laje;Laim;)F ARG 1 pose - ARG 2 size + ARG 2 dimensions METHOD a onStruckByLightning (Latp;)V ARG 1 lightning METHOD a interactAt (Lawb;Lcsa;Lahf;)Lahg; @@ -531,7 +531,7 @@ CLASS ail net/minecraft/entity/Entity ARG 1 passenger METHOD x isConnectedThroughVehicle (Lail;)Z ARG 1 entity - METHOD x_ refreshSize ()V + METHOD x_ calculateDimensions ()V METHOD y getPermissionLevel ()I METHOD y hasPassengerDeep (Lail;)Z ARG 1 passenger diff --git a/mappings/net/minecraft/entity/EntitySize.mapping b/mappings/net/minecraft/entity/EntityDimensions.mapping similarity index 50% rename from mappings/net/minecraft/entity/EntitySize.mapping rename to mappings/net/minecraft/entity/EntityDimensions.mapping index e96fe67676..d3060a32af 100644 --- a/mappings/net/minecraft/entity/EntitySize.mapping +++ b/mappings/net/minecraft/entity/EntityDimensions.mapping @@ -1,19 +1,19 @@ -CLASS aim net/minecraft/entity/EntitySize +CLASS aim net/minecraft/entity/EntityDimensions FIELD a width F FIELD b height F - FIELD c constant Z + FIELD c fixed Z METHOD (FFZ)V ARG 1 width ARG 2 height - ARG 3 constant + ARG 3 fixed METHOD a scaled (F)Laim; ARG 1 ratio METHOD a scaled (FF)Laim; ARG 1 widthRatio ARG 2 heightRatio - METHOD b resizeable (FF)Laim; - ARG 0 x - ARG 1 z - METHOD c constant (FF)Laim; - ARG 0 x - ARG 1 z + METHOD b changing (FF)Laim; + ARG 0 width + ARG 1 height + METHOD c fixed (FF)Laim; + ARG 0 width + ARG 1 height diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 5029e73c49..f810fd81a7 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -10,7 +10,7 @@ CLASS aip net/minecraft/entity/EntityType ARG 1 factory ARG 2 category METHOD a disableSummon ()Laip$a; - METHOD a setSize (FF)Laip$a; + METHOD a setDimensions (FF)Laip$a; ARG 1 width ARG 2 height METHOD a create (Laip$b;Laiw;)Laip$a; @@ -36,7 +36,7 @@ CLASS aip net/minecraft/entity/EntityType FIELD bf name Ljn; FIELD bg lootTableId Lqt; FIELD bh dataFixerType Lcom/mojang/datafixers/types/Type; - FIELD bi size Laim; + FIELD bi dimensions Laim; METHOD (Laip$b;Laiw;ZZZLcom/mojang/datafixers/types/Type;Laim;)V ARG 1 factory ARG 2 category @@ -44,7 +44,7 @@ CLASS aip net/minecraft/entity/EntityType ARG 4 summonable ARG 5 fireImmune ARG 6 dataFixerType - ARG 7 size + ARG 7 dimensions METHOD a isSaveable ()Z METHOD a createSimpleBoundingBox (DDD)Lcrv; ARG 1 feetX @@ -105,6 +105,7 @@ CLASS aip net/minecraft/entity/EntityType ARG 4 player ARG 5 pos ARG 6 spawnType + ARG 7 alignPosition METHOD b loadEntityFromTag (Lic;Lbhl;)Ljava/util/Optional; ARG 0 compoundTag ARG 1 world @@ -115,7 +116,7 @@ CLASS aip net/minecraft/entity/EntityType METHOD g getLootTableId ()Lqt; METHOD h getWidth ()F METHOD i getHeight ()F - METHOD j getDefaultSize ()Laim; + METHOD j getDimensions ()Laim; METHOD k getMaxTrackDistance ()I METHOD l getTrackTickInterval ()I METHOD m alwaysUpdateVelocity ()Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 2da606afbe..1189555140 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -13,7 +13,7 @@ CLASS aiu net/minecraft/entity/LivingEntity FIELD aR dead Z FIELD aS despawnCounter I FIELD ar LIVING_FLAGS Lqi; - FIELD as SLEEPING_SIZE Laim; + FIELD as SLEEPING_DIMENSIONS Laim; FIELD at isHandSwinging Z FIELD au preferredHand Lahf; FIELD av handSwingTicks I @@ -115,7 +115,7 @@ CLASS aiu net/minecraft/entity/LivingEntity ARG 1 slot METHOD b getActiveEyeHeight (Laje;Laim;)F ARG 1 pose - ARG 2 size + ARG 2 dimensions METHOD b onEquipStack (Lbce;)V ARG 1 stack METHOD b spawnConsumptionEffects (Lbce;I)V diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping index 179ec23a08..64b5375c42 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping @@ -1,7 +1,7 @@ CLASS asi net/minecraft/entity/boss/dragon/EnderDragonPart FIELD b owner Lask; FIELD c name Ljava/lang/String; - FIELD d partSize Laim; + FIELD d partDimensions Laim; METHOD (Lask;Ljava/lang/String;FF)V ARG 1 owner ARG 2 name diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 0a6d9183dc..251b393e2b 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -7,7 +7,7 @@ CLASS awb net/minecraft/entity/player/PlayerEntity FIELD bA container Layf; FIELD bB hungerManager Layb; FIELD bF experiencePickUpDelay I - FIELD b SIZES Ljava/util/Map; + FIELD b POSE_DIMENSIONS Ljava/util/Map; FIELD bM isInWater Z FIELD bN abilities Lavy; FIELD bO experienceLevel I @@ -20,7 +20,7 @@ CLASS awb net/minecraft/entity/player/PlayerEntity FIELD bW reducedDebugInfo Z FIELD bX selectedItem Lbce; FIELD bY itemCooldownManager Lbca; - FIELD bs STANDING_SIZE Laim; + FIELD bs STANDING_DIMENSIONS Laim; FIELD bt PLAYER_MODEL_BIT_MASK Lqi; FIELD bu MAIN_HAND Lqi; FIELD bv LEFT_SHOULDER_ENTITY Lqi;