Fix duplicate mappings + small fix

Let me know if your not happy with these new names
hea3ven · Dec 20, 2018 · f07fc18 · f07fc18
1 parent 191f579
commit f07fc18
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping
@@ -8,7 +8,7 @@ CLASS s net/minecraft/advancement/AdvancementCriterion
 	METHOD a serialize (Ljava/util/Map;Lit;)V
 		ARG 0 criteria
 		ARG 1 buf
-	METHOD b deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/util/Map;
+	METHOD b deserializeCriterias (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/util/Map;
 		ARG 0 obj
 		ARG 1 context
 	METHOD b createNew (Lit;)Ls;

diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping
@@ -9,7 +9,7 @@ CLASS deu net/minecraft/client/render/block/BlockRenderManager
 	METHOD a getModels ()Ldet;
 	METHOD a getModel (Lbpm;)Ldoy;
 		ARG 1 state
-	METHOD a renderAsItem (Lbpm;F)V
+	METHOD a render (Lbpm;F)V
 		ARG 1 state
 	METHOD a tesselateBlock (Lbpm;Let;Lbaz;Lcou;Ljava/util/Random;)Z
 	METHOD a tesselateDamage (Lbpm;Let;Ldno;Lbaz;)V

diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping
@@ -79,6 +79,6 @@ CLASS age net/minecraft/entity/damage/DamageSource
 	METHOD q getName ()Ljava/lang/String;
 	METHOD r setScaledWithDifficulty ()Lage;
 	METHOD s isScaledWithDifficulty ()Z
-	METHOD t setMagic ()Z
-	METHOD u setMagic ()Lage;
+	METHOD t getMagic ()Z
+	METHOD u setUsesMagic ()Lage;
 	METHOD v isSourceCreativePlayer ()Z
diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping
@@ -7,7 +7,7 @@ CLASS asp net/minecraft/entity/vehicle/HopperMinecartEntity
 	METHOD D getHopperX ()D
 	METHOD F getHopperY ()D
 	METHOD G getHopperZ ()D
-	METHOD H updateLogic ()Z
+	METHOD H canOperate ()Z
 	METHOD I isCoolingDown ()Z
 	METHOD W_ update ()V
 	METHOD Z_ getInvSize ()I

diff --git a/mappings/net/minecraft/nbt/ListTag.mapping b/mappings/net/minecraft/nbt/ListTag.mapping
@@ -3,7 +3,7 @@ CLASS hy net/minecraft/nbt/ListTag
 	FIELD g value Ljava/util/List;
 	FIELD h type B
 	METHOD a getType ()B
-	METHOD a remove (I)Lij;
+	METHOD a getAndRemove (I)Lij;
 	METHOD a setRaw (ILij;)V
 		ARG 1 index
 	METHOD a add (Lij;)Z
@@ -13,7 +13,7 @@ CLASS hy net/minecraft/nbt/ListTag
 	METHOD a write (Ljava/io/DataOutput;)V
 	METHOD a toTextComponent (Ljava/lang/String;I)Ljd;
 		ARG 1 indent
-	METHOD a_ getType ()I
+	METHOD a_ getListType ()I
 	METHOD b copy ()Lij;
 	METHOD b remove (I)V
 	METHOD b append (ILij;)V