From d9447e37cc8d9824b554e498c274665e8bc5a857 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Sun, 29 Sep 2019 20:46:25 +0300 Subject: [PATCH] Randoms and datafixers (#871) * Some random mappings * Revert block tick method renames --- mappings/net/minecraft/block/BambooBlock.mapping | 2 +- mappings/net/minecraft/block/Block.mapping | 4 +++- mappings/net/minecraft/block/BlockState.mapping | 6 ++++-- mappings/net/minecraft/block/Fertilizable.mapping | 1 + mappings/net/minecraft/block/RedstoneTorchBlock.mapping | 2 +- mappings/net/minecraft/datafixer/fixes/LeavesFix.mapping | 1 - .../net/minecraft/datafixer/fixes/PoiRebuildFix.mapping | 1 - .../net/minecraft/datafixers/fixes/BiomeFormatFix.mapping | 4 ++++ .../net/minecraft/datafixers/fixes/PoiRebuildFix.mapping | 4 ++++ mappings/net/minecraft/entity/LivingEntity.mapping | 2 +- mappings/net/minecraft/util/registry/Registry.mapping | 2 +- 11 files changed, 20 insertions(+), 9 deletions(-) delete mode 100644 mappings/net/minecraft/datafixer/fixes/LeavesFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/fixes/PoiRebuildFix.mapping create mode 100644 mappings/net/minecraft/datafixers/fixes/BiomeFormatFix.mapping create mode 100644 mappings/net/minecraft/datafixers/fixes/PoiRebuildFix.mapping diff --git a/mappings/net/minecraft/block/BambooBlock.mapping b/mappings/net/minecraft/block/BambooBlock.mapping index f436d110d8..89b7d918b1 100644 --- a/mappings/net/minecraft/block/BambooBlock.mapping +++ b/mappings/net/minecraft/block/BambooBlock.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2211 net/minecraft/block/BambooBlock ARG 1 state ARG 2 world ARG 3 pos - ARG 4 rand + ARG 4 random ARG 5 height METHOD method_9386 countBambooBelow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 world diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 3ef1053f0f..febe024d89 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -108,7 +108,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 world ARG 3 pos - ARG 4 rnd + ARG 4 random METHOD method_9497 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 state ARG 1 world @@ -150,6 +150,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 5 stack METHOD method_9514 onRandomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state + ARG 2 world ARG 3 pos ARG 4 random METHOD method_9515 appendProperties (Lnet/minecraft/class_2689$class_2690;)V @@ -378,6 +379,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 3 explosion METHOD method_9588 onScheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state + ARG 2 world ARG 3 pos ARG 4 random METHOD method_9590 setDefaultState (Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 4ee0d9788e..faa39198a5 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -47,8 +47,9 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 4 data METHOD method_11584 hasComparatorOutput ()Z METHOD method_11585 scheduledTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V + ARG 1 world ARG 2 pos - ARG 3 rnd + ARG 3 random METHOD method_11586 getPistonBehavior ()Lnet/minecraft/class_3619; METHOD method_11587 canReplace (Lnet/minecraft/class_1750;)Z ARG 1 ctx @@ -135,8 +136,9 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 1 view ARG 2 pos METHOD method_11624 onRandomTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V + ARG 1 world ARG 2 pos - ARG 3 rnd + ARG 3 random METHOD method_11625 getTopMaterialColor (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3620; ARG 1 view ARG 2 pos diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index f892a0c132..bb861f3e76 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable ARG 3 state ARG 4 isClient METHOD method_9652 grow (Lnet/minecraft/class_3218;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 world ARG 2 random ARG 3 pos ARG 4 state diff --git a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping index 7c9e4d2a5b..5c388ae319 100644 --- a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping @@ -21,5 +21,5 @@ CLASS net/minecraft/class_2459 net/minecraft/block/RedstoneTorchBlock ARG 0 state ARG 1 world ARG 2 pos - ARG 3 rand + ARG 3 random ARG 4 unpower diff --git a/mappings/net/minecraft/datafixer/fixes/LeavesFix.mapping b/mappings/net/minecraft/datafixer/fixes/LeavesFix.mapping deleted file mode 100644 index 7b83516084..0000000000 --- a/mappings/net/minecraft/datafixer/fixes/LeavesFix.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4541 net/minecraft/datafixer/fixes/LeavesFix diff --git a/mappings/net/minecraft/datafixer/fixes/PoiRebuildFix.mapping b/mappings/net/minecraft/datafixer/fixes/PoiRebuildFix.mapping deleted file mode 100644 index 89ee3996de..0000000000 --- a/mappings/net/minecraft/datafixer/fixes/PoiRebuildFix.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4542 net/minecraft/datafixer/fixes/PoiRebuildFix diff --git a/mappings/net/minecraft/datafixers/fixes/BiomeFormatFix.mapping b/mappings/net/minecraft/datafixers/fixes/BiomeFormatFix.mapping new file mode 100644 index 0000000000..e7867b4d49 --- /dev/null +++ b/mappings/net/minecraft/datafixers/fixes/BiomeFormatFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4541 net/minecraft/datafixers/fixes/BiomeFormatFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 schema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/PoiRebuildFix.mapping b/mappings/net/minecraft/datafixers/fixes/PoiRebuildFix.mapping new file mode 100644 index 0000000000..bed4486cf0 --- /dev/null +++ b/mappings/net/minecraft/datafixers/fixes/PoiRebuildFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4542 net/minecraft/datafixers/fixes/PoiRebuildFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 schema + ARG 2 changesType diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 064330bffe..7efd75a5b7 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -229,7 +229,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6049 canHaveStatusEffect (Lnet/minecraft/class_1293;)Z ARG 1 effect METHOD method_6050 tickStatusEffects ()V - METHOD method_6051 getRand ()Ljava/util/Random; + METHOD method_6051 getRandom ()Ljava/util/Random; METHOD method_6052 getAttacking ()Lnet/minecraft/class_1309; METHOD method_6053 initAi ()V METHOD method_6054 canDropLootAndXp ()Z diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 5509ea29b1..81131da5d8 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -63,7 +63,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; - ARG 1 rand + ARG 1 random METHOD method_10247 create (Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 id METHOD method_10249 getRawId (Ljava/lang/Object;)I