From 4187af8c9ff90e2f38287ceb3d75aaa32f470ed6 Mon Sep 17 00:00:00 2001 From: asie Date: Fri, 16 Nov 2018 11:47:44 +0100 Subject: [PATCH] improve tick scheduler, registry, MathHelper mappings --- mappings/bqo.mapping | 5 +++++ .../world/DummyClientTickScheduler.mapping | 8 ++++++++ .../minecraft/util/math/MathHelper.mapping | 8 ++++++++ .../util/registry/IdRegistry.mapping | 4 ++++ ...ble.mapping => ModifiableRegistry.mapping} | 2 +- mappings/net/minecraft/world/IWorld.mapping | 1 + .../world/ScheduledBlockTick.mapping | 5 ----- .../net/minecraft/world/ScheduledTick.mapping | 7 +++++++ .../world/ServerTickScheduler.mapping | 19 +++++++++++++++++++ .../net/minecraft/world/TickScheduler.mapping | 6 ++++++ mappings/net/minecraft/world/World.mapping | 1 + .../world/level/LevelGeneratorType.mapping | 2 ++ mappings/un.mapping | 1 + mappings/uo.mapping | 5 +++++ 14 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 mappings/bqo.mapping create mode 100644 mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping rename mappings/net/minecraft/util/registry/{RegistryWritable.mapping => ModifiableRegistry.mapping} (76%) delete mode 100644 mappings/net/minecraft/world/ScheduledBlockTick.mapping create mode 100644 mappings/net/minecraft/world/ScheduledTick.mapping create mode 100644 mappings/net/minecraft/world/ServerTickScheduler.mapping create mode 100644 mappings/net/minecraft/world/TickScheduler.mapping create mode 100644 mappings/uo.mapping diff --git a/mappings/bqo.mapping b/mappings/bqo.mapping new file mode 100644 index 0000000000..1fe5a2f1dc --- /dev/null +++ b/mappings/bqo.mapping @@ -0,0 +1,5 @@ +CLASS bqo + METHOD a isScheduled (Les;Ljava/lang/Object;)Z + ARG 1 pos + ARG 2 tick + METHOD a schedule (Les;Ljava/lang/Object;ILbax;)V diff --git a/mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping b/mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping new file mode 100644 index 0000000000..0cebca5fe0 --- /dev/null +++ b/mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping @@ -0,0 +1,8 @@ +CLASS azv net/minecraft/client/world/DummyClientTickScheduler + FIELD a INSTANCE Lazv; + METHOD a get ()Lazv; + METHOD a isScheduled (Les;Ljava/lang/Object;)Z + ARG 1 pos + ARG 2 tick + METHOD a schedule (Les;Ljava/lang/Object;I)V + METHOD a schedule (Les;Ljava/lang/Object;ILbax;)V diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 1f19a844d3..29660e75fa 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -78,6 +78,10 @@ CLASS yk net/minecraft/util/math/MathHelper ARG 1 y ARG 2 z METHOD d lfloor (D)J + METHOD d lerp (DDD)D + ARG 0 partial + ARG 2 first + ARG 4 second METHOD d floor (F)I METHOD d packRgb (FFF)I ARG 0 r @@ -96,6 +100,10 @@ CLASS yk net/minecraft/util/math/MathHelper METHOD e log2 (I)I METHOD f ceil (D)I METHOD f ceil (F)I + METHOD f lerp (FFF)F + ARG 0 partial + ARG 1 first + ARG 2 second METHOD g wrapDegrees (D)D METHOD g wrapDegrees (F)F METHOD g isPowerOfTwo (I)Z diff --git a/mappings/net/minecraft/util/registry/IdRegistry.mapping b/mappings/net/minecraft/util/registry/IdRegistry.mapping index 2d9f6fe427..a4c99261e2 100644 --- a/mappings/net/minecraft/util/registry/IdRegistry.mapping +++ b/mappings/net/minecraft/util/registry/IdRegistry.mapping @@ -1,5 +1,9 @@ CLASS ff net/minecraft/util/registry/IdRegistry + FIELD B nextId I + FIELD a ID_LOGGER Lorg/apache/logging/log4j/Logger; FIELD b idStore Lya; + FIELD c objectMap Lcom/google/common/collect/BiMap; + FIELD d randomValueArray [Ljava/lang/Object; METHOD a getInt (I)Ljava/lang/Object; METHOD a set (ILpx;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 rawId diff --git a/mappings/net/minecraft/util/registry/RegistryWritable.mapping b/mappings/net/minecraft/util/registry/ModifiableRegistry.mapping similarity index 76% rename from mappings/net/minecraft/util/registry/RegistryWritable.mapping rename to mappings/net/minecraft/util/registry/ModifiableRegistry.mapping index 15565e4ddf..1645a9d059 100644 --- a/mappings/net/minecraft/util/registry/RegistryWritable.mapping +++ b/mappings/net/minecraft/util/registry/ModifiableRegistry.mapping @@ -1,4 +1,4 @@ -CLASS fn net/minecraft/util/registry/RegistryWritable +CLASS fn net/minecraft/util/registry/ModifiableRegistry METHOD a set (ILpx;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 rawId ARG 2 id diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index c6b081660a..7a24da0ee9 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -11,6 +11,7 @@ CLASS baf net/minecraft/world/IWorld METHOD ah getDifficulty ()Laet; METHOD g getLevelProperties ()Lcfx; METHOD g getLocalDifficulty (Les;)Laeu; + ARG 1 pos METHOD i getSaveHandler ()Lcfy; METHOD m getRandom ()Ljava/util/Random; METHOD s_ getSeed ()J diff --git a/mappings/net/minecraft/world/ScheduledBlockTick.mapping b/mappings/net/minecraft/world/ScheduledBlockTick.mapping deleted file mode 100644 index e67b6037ba..0000000000 --- a/mappings/net/minecraft/world/ScheduledBlockTick.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS baw net/minecraft/world/ScheduledBlockTick - FIELD a pos Les; - FIELD d id_counter J - FIELD f id J - METHOD a getBlock ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/ScheduledTick.mapping b/mappings/net/minecraft/world/ScheduledTick.mapping new file mode 100644 index 0000000000..2921aea1a0 --- /dev/null +++ b/mappings/net/minecraft/world/ScheduledTick.mapping @@ -0,0 +1,7 @@ +CLASS baw net/minecraft/world/ScheduledTick + FIELD a pos Les; + FIELD b time J + FIELD d id_counter J + FIELD e object Ljava/lang/Object; + FIELD f id J + METHOD a getObject ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/ServerTickScheduler.mapping b/mappings/net/minecraft/world/ServerTickScheduler.mapping new file mode 100644 index 0000000000..335f8e1250 --- /dev/null +++ b/mappings/net/minecraft/world/ServerTickScheduler.mapping @@ -0,0 +1,19 @@ +CLASS bat net/minecraft/world/ServerTickScheduler + FIELD b idToName Ljava/util/function/Function; + FIELD c nameToId Ljava/util/function/Function; + FIELD d ticksScheduled Ljava/util/Set; + FIELD e ticksScheduledOrdered Ljava/util/TreeSet; + FIELD f world Luf; + FIELD g ticksCurrent Ljava/util/List; + FIELD h tickConsumer Ljava/util/function/Consumer; + METHOD a toTag (Lazs;)Lhu; + ARG 1 chunkPos + ARG 3 currentTime + METHOD a isScheduled (Les;Ljava/lang/Object;)Z + ARG 1 pos + ARG 2 tick + METHOD a schedule (Les;Ljava/lang/Object;ILbax;)V + METHOD a fromTag (Lhu;)V + ARG 1 tag + METHOD b scheduleForced (Les;Ljava/lang/Object;ILbax;)V + METHOD c scheduleInternal (Les;Ljava/lang/Object;ILbax;)V diff --git a/mappings/net/minecraft/world/TickScheduler.mapping b/mappings/net/minecraft/world/TickScheduler.mapping new file mode 100644 index 0000000000..f0fcdcca3a --- /dev/null +++ b/mappings/net/minecraft/world/TickScheduler.mapping @@ -0,0 +1,6 @@ +CLASS bav net/minecraft/world/TickScheduler + METHOD a isScheduled (Les;Ljava/lang/Object;)Z + ARG 1 pos + ARG 2 tick + METHOD a schedule (Les;Ljava/lang/Object;I)V + METHOD a schedule (Les;Ljava/lang/Object;ILbax;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 4feeb0dc92..93fbf2d328 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -203,6 +203,7 @@ CLASS bae net/minecraft/world/World METHOD g getLevelProperties ()Lcfx; METHOD g getThunderGradient (F)F METHOD g getLocalDifficulty (Les;)Laeu; + ARG 1 pos METHOD h setThunderGradient (F)V METHOD i getSaveHandler ()Lcfy; METHOD i getRainGradient (F)F diff --git a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping index b692b381c4..5dbe771b50 100644 --- a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping +++ b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping @@ -10,6 +10,7 @@ CLASS ban net/minecraft/world/level/LevelGeneratorType FIELD i DEFAULT_1_1 Lban; FIELD j id I FIELD k name Ljava/lang/String; + FIELD l storedName Ljava/lang/String; FIELD m version I FIELD n visible Z FIELD o versioned Z @@ -24,6 +25,7 @@ CLASS ban net/minecraft/world/level/LevelGeneratorType METHOD a getTypeFromName (Ljava/lang/String;)Lban; ARG 0 name METHOD a setCustomizable (Z)Lban; + METHOD b getStoredName ()Ljava/lang/String; METHOD b setVisible (Z)Lban; METHOD c getTranslationKey ()Ljava/lang/String; METHOD d getInfoTranslationKey ()Ljava/lang/String; diff --git a/mappings/un.mapping b/mappings/un.mapping index db6d495fcf..6e852d8c88 100644 --- a/mappings/un.mapping +++ b/mappings/un.mapping @@ -31,6 +31,7 @@ CLASS un METHOD f getBlockEntity (Les;)Lbmc; METHOD g getLevelProperties ()Lcfx; METHOD g getLocalDifficulty (Les;)Laeu; + ARG 1 pos METHOD i getSaveHandler ()Lcfy; METHOD m getRandom ()Ljava/util/Random; METHOD r_ getSeaLevel ()I diff --git a/mappings/uo.mapping b/mappings/uo.mapping new file mode 100644 index 0000000000..f39a715fbe --- /dev/null +++ b/mappings/uo.mapping @@ -0,0 +1,5 @@ +CLASS uo + METHOD a isScheduled (Les;Ljava/lang/Object;)Z + ARG 1 pos + ARG 2 tick + METHOD a schedule (Les;Ljava/lang/Object;ILbax;)V