From 4e8d79aef47c99a9f037886b2a6825d91af0670f Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sun, 4 Nov 2018 20:05:56 +0100 Subject: [PATCH] move Attribute -> EntityAttribute, PotionEffectType -> MobEffect --- .../net/minecraft/client/gui/ingame/GuiEditBook.mapping | 2 +- .../net/minecraft/client/settings/GameSettings.mapping | 2 +- .../{Attribute.mapping => EntityAttribute.mapping} | 2 +- ...uteClamped.mapping => EntityAttributeClamped.mapping} | 2 +- ...ontainer.mapping => EntityAttributeContainer.mapping} | 2 +- ...Base.mapping => EntityAttributeContainerBase.mapping} | 2 +- ...AttributeImpl.mapping => EntityAttributeImpl.mapping} | 2 +- ...eInstance.mapping => EntityAttributeInstance.mapping} | 2 +- ...eImpl.mapping => EntityAttributeInstanceImpl.mapping} | 3 ++- ...eModifier.mapping => EntityAttributeModifier.mapping} | 5 ++++- ...AttributeManager.mapping => EntityAttributes.mapping} | 8 +++++--- .../effect/MobEffect.mapping} | 2 +- .../minecraft/entity/effect/MobEffectAbsorption.mapping | 4 ++++ .../entity/effect/MobEffectDamageModifier.mapping | 6 ++++++ .../minecraft/entity/effect/MobEffectHealthBoost.mapping | 4 ++++ .../effect/MobEffectInstance.mapping} | 9 +++++++-- .../effect/MobEffectInstant.mapping} | 2 +- .../effect/MobEffectUtil.mapping} | 2 +- mappings/net/minecraft/entity/effect/MobEffects.mapping | 2 ++ .../net/minecraft/entity/passive/EntityDolphin.mapping | 1 - mappings/net/minecraft/item/Item.mapping | 1 - .../minecraft/potion/PotionEffectTypeAbsorption.mapping | 4 ---- .../net/minecraft/potion/PotionEffectTypeDamage.mapping | 4 ---- .../minecraft/potion/PotionEffectTypeHealthBoost.mapping | 4 ---- mappings/net/minecraft/potion/PotionEffectTypes.mapping | 1 - .../potion/{PotionHelper.mapping => PotionUtil.mapping} | 2 +- ...amespace.mapping => NamespaceResourceManager.mapping} | 3 ++- .../resource/ReloadableResourceManagerImpl.mapping | 3 ++- mappings/net/minecraft/resource/ResourceManager.mapping | 1 + mappings/net/minecraft/util/LowercaseMap.mapping | 3 +++ 30 files changed, 54 insertions(+), 36 deletions(-) rename mappings/net/minecraft/entity/attribute/{Attribute.mapping => EntityAttribute.mapping} (62%) rename mappings/net/minecraft/entity/attribute/{AttributeClamped.mapping => EntityAttributeClamped.mapping} (82%) rename mappings/net/minecraft/entity/attribute/{AttributeContainer.mapping => EntityAttributeContainer.mapping} (83%) rename mappings/net/minecraft/entity/attribute/{AttributeContainerBase.mapping => EntityAttributeContainerBase.mapping} (82%) rename mappings/net/minecraft/entity/attribute/{AttributeImpl.mapping => EntityAttributeImpl.mapping} (83%) rename mappings/net/minecraft/entity/attribute/{AttributeInstance.mapping => EntityAttributeInstance.mapping} (87%) rename mappings/net/minecraft/entity/attribute/{AttributeInstanceImpl.mapping => EntityAttributeInstanceImpl.mapping} (84%) rename mappings/net/minecraft/entity/attribute/{AttributeModifier.mapping => EntityAttributeModifier.mapping} (79%) rename mappings/net/minecraft/entity/attribute/{AttributeManager.mapping => EntityAttributes.mapping} (71%) rename mappings/net/minecraft/{potion/PotionEffectType.mapping => entity/effect/MobEffect.mapping} (94%) create mode 100644 mappings/net/minecraft/entity/effect/MobEffectAbsorption.mapping create mode 100644 mappings/net/minecraft/entity/effect/MobEffectDamageModifier.mapping create mode 100644 mappings/net/minecraft/entity/effect/MobEffectHealthBoost.mapping rename mappings/net/minecraft/{potion/PotionEffect.mapping => entity/effect/MobEffectInstance.mapping} (86%) rename mappings/net/minecraft/{potion/PotionEffectTypeInstant.mapping => entity/effect/MobEffectInstant.mapping} (72%) rename mappings/net/minecraft/{potion/PotionEffectUtil.mapping => entity/effect/MobEffectUtil.mapping} (78%) create mode 100644 mappings/net/minecraft/entity/effect/MobEffects.mapping delete mode 100644 mappings/net/minecraft/potion/PotionEffectTypeAbsorption.mapping delete mode 100644 mappings/net/minecraft/potion/PotionEffectTypeDamage.mapping delete mode 100644 mappings/net/minecraft/potion/PotionEffectTypeHealthBoost.mapping delete mode 100644 mappings/net/minecraft/potion/PotionEffectTypes.mapping rename mappings/net/minecraft/potion/{PotionHelper.mapping => PotionUtil.mapping} (95%) rename mappings/net/minecraft/resource/{ResourcePackNamespace.mapping => NamespaceResourceManager.mapping} (90%) create mode 100644 mappings/net/minecraft/util/LowercaseMap.mapping diff --git a/mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping b/mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping index 21a112afef..00c1aa14dc 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping @@ -28,7 +28,7 @@ CLASS cqr net/minecraft/client/gui/ingame/GuiEditBook FIELD a BG_TEX Lpu; FIELD f player Lapr; FIELD g stack Lauv; - FIELD w pages Lhs; + FIELD w pageTag Lhs; FIELD x title Ljava/lang/String; METHOD (Lapr;Lauv;ZLaeo;)V ARG 1 player diff --git a/mappings/net/minecraft/client/settings/GameSettings.mapping b/mappings/net/minecraft/client/settings/GameSettings.mapping index 2dd33e3a09..0ff002914c 100644 --- a/mappings/net/minecraft/client/settings/GameSettings.mapping +++ b/mappings/net/minecraft/client/settings/GameSettings.mapping @@ -81,7 +81,7 @@ CLASS clr net/minecraft/client/settings/GameSettings FIELD X keyBack Lcln; FIELD Y keyRight Lcln; FIELD Z keyJump Lcln; - FIELD aA debugProfilingEnabled Z + FIELD aA debugProfilerEnabled Z FIELD aB debugTpsEnabled Z FIELD aC lastServer Ljava/lang/String; FIELD aF fov D diff --git a/mappings/net/minecraft/entity/attribute/Attribute.mapping b/mappings/net/minecraft/entity/attribute/EntityAttribute.mapping similarity index 62% rename from mappings/net/minecraft/entity/attribute/Attribute.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttribute.mapping index 483ed56e18..16a9382fde 100644 --- a/mappings/net/minecraft/entity/attribute/Attribute.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttribute.mapping @@ -1,4 +1,4 @@ -CLASS agq net/minecraft/entity/attribute/Attribute +CLASS agq net/minecraft/entity/attribute/EntityAttribute METHOD a getId ()Ljava/lang/String; METHOD b getDefaultValue ()D METHOD d getParent ()Lagq; diff --git a/mappings/net/minecraft/entity/attribute/AttributeClamped.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeClamped.mapping similarity index 82% rename from mappings/net/minecraft/entity/attribute/AttributeClamped.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeClamped.mapping index fb0d24f161..b1a4b98946 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeClamped.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeClamped.mapping @@ -1,4 +1,4 @@ -CLASS agx net/minecraft/entity/attribute/AttributeClamped +CLASS agx net/minecraft/entity/attribute/EntityAttributeClamped FIELD a minValue D FIELD b maxValue D FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeContainer.mapping similarity index 83% rename from mappings/net/minecraft/entity/attribute/AttributeContainer.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeContainer.mapping index 1a59c87fa7..d7210b539b 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeContainer.mapping @@ -1,4 +1,4 @@ -CLASS agw net/minecraft/entity/attribute/AttributeContainer +CLASS agw net/minecraft/entity/attribute/EntityAttributeContainer FIELD d instancesByName Ljava/util/Map; METHOD a get (Lagq;)Lagr; ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainerBase.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeContainerBase.mapping similarity index 82% rename from mappings/net/minecraft/entity/attribute/AttributeContainerBase.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeContainerBase.mapping index 82d41c119d..54bc757adc 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainerBase.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeContainerBase.mapping @@ -1,4 +1,4 @@ -CLASS agu net/minecraft/entity/attribute/AttributeContainerBase +CLASS agu net/minecraft/entity/attribute/EntityAttributeContainerBase FIELD a instancesByKey Ljava/util/Map; FIELD b instancesById Ljava/util/Map; METHOD a values ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/entity/attribute/AttributeImpl.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeImpl.mapping similarity index 83% rename from mappings/net/minecraft/entity/attribute/AttributeImpl.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeImpl.mapping index c157f95d24..7489a9bb31 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeImpl.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeImpl.mapping @@ -1,4 +1,4 @@ -CLASS agt net/minecraft/entity/attribute/AttributeImpl +CLASS agt net/minecraft/entity/attribute/EntityAttributeImpl FIELD a parent Lagq; FIELD b id Ljava/lang/String; FIELD c defaultValue D diff --git a/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping similarity index 87% rename from mappings/net/minecraft/entity/attribute/AttributeInstance.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index aed5512aee..b2cfe7bf99 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -1,4 +1,4 @@ -CLASS agr net/minecraft/entity/attribute/AttributeInstance +CLASS agr net/minecraft/entity/attribute/EntityAttributeInstance METHOD a getAttribute ()Lagq; METHOD a setBaseValue (D)V ARG 1 baseValue diff --git a/mappings/net/minecraft/entity/attribute/AttributeInstanceImpl.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping similarity index 84% rename from mappings/net/minecraft/entity/attribute/AttributeInstanceImpl.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping index acf211f3e5..9703ff466b 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeInstanceImpl.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping @@ -1,4 +1,5 @@ -CLASS agv net/minecraft/entity/attribute/AttributeInstanceImpl +CLASS agv net/minecraft/entity/attribute/EntityAttributeInstanceImpl + FIELD a container Lagu; FIELD b attribute Lagq; FIELD f baseValue D METHOD a getAttribute ()Lagq; diff --git a/mappings/net/minecraft/entity/attribute/AttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping similarity index 79% rename from mappings/net/minecraft/entity/attribute/AttributeModifier.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index c555bb4c47..a87e03494d 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -1,5 +1,8 @@ -CLASS ags net/minecraft/entity/attribute/AttributeModifier +CLASS ags net/minecraft/entity/attribute/EntityAttributeModifier CLASS ags$a Operation + FIELD d VALUES [Lags$a; + FIELD e id I + METHOD a getId ()I FIELD a amount D FIELD b operation Lags$a; FIELD c nameGetter Ljava/util/function/Supplier; diff --git a/mappings/net/minecraft/entity/attribute/AttributeManager.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping similarity index 71% rename from mappings/net/minecraft/entity/attribute/AttributeManager.mapping rename to mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 3bbdbaaf64..67a49bbdae 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeManager.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -1,19 +1,21 @@ -CLASS aov net/minecraft/entity/attribute/AttributeManager +CLASS aov net/minecraft/entity/attribute/EntityAttributes FIELD a MAX_HEALTH Lagq; FIELD b FOLLOW_RANGE Lagq; FIELD c KNOCKBACK_RESISTANCE Lagq; FIELD d MOVEMENT_SPEED Lagq; + FIELD e FLYING_SPEED Lagq; FIELD f ATTACK_DAMAGE Lagq; + FIELD g ATTACK_KNOCKBACK Lagq; FIELD h ATTACK_SPEED Lagq; FIELD i ARMOR Lagq; FIELD j ARMOR_TOUGHNESS Lagq; FIELD k LUCK Lagq; FIELD l LOGGER Lorg/apache/logging/log4j/Logger; - METHOD a serializeToTag (Lagr;)Lhm; + METHOD a fromTag (Lagr;)Lhm; ARG 0 instance METHOD a serializeToTag (Lags;)Lhm; ARG 0 modifier - METHOD a serializeToTag (Lagu;)Lhs; + METHOD a toTag (Lagu;)Lhs; ARG 0 container METHOD a deserializeFromTag (Lhm;)Lags; ARG 0 tag diff --git a/mappings/net/minecraft/potion/PotionEffectType.mapping b/mappings/net/minecraft/entity/effect/MobEffect.mapping similarity index 94% rename from mappings/net/minecraft/potion/PotionEffectType.mapping rename to mappings/net/minecraft/entity/effect/MobEffect.mapping index f0943b518d..622fc8085c 100644 --- a/mappings/net/minecraft/potion/PotionEffectType.mapping +++ b/mappings/net/minecraft/entity/effect/MobEffect.mapping @@ -1,4 +1,4 @@ -CLASS afn net/minecraft/potion/PotionEffectType +CLASS afn net/minecraft/entity/effect/MobEffect FIELD a attributes Ljava/util/Map; FIELD b negative Z FIELD c color I diff --git a/mappings/net/minecraft/entity/effect/MobEffectAbsorption.mapping b/mappings/net/minecraft/entity/effect/MobEffectAbsorption.mapping new file mode 100644 index 0000000000..45ade1dad9 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/MobEffectAbsorption.mapping @@ -0,0 +1,4 @@ +CLASS afj net/minecraft/entity/effect/MobEffectAbsorption + METHOD (ZI)V + ARG 1 negative + ARG 2 color diff --git a/mappings/net/minecraft/entity/effect/MobEffectDamageModifier.mapping b/mappings/net/minecraft/entity/effect/MobEffectDamageModifier.mapping new file mode 100644 index 0000000000..eed995c256 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/MobEffectDamageModifier.mapping @@ -0,0 +1,6 @@ +CLASS afk net/minecraft/entity/effect/MobEffectDamageModifier + FIELD a modifier D + METHOD (ZID)V + ARG 1 negative + ARG 2 color + ARG 3 modifier diff --git a/mappings/net/minecraft/entity/effect/MobEffectHealthBoost.mapping b/mappings/net/minecraft/entity/effect/MobEffectHealthBoost.mapping new file mode 100644 index 0000000000..b3e9cd0493 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/MobEffectHealthBoost.mapping @@ -0,0 +1,4 @@ +CLASS afl net/minecraft/entity/effect/MobEffectHealthBoost + METHOD (ZI)V + ARG 1 negative + ARG 2 color diff --git a/mappings/net/minecraft/potion/PotionEffect.mapping b/mappings/net/minecraft/entity/effect/MobEffectInstance.mapping similarity index 86% rename from mappings/net/minecraft/potion/PotionEffect.mapping rename to mappings/net/minecraft/entity/effect/MobEffectInstance.mapping index 2008b677a9..a8252959cc 100644 --- a/mappings/net/minecraft/potion/PotionEffect.mapping +++ b/mappings/net/minecraft/entity/effect/MobEffectInstance.mapping @@ -1,4 +1,4 @@ -CLASS afo net/minecraft/potion/PotionEffect +CLASS afo net/minecraft/entity/effect/MobEffectInstance FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b type Lafn; FIELD c duration I @@ -7,6 +7,7 @@ CLASS afo net/minecraft/potion/PotionEffect FIELD f ambient Z FIELD g permanent Z FIELD h showParticles Z + FIELD i showIcon Z METHOD (Lafn;)V ARG 1 type METHOD (Lafn;I)V @@ -20,12 +21,15 @@ CLASS afo net/minecraft/potion/PotionEffect ARG 1 type ARG 2 duration ARG 3 amplifier - ARG 6 showParticles + ARG 4 ambient + ARG 5 showParticles + ARG 6 showIcon METHOD (Lafo;)V ARG 1 other METHOD a getEffectType ()Lafn; METHOD a upgrade (Lafo;)Z ARG 1 other + ARG 2 dirty METHOD a update (Lage;)Z ARG 1 entity METHOD a serialize (Lhm;)Lhm; @@ -44,6 +48,7 @@ CLASS afo net/minecraft/potion/PotionEffect METHOD e shouldShowParticles ()Z METHOD equals (Ljava/lang/Object;)Z ARG 1 object + METHOD f shouldShowIcon ()Z METHOD g getTranslationKey ()Ljava/lang/String; METHOD h isPermanent ()Z METHOD i updateDuration ()I diff --git a/mappings/net/minecraft/potion/PotionEffectTypeInstant.mapping b/mappings/net/minecraft/entity/effect/MobEffectInstant.mapping similarity index 72% rename from mappings/net/minecraft/potion/PotionEffectTypeInstant.mapping rename to mappings/net/minecraft/entity/effect/MobEffectInstant.mapping index b54b155bd9..d7cb0fc056 100644 --- a/mappings/net/minecraft/potion/PotionEffectTypeInstant.mapping +++ b/mappings/net/minecraft/entity/effect/MobEffectInstant.mapping @@ -1,4 +1,4 @@ -CLASS afm net/minecraft/potion/PotionEffectTypeInstant +CLASS afm net/minecraft/entity/effect/MobEffectInstant METHOD (ZI)V ARG 1 negative ARG 2 color diff --git a/mappings/net/minecraft/potion/PotionEffectUtil.mapping b/mappings/net/minecraft/entity/effect/MobEffectUtil.mapping similarity index 78% rename from mappings/net/minecraft/potion/PotionEffectUtil.mapping rename to mappings/net/minecraft/entity/effect/MobEffectUtil.mapping index ed021d0ec7..7d00ef51dc 100644 --- a/mappings/net/minecraft/potion/PotionEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/MobEffectUtil.mapping @@ -1,4 +1,4 @@ -CLASS afp net/minecraft/potion/PotionEffectUtil +CLASS afp net/minecraft/entity/effect/MobEffectUtil METHOD a durationToString (Lafo;F)Ljava/lang/String; ARG 0 effect ARG 1 multiplier diff --git a/mappings/net/minecraft/entity/effect/MobEffects.mapping b/mappings/net/minecraft/entity/effect/MobEffects.mapping new file mode 100644 index 0000000000..8531b283cd --- /dev/null +++ b/mappings/net/minecraft/entity/effect/MobEffects.mapping @@ -0,0 +1,2 @@ +CLASS afq net/minecraft/entity/effect/MobEffects + METHOD a register (ILjava/lang/String;Lafn;)Lafn; diff --git a/mappings/net/minecraft/entity/passive/EntityDolphin.mapping b/mappings/net/minecraft/entity/passive/EntityDolphin.mapping index fca1c93810..acd174cfeb 100644 --- a/mappings/net/minecraft/entity/passive/EntityDolphin.mapping +++ b/mappings/net/minecraft/entity/passive/EntityDolphin.mapping @@ -38,7 +38,6 @@ CLASS alb net/minecraft/entity/passive/EntityDolphin METHOD b serializeCustomData (Lhm;)V ARG 1 tag METHOD bH getEyeHeight ()F - METHOD bh getMaxBreath ()I METHOD cb initAttributes ()V METHOD cw getSoundDeath ()Lww; METHOD e getSoundHurt (Lafe;)Lww; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 0027720556..90d62592c1 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -99,7 +99,6 @@ CLASS auq net/minecraft/item/Item ARG 0 block METHOD a isEffectiveOn (Lbnh;)Z ARG 1 state - ARG 3 miningLevel METHOD a onTagDeserialized (Lhm;)Z ARG 1 tag METHOD a getProperty (Lpu;)Lauu; diff --git a/mappings/net/minecraft/potion/PotionEffectTypeAbsorption.mapping b/mappings/net/minecraft/potion/PotionEffectTypeAbsorption.mapping deleted file mode 100644 index 42382c7a3d..0000000000 --- a/mappings/net/minecraft/potion/PotionEffectTypeAbsorption.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS afj net/minecraft/potion/PotionEffectTypeAbsorption - METHOD (ZI)V - ARG 1 negative - ARG 2 color diff --git a/mappings/net/minecraft/potion/PotionEffectTypeDamage.mapping b/mappings/net/minecraft/potion/PotionEffectTypeDamage.mapping deleted file mode 100644 index f266827abd..0000000000 --- a/mappings/net/minecraft/potion/PotionEffectTypeDamage.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS afk net/minecraft/potion/PotionEffectTypeDamage - METHOD (ZID)V - ARG 1 negative - ARG 2 color diff --git a/mappings/net/minecraft/potion/PotionEffectTypeHealthBoost.mapping b/mappings/net/minecraft/potion/PotionEffectTypeHealthBoost.mapping deleted file mode 100644 index b40b4236dc..0000000000 --- a/mappings/net/minecraft/potion/PotionEffectTypeHealthBoost.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS afl net/minecraft/potion/PotionEffectTypeHealthBoost - METHOD (ZI)V - ARG 1 negative - ARG 2 color diff --git a/mappings/net/minecraft/potion/PotionEffectTypes.mapping b/mappings/net/minecraft/potion/PotionEffectTypes.mapping deleted file mode 100644 index 42ea5e4585..0000000000 --- a/mappings/net/minecraft/potion/PotionEffectTypes.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS afq net/minecraft/potion/PotionEffectTypes diff --git a/mappings/net/minecraft/potion/PotionHelper.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping similarity index 95% rename from mappings/net/minecraft/potion/PotionHelper.mapping rename to mappings/net/minecraft/potion/PotionUtil.mapping index d26803492e..3565b278df 100644 --- a/mappings/net/minecraft/potion/PotionHelper.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -1,4 +1,4 @@ -CLASS awo net/minecraft/potion/PotionHelper +CLASS awo net/minecraft/potion/PotionUtil METHOD a getPotionEffects (Lauv;)Ljava/util/List; ARG 0 stack METHOD a setPotion (Lauv;Lawm;)Lauv; diff --git a/mappings/net/minecraft/resource/ResourcePackNamespace.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping similarity index 90% rename from mappings/net/minecraft/resource/ResourcePackNamespace.mapping rename to mappings/net/minecraft/resource/NamespaceResourceManager.mapping index 3177af7bf9..f0bdb54a59 100644 --- a/mappings/net/minecraft/resource/ResourcePackNamespace.mapping +++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping @@ -1,4 +1,4 @@ -CLASS vq net/minecraft/resource/ResourcePackNamespace +CLASS vq net/minecraft/resource/NamespaceResourceManager CLASS vq$a DebugInputStream FIELD a parent Ljava/io/InputStream; FIELD b leakMessage Ljava/lang/String; @@ -12,6 +12,7 @@ CLASS vq net/minecraft/resource/ResourcePackNamespace METHOD a findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; ARG 1 namespace ARG 2 predicate + ARG 3 resources METHOD a getResource (Lpu;)Lvs; ARG 1 id METHOD a open (Lpu;Luz;)Ljava/io/InputStream; diff --git a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping index 3e8ef176ef..e40087515c 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping @@ -1,6 +1,6 @@ CLASS vv net/minecraft/resource/ReloadableResourceManagerImpl FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b namespacedMap Ljava/util/Map; + FIELD b namespaceManagers Ljava/util/Map; FIELD c listeners Ljava/util/List; FIELD d namespaces Ljava/util/Set; FIELD e type Lva; @@ -10,6 +10,7 @@ CLASS vv net/minecraft/resource/ReloadableResourceManagerImpl METHOD a findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; ARG 1 namespace ARG 2 predicate + ARG 3 resources METHOD a reload (Ljava/util/List;)V ARG 1 list METHOD a getResource (Lpu;)Lvs; diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index 725059ad12..3cc77ddcbd 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -3,6 +3,7 @@ CLASS vt net/minecraft/resource/ResourceManager METHOD a findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; ARG 1 namespace ARG 2 predicate + ARG 3 resources METHOD a getResource (Lpu;)Lvs; ARG 1 id METHOD b getAllResources (Lpu;)Ljava/util/List; diff --git a/mappings/net/minecraft/util/LowercaseMap.mapping b/mappings/net/minecraft/util/LowercaseMap.mapping new file mode 100644 index 0000000000..7ebe7fbaea --- /dev/null +++ b/mappings/net/minecraft/util/LowercaseMap.mapping @@ -0,0 +1,3 @@ +CLASS ya net/minecraft/util/LowercaseMap + FIELD a delegate Ljava/util/Map; + METHOD a putLowercased (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;