From c60bc2c601554ecba717ed359fdf3f3559682fd5 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 15 Aug 2016 13:20:34 -0400 Subject: [PATCH] TileEntity stuff --- .../minecraft/block/tile/TileEntity.mapping | 4 +- .../block/tile/impl/TileEntityBanner.mapping | 41 +++++++++++++++++++ .../block/tile/impl/TileEntityBeacon.mapping | 8 ++++ .../tile/impl/TileEntityBrewingStand.mapping | 14 +++++++ .../block/tile/impl/TileEntityChest.mapping | 11 +++++ .../tile/impl/TileEntityCommandBlock.mapping | 1 + .../tile/impl/TileEntityDispenser.mapping | 8 +++- .../block/tile/impl/TileEntityDropper.mapping | 1 + .../impl/TileEntityEnchantingTable.mapping | 8 +++- .../tile/impl/TileEntityEndGateway.mapping | 1 + .../tile/impl/TileEntityFlowerPot.mapping | 11 +++++ .../block/tile/impl/TileEntityFurnace.mapping | 20 +++++++++ .../block/tile/impl/TileEntityHopper.mapping | 10 +++++ .../tile/impl/TileEntityMobSpawner.mapping | 1 + .../block/tile/impl/TileEntitySign.mapping | 2 + .../block/tile/impl/TileEntitySkull.mapping | 8 ++++ .../impl/TileEntityStructureBlock.mapping | 26 +++++++++++- mappings/net/minecraft/util/INameable.mapping | 4 ++ mappings/none/arp.mapping | 1 + 19 files changed, 176 insertions(+), 4 deletions(-) create mode 100644 mappings/net/minecraft/util/INameable.mapping diff --git a/mappings/net/minecraft/block/tile/TileEntity.mapping b/mappings/net/minecraft/block/tile/TileEntity.mapping index bdf91cf69f..74d8caaec5 100644 --- a/mappings/net/minecraft/block/tile/TileEntity.mapping +++ b/mappings/net/minecraft/block/tile/TileEntity.mapping @@ -20,8 +20,10 @@ CLASS none/arb net/minecraft/block/tile/TileEntity ARG 0 tag METHOD b serializeTag (Lnone/dt;)Lnone/dt; ARG 0 tag - METHOD c serializeTileTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; + METHOD c serializeTileData (Lnone/dt;)Lnone/dt; ARG 0 tag + METHOD i_ getNameComponent ()Lnone/fa; METHOD t hasWorld ()Z METHOD u getBlockMetadata ()I METHOD v getPos ()Lnone/cn; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBanner.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBanner.mapping index 04a4d05297..e7809afa82 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBanner.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBanner.mapping @@ -1,9 +1,50 @@ CLASS none/aqz net/minecraft/block/tile/impl/TileEntityBanner CLASS none/aqz$a Pattern + FIELD A HALF_VERTICAL_LEFT Lnone/aqz$a; + FIELD B HALF_HORIZONTAL_TOP Lnone/aqz$a; + FIELD C HALF_VERTICAL_RIGHT Lnone/aqz$a; + FIELD D HALF_HORIZONTAL_BOTTOM Lnone/aqz$a; + FIELD E BORDER Lnone/aqz$a; + FIELD F CURLY_BORDER Lnone/aqz$a; + FIELD G CREEPER Lnone/aqz$a; + FIELD H GRADIENT_DOWN Lnone/aqz$a; + FIELD I GRADIENT_UP Lnone/aqz$a; + FIELD J BRICKS Lnone/aqz$a; + FIELD K SKULL Lnone/aqz$a; + FIELD L FLOWER Lnone/aqz$a; + FIELD M MOJANG Lnone/aqz$a; FIELD a BASE Lnone/aqz$a; + FIELD b SQUARE_BOTTOM_LEFT Lnone/aqz$a; + FIELD c SQUARE_BOTTOM_RIGHT Lnone/aqz$a; + FIELD d SQUARE_TOP_LEFT Lnone/aqz$a; + FIELD e SQUARE_TOP_RIGHT Lnone/aqz$a; + FIELD f STRIPE_BOTTOM Lnone/aqz$a; + FIELD g STRIPE_TOP Lnone/aqz$a; + FIELD h STRIPE_LEFT Lnone/aqz$a; + FIELD i STRIPE_RIGHT Lnone/aqz$a; + FIELD j STRIPE_CENTER Lnone/aqz$a; + FIELD k STRIPE_MIDDLE Lnone/aqz$a; + FIELD l STRIPE_DOWNRIGHT Lnone/aqz$a; + FIELD m STRIPE_DOWNLEFT Lnone/aqz$a; + FIELD n SMALL_STRIPES Lnone/aqz$a; + FIELD o CROSS Lnone/aqz$a; + FIELD p STRAIGHT_CROSS Lnone/aqz$a; + FIELD q TRIANGLE_BOTTOM Lnone/aqz$a; + FIELD r TRIANGLE_TOP Lnone/aqz$a; + FIELD s TRIANGLES_BOTTOM Lnone/aqz$a; + FIELD t TRIANGLES_TOP Lnone/aqz$a; + FIELD u DIAGONAL_DOWN_LEFT Lnone/aqz$a; + FIELD v DIAGONAL_UP_RIGHT Lnone/aqz$a; + FIELD w DIAGONAL_UP_LEFT Lnone/aqz$a; + FIELD x DIAGONAL_DOWN_RIGHT Lnone/aqz$a; + FIELD y CIRCLE Lnone/aqz$a; + FIELD z RHOMBUS Lnone/aqz$a; FIELD a baseColor I FIELD f patternListTag Lnone/dz; FIELD h patternList Ljava/util/List; FIELD i patternColorList Ljava/util/List; + METHOD a loadFromStack (Lnone/aeq;)V + ARG 0 stack METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping index b3bb34e944..30916ecbe1 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping @@ -1,5 +1,13 @@ CLASS none/ara net/minecraft/block/tile/impl/TileEntityBeacon + FIELD a EFFECTS [[Lnone/rx; + FIELD k levels I + FIELD l primary Lnone/rx; + FIELD m secondary Lnone/rx; METHOD D_ update ()V METHOD a getAvailableSlots (Lnone/cu;)[I + ARG 0 facing METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; + METHOD f getPotionEffectById (I)Lnone/rx; + ARG 0 id diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping index 072a812b66..6bc17945df 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping @@ -2,7 +2,21 @@ CLASS none/arc net/minecraft/block/tile/impl/TileEntityBrewingStand FIELD a SLOTS_UP [I FIELD f SLOTS_DOWN [I FIELD g SLOTS_SIDE [I + FIELD h inventory Lnone/dc; + FIELD l name Ljava/lang/String; METHOD D_ update ()V + METHOD a getStack (I)Lnone/aeq; + ARG 0 slot + METHOD a setStack (ILnone/aeq;)V + ARG 0 slot + ARG 1 stack + METHOD a setName (Ljava/lang/String;)V + ARG 0 nam METHOD a getAvailableSlots (Lnone/cu;)[I METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD h_ getName ()Ljava/lang/String; + METHOD l clearInventory ()V + METHOD n_ hasCustomName ()Z + METHOD t_ getInventorySize ()I + METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping index 30b2bb53cd..e1481885ff 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping @@ -3,9 +3,20 @@ CLASS none/ard net/minecraft/block/tile/impl/TileEntityChest FIELD g neighborEast Lnone/ard; FIELD h neighborWest Lnone/ard; FIELD i neighborSouth Lnone/ard; + FIELD o inventory Lnone/dc; + FIELD q type Lnone/ali$a; + FIELD r name Ljava/lang/String; + METHOD (Lnone/ali$a;)V + ARG 0 type METHOD D_ update ()V + METHOD a (I)Lnone/aeq; + ARG 0 slot + METHOD a setName (Ljava/lang/String;)V + ARG 0 name METHOD a getNeighbor (Lnone/cu;)Lnone/ard; ARG 0 facing METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD h_ getName ()Ljava/lang/String; + METHOD n_ hasCustomName ()Z METHOD t_ getSlotCount ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityCommandBlock.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityCommandBlock.mapping index d098a133cc..cae68c3419 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityCommandBlock.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityCommandBlock.mapping @@ -13,6 +13,7 @@ CLASS none/are net/minecraft/block/tile/impl/TileEntityCommandBlock METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD b setAuto (Z)V METHOD c setConditionMet (Z)V + ARG 0 conditionMet METHOD g isPowered ()Z METHOD h isAuto ()Z METHOD i isConditionMet ()Z diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping index b56012736d..842c334e67 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping @@ -1,4 +1,10 @@ CLASS none/arh net/minecraft/block/tile/impl/TileEntityDispenser - FIELD f rand Ljava/util/Random; + FIELD a name Ljava/lang/String; + FIELD f RANDOM Ljava/util/Random; + METHOD a setName (Ljava/lang/String;)V + ARG 0 name METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD h_ getName ()Ljava/lang/String; + METHOD n_ hasCustomName ()Z + METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping index 08e39f3f19..cdbec94f4d 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping @@ -1 +1,2 @@ CLASS none/ari net/minecraft/block/tile/impl/TileEntityDropper + METHOD h_ getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping index 472ea79b46..5b5ef81796 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping @@ -1,6 +1,12 @@ CLASS none/arj net/minecraft/block/tile/impl/TileEntityEnchantingTable - FIELD o rand Ljava/util/Random; + FIELD o RANDOM Ljava/util/Random; + FIELD p name Ljava/lang/String; METHOD D_ update ()V + METHOD a setName (Ljava/lang/String;)V + ARG 0 name METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD h_ getName ()Ljava/lang/String; + METHOD i_ getNameComponent ()Lnone/fa; METHOD k getId ()Ljava/lang/String; + METHOD n_ hasCustomName ()Z diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping index 7cf0b5ef22..c1806dbf7e 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping @@ -4,3 +4,4 @@ CLASS none/arw net/minecraft/block/tile/impl/TileEntityEndGateway METHOD D_ update ()V METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFlowerPot.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFlowerPot.mapping index 93dddfaf36..3e74ba6cf1 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFlowerPot.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFlowerPot.mapping @@ -1,3 +1,14 @@ CLASS none/arl net/minecraft/block/tile/impl/TileEntityFlowerPot + FIELD a flower Lnone/aeo; + FIELD f meta I + METHOD (Lnone/aeo;I)V + ARG 0 flower + ARG 1 meat + METHOD a setFlower (Lnone/aeo;I)V + ARG 0 flower + ARG 1 meta METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; + METHOD d getFlowerStack ()Lnone/aeq; + METHOD e getFlower ()Lnone/aeo; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping index ff8a06c7dd..c93afad3f5 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping @@ -2,7 +2,27 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace FIELD a SLOTS_UP [I FIELD f SLOTS_DOWN [I FIELD g SLOTS_SIDE [I + FIELD h inventory Lnone/dc; + FIELD i burnTime I + FIELD j fuelTime I + FIELD k cookTime I + FIELD l totalCookTime I + FIELD m name Ljava/lang/String; METHOD D_ update ()V + METHOD a getStack (I)Lnone/aeq; + ARG 0 slot + METHOD a setName (Ljava/lang/String;)V + ARG 0 name + METHOD a getCookTime (Lnone/aeq;)I + ARG 0 stack METHOD a getAvailableSlots (Lnone/cu;)[I METHOD a deserializeTag (Lnone/dt;)V + METHOD b getFuelTime (Lnone/aeq;)I + ARG 0 stack METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD h_ getName ()Ljava/lang/String; + METHOD l clearInventory ()V + METHOD m isBurning ()Z + METHOD n_ hasCustomName ()Z + METHOD t_ getInventorySize ()I + METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping index c77e2f2efc..ebae405cb4 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping @@ -1,7 +1,17 @@ CLASS none/aro net/minecraft/block/tile/impl/TileEntityHopper + FIELD a inventory Lnone/dc; + FIELD f name Ljava/lang/String; + FIELD g transferCooldown I METHOD D_ update ()V METHOD E getHopperX ()D METHOD F getHopperY ()D METHOD G getHopperZ ()D + METHOD a setName (Ljava/lang/String;)V + ARG 0 name METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD h_ getName ()Ljava/lang/String; + METHOD l clearInventory ()V + METHOD n_ hasCustomName ()Z + METHOD t_ getInventorySize ()I + METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping index 3f616c2cd2..04c17b09f5 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping @@ -2,3 +2,4 @@ CLASS none/arq net/minecraft/block/tile/impl/TileEntityMobSpawner METHOD D_ update ()V METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping b/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping index 98b51bcdf8..074e95801c 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping @@ -3,5 +3,7 @@ CLASS none/art net/minecraft/block/tile/impl/TileEntitySign METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; CLASS none/art$2 METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; + FIELD a text [Lnone/fa; METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping b/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping index 5447ccdfb5..35a044cd1c 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping @@ -1,4 +1,12 @@ CLASS none/aru net/minecraft/block/tile/impl/TileEntitySkull + FIELD a type I + FIELD f rotation I + FIELD g owner Lcom/mojang/authlib/GameProfile; METHOD D_ update ()V METHOD a deserializeTag (Lnone/dt;)V + METHOD b setRotation (I)V + ARG 0 otation METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; + METHOD e getType ()I + METHOD g getRotation ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping index 65ea1d3d6b..9a2c67627a 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping @@ -1,5 +1,29 @@ CLASS none/arv net/minecraft/block/tile/impl/TileEntityStructureBlock - CLASS none/arv$a + CLASS none/arv$a Mode + FIELD a SAVE Lnone/arv$a; + FIELD b LOAD Lnone/arv$a; + FIELD c CORNER Lnone/arv$a; + FIELD d DATA Lnone/arv$a; + FIELD e VALUES [Lnone/arv$a; + FIELD f translationKey Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;I)V METHOD m asString ()Ljava/lang/String; + METHOD values values ()[Lnone/arv$a; + FIELD a name Ljava/lang/String; + FIELD f author Ljava/lang/String; + FIELD g metadata Ljava/lang/String; + FIELD h pos Lnone/cn; + FIELD i size Lnone/cn; + FIELD j mirror Lnone/anw; + FIELD k rotation Lnone/apj; + FIELD l mode Lnone/arv$a; + FIELD m ignoreEntities Z + FIELD n powered Z + FIELD o showAir Z + FIELD p showBoundingBox Z + FIELD q integrity F + FIELD r seed J METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD c writeToTag ()Lnone/dt; + METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/net/minecraft/util/INameable.mapping b/mappings/net/minecraft/util/INameable.mapping new file mode 100644 index 0000000000..c2a6664072 --- /dev/null +++ b/mappings/net/minecraft/util/INameable.mapping @@ -0,0 +1,4 @@ +CLASS none/rg net/minecraft/util/INameable + METHOD h_ getName ()Ljava/lang/String; + METHOD i_ getNameComponent ()Lnone/fa; + METHOD n_ hasCustomName ()Z diff --git a/mappings/none/arp.mapping b/mappings/none/arp.mapping index c226e0e548..16ab1c54b0 100644 --- a/mappings/none/arp.mapping +++ b/mappings/none/arp.mapping @@ -1,3 +1,4 @@ CLASS none/arp METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; + METHOD i_ getNameComponent ()Lnone/fa;