From 59b928b2116b60b1ec011104ae1954ae4da4e349 Mon Sep 17 00:00:00 2001 From: Mekal Covic <46117728+valoeghese@users.noreply.github.com> Date: Tue, 13 Apr 2021 21:52:43 +1300 Subject: [PATCH] fix #57 (#58) * fix #57 * update build number --- build.gradle | 2 +- mappings/net/minecraft/class_445.mapping | 7 ----- mappings/net/minecraft/class_53.mapping | 2 -- mappings/net/minecraft/class_96.mapping | 7 ----- .../net/minecraft/client/Minecraft.mapping | 1 + .../client/render/GameRenderer.mapping | 9 ++++++ mappings/net/minecraft/item/MapItem.mapping | 2 ++ mappings/net/minecraft/level/Level.mapping | 6 ++++ .../net/minecraft/level/LevelData.mapping | 15 ++++++++++ .../net/minecraft/level/chunk/Chunk.mapping | 8 +++++ .../level/chunk/ChunkSubData.mapping | 1 + .../level/chunk/DimensionFileChunkIO.mapping | 10 +++++++ .../level/dimension/Dimension.mapping | 9 +++++- .../level/storage/MapStorageBase.mapping | 9 ++++++ .../network/ClientPlayNetworkHandler.mapping | 1 + .../net/minecraft/stat/StatManager.mapping | 29 +++++++++++++++++++ .../net/minecraft/stat/StatSyncher.mapping | 2 ++ .../minecraft/util/ProgressListener.mapping | 2 ++ .../util/ProgressListenerImpl.mapping | 3 ++ 19 files changed, 107 insertions(+), 18 deletions(-) delete mode 100644 mappings/net/minecraft/class_445.mapping delete mode 100644 mappings/net/minecraft/class_53.mapping delete mode 100644 mappings/net/minecraft/class_96.mapping create mode 100644 mappings/net/minecraft/level/LevelData.mapping create mode 100644 mappings/net/minecraft/level/chunk/ChunkSubData.mapping create mode 100644 mappings/net/minecraft/level/chunk/DimensionFileChunkIO.mapping create mode 100644 mappings/net/minecraft/stat/StatManager.mapping diff --git a/build.gradle b/build.gradle index 94198c98..abc33f88 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ def minecraft_version = "b1.7.3" def ENV = System.getenv() //def build_number = ENV.BUILD_NUMBER ?: "local" -def build_number = 14 +def build_number = 15 def yarnVersion = "${minecraft_version}+build.$build_number" diff --git a/mappings/net/minecraft/class_445.mapping b/mappings/net/minecraft/class_445.mapping deleted file mode 100644 index 2cef47ec..00000000 --- a/mappings/net/minecraft/class_445.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_445 - METHOD (Ljava/io/File;Z)V - ARG 1 file - METHOD method_1480 (Lnet/minecraft/class_43;Lnet/minecraft/class_18;Lnet/minecraft/class_8;)V - ARG 0 chunk - ARG 1 level - ARG 2 tag diff --git a/mappings/net/minecraft/class_53.mapping b/mappings/net/minecraft/class_53.mapping deleted file mode 100644 index a4a34a9b..00000000 --- a/mappings/net/minecraft/class_53.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_53 - FIELD field_550 dimensionData Lnet/minecraft/class_52; diff --git a/mappings/net/minecraft/class_96.mapping b/mappings/net/minecraft/class_96.mapping deleted file mode 100644 index 752728c4..00000000 --- a/mappings/net/minecraft/class_96.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_96 - FIELD field_2607 syncher Lnet/minecraft/class_605; - METHOD (Lnet/minecraft/class_237;Ljava/io/File;)V - ARG 1 session - ARG 2 file - METHOD method_1990 incrementStat (Lnet/minecraft/class_139;I)V - METHOD method_1996 tick ()V diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 072a4a60..a8eb424a 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/client/Minecraft net/minecraft/client/Minecraft FIELD field_2829 minecraft Lnet/minecraft/client/Minecraft; FIELD field_2766 soundHelper Lnet/minecraft/class_617; FIELD field_2768 texturePackManager Lnet/minecraft/class_303; + FIELD field_2773 statManager Lnet/minecraft/class_96; FIELD field_2774 running Z FIELD field_2775 fpsDebugString Ljava/lang/String; FIELD field_2780 lastTickTime J diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 7fa0260d..78f9f68c 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -1,6 +1,15 @@ CLASS net/minecraft/class_555 net/minecraft/client/render/GameRenderer + FIELD field_2336 random Ljava/util/Random; + FIELD field_2342 handItemRenderer Lnet/minecraft/class_556; + FIELD field_2346 r F + FIELD field_2347 g F + FIELD field_2348 b F FIELD field_2349 minecraft Lnet/minecraft/client/Minecraft; FIELD field_2353 cinematicPitchSmoother Lnet/minecraft/class_12; FIELD field_2354 cinematicYawSmoother Lnet/minecraft/class_12; METHOD method_1844 (F)V ARG 1 delta + METHOD method_1847 renderWeather (F)V + ARG 1 tickDelta + METHOD method_1852 renderSkyBase (F)V + ARG 1 tickDelta diff --git a/mappings/net/minecraft/item/MapItem.mapping b/mappings/net/minecraft/item/MapItem.mapping index b8038216..1820ceb3 100644 --- a/mappings/net/minecraft/item/MapItem.mapping +++ b/mappings/net/minecraft/item/MapItem.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_125 net/minecraft/item/MapItem + METHOD method_1730 (Lnet/minecraft/class_31;Lnet/minecraft/class_18;)Lnet/minecraft/class_198; + ARG 2 level diff --git a/mappings/net/minecraft/level/Level.mapping b/mappings/net/minecraft/level/Level.mapping index 7c8648e9..276731a9 100644 --- a/mappings/net/minecraft/level/Level.mapping +++ b/mappings/net/minecraft/level/Level.mapping @@ -12,10 +12,12 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level FIELD field_208 thunderGradient F FIELD field_213 difficulty I FIELD field_214 rand Ljava/util/Random; + FIELD field_215 generating Z FIELD field_216 dimension Lnet/minecraft/class_50; FIELD field_218 cache Lnet/minecraft/class_51; FIELD field_219 dimensionData Lnet/minecraft/class_52; FIELD field_220 properties Lnet/minecraft/class_7; + FIELD field_222 data Lnet/minecraft/class_53; METHOD (Lnet/minecraft/class_18;Lnet/minecraft/class_50;)V ARG 1 level ARG 2 dimension @@ -66,6 +68,7 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level METHOD method_191 playSound (Lnet/minecraft/class_57;Ljava/lang/String;FF)V METHOD method_195 saveLevel (ZLnet/minecraft/class_62;)V ARG 2 listener + METHOD method_197 createLevelSource ()Lnet/minecraft/class_51; METHOD method_200 setTileInChunk (IIII)Z ARG 1 x ARG 2 y @@ -74,6 +77,8 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level METHOD method_202 updateRedstone (IIIIII)V METHOD method_210 spawnEntity (Lnet/minecraft/class_57;)Z METHOD method_211 getEntities (Lnet/minecraft/class_57;Lnet/minecraft/class_25;)Ljava/util/List; + METHOD method_212 computeSpawnPosition ()V + METHOD method_213 getThunderGradient (F)F METHOD method_214 getChunkFromCache (II)Lnet/minecraft/class_43; ARG 1 x ARG 2 z @@ -131,6 +136,7 @@ CLASS net/minecraft/class_18 net/minecraft/level/Level METHOD method_276 setSpawnPosition (Lnet/minecraft/class_63;)V METHOD method_277 addPlayer (Lnet/minecraft/class_54;)V ARG 1 player + METHOD method_284 getSkyColour (F)Lnet/minecraft/class_26; METHOD method_289 setRainGradient (F)V ARG 1 gradient METHOD method_293 disconnect ()V diff --git a/mappings/net/minecraft/level/LevelData.mapping b/mappings/net/minecraft/level/LevelData.mapping new file mode 100644 index 00000000..5570f20c --- /dev/null +++ b/mappings/net/minecraft/level/LevelData.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_53 net/minecraft/level/LevelData + FIELD field_550 dimensionData Lnet/minecraft/class_52; + FIELD field_551 mapStorages Ljava/util/Map; + FIELD field_552 mapStorageValues Ljava/util/List; + METHOD (Lnet/minecraft/class_52;)V + ARG 1 data + METHOD method_523 flush ()V + METHOD method_524 writeToFile (Lnet/minecraft/class_58;)V + ARG 1 mapStorage + METHOD method_525 getOrCreateMapStorage (Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/class_58; + ARG 1 mapStorageClass + ARG 2 name + METHOD method_527 setMapStorage (Ljava/lang/String;Lnet/minecraft/class_58;)V + ARG 1 key + ARG 2 storage diff --git a/mappings/net/minecraft/level/chunk/Chunk.mapping b/mappings/net/minecraft/level/chunk/Chunk.mapping index 9e0d6de8..f5eb7f6d 100644 --- a/mappings/net/minecraft/level/chunk/Chunk.mapping +++ b/mappings/net/minecraft/level/chunk/Chunk.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_43 net/minecraft/level/chunk/Chunk FIELD field_954 tiles [B FIELD field_956 level Lnet/minecraft/class_18; + FIELD field_957 data Lnet/minecraft/class_257; + FIELD field_958 skylight Lnet/minecraft/class_257; + FIELD field_959 blocklight Lnet/minecraft/class_257; FIELD field_960 heightmap [B FIELD field_962 x I FIELD field_963 z I @@ -11,6 +14,11 @@ CLASS net/minecraft/class_43 net/minecraft/level/chunk/Chunk ARG 1 level ARG 2 x ARG 3 z + METHOD (Lnet/minecraft/class_18;[BII)V + ARG 1 level + ARG 2 tiles + ARG 3 x + ARG 4 z METHOD method_859 getTileId (III)I ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/level/chunk/ChunkSubData.mapping b/mappings/net/minecraft/level/chunk/ChunkSubData.mapping new file mode 100644 index 00000000..0908d988 --- /dev/null +++ b/mappings/net/minecraft/level/chunk/ChunkSubData.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_257 net/minecraft/level/chunk/ChunkSubData diff --git a/mappings/net/minecraft/level/chunk/DimensionFileChunkIO.mapping b/mappings/net/minecraft/level/chunk/DimensionFileChunkIO.mapping new file mode 100644 index 00000000..ca771eea --- /dev/null +++ b/mappings/net/minecraft/level/chunk/DimensionFileChunkIO.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_445 net/minecraft/level/chunk/DimensionFileChunkIO + METHOD (Ljava/io/File;Z)V + ARG 1 file + METHOD method_1479 loadChunk (Lnet/minecraft/class_18;Lnet/minecraft/class_8;)Lnet/minecraft/class_43; + ARG 0 level + ARG 1 tag + METHOD method_1480 (Lnet/minecraft/class_43;Lnet/minecraft/class_18;Lnet/minecraft/class_8;)V + ARG 0 chunk + ARG 1 level + ARG 2 tag diff --git a/mappings/net/minecraft/level/dimension/Dimension.mapping b/mappings/net/minecraft/level/dimension/Dimension.mapping index fbf69012..37bcad54 100644 --- a/mappings/net/minecraft/level/dimension/Dimension.mapping +++ b/mappings/net/minecraft/level/dimension/Dimension.mapping @@ -1,10 +1,17 @@ CLASS net/minecraft/class_50 net/minecraft/level/dimension/Dimension FIELD field_2173 level Lnet/minecraft/class_18; FIELD field_2174 biomeSource Lnet/minecraft/class_519; + FIELD field_2175 hasFog Z + FIELD field_2179 id I + METHOD method_1762 getSkyColour (FF)Lnet/minecraft/class_26; + ARG 1 temperature + ARG 2 humidity METHOD method_1763 renderAsSkylands ()Z + METHOD method_1764 getCloudHeight ()F METHOD method_1766 canPlayerSleep ()Z METHOD method_1767 getByID (I)Lnet/minecraft/class_50; ARG 0 id - METHOD method_1768 (Lnet/minecraft/class_18;)V + METHOD method_1768 setLevel (Lnet/minecraft/class_18;)V ARG 1 level + METHOD method_1769 createBiomeSource ()V METHOD method_1772 createLevelSource ()Lnet/minecraft/class_51; diff --git a/mappings/net/minecraft/level/storage/MapStorageBase.mapping b/mappings/net/minecraft/level/storage/MapStorageBase.mapping index bb5789bd..4bb371e3 100644 --- a/mappings/net/minecraft/level/storage/MapStorageBase.mapping +++ b/mappings/net/minecraft/level/storage/MapStorageBase.mapping @@ -1,4 +1,13 @@ CLASS net/minecraft/class_58 net/minecraft/level/storage/MapStorageBase + FIELD field_574 name Ljava/lang/String; + FIELD field_575 dirty Z + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD method_544 markDirty ()V METHOD method_545 fromTag (Lnet/minecraft/class_8;)V ARG 1 tag + METHOD method_546 setDirty (Z)V + ARG 1 dirty + METHOD method_547 isDirty ()Z METHOD method_548 toTag (Lnet/minecraft/class_8;)V + ARG 1 tag diff --git a/mappings/net/minecraft/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/network/ClientPlayNetworkHandler.mapping index 2b6af1a5..8e7698ba 100644 --- a/mappings/net/minecraft/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/network/ClientPlayNetworkHandler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_219 net/minecraft/network/ClientPlayNetworkHandler + FIELD field_1968 levelData Lnet/minecraft/class_53; FIELD field_1969 rand Ljava/util/Random; FIELD field_1970 disconnected Z FIELD field_1971 netHandler Lnet/minecraft/class_117; diff --git a/mappings/net/minecraft/stat/StatManager.mapping b/mappings/net/minecraft/stat/StatManager.mapping new file mode 100644 index 00000000..07663a56 --- /dev/null +++ b/mappings/net/minecraft/stat/StatManager.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_96 net/minecraft/stat/StatManager + FIELD field_2604 achievements Ljava/util/Map; + FIELD field_2605 stats Ljava/util/Map; + FIELD field_2606 dirty Z + FIELD field_2607 syncher Lnet/minecraft/class_605; + METHOD (Lnet/minecraft/class_237;Ljava/io/File;)V + ARG 1 session + ARG 2 file + METHOD method_1983 getStats ()Ljava/util/Map; + METHOD method_1984 method_1984 (Ljava/lang/String;)Ljava/util/Map; + METHOD method_1985 getDebugString (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String; + ARG 0 username + ARG 1 sessionId + METHOD method_1986 loadAchievementsFrom (Ljava/util/Map;)V + ARG 1 stats + METHOD method_1987 setStat (Ljava/util/Map;Lnet/minecraft/class_139;I)V + METHOD method_1988 hasAchievement (Lnet/minecraft/class_24;)Z + ARG 1 achievement + METHOD method_1989 getStatAmount (Lnet/minecraft/class_139;)I + ARG 1 stat + METHOD method_1990 incrementStat (Lnet/minecraft/class_139;I)V + ARG 1 stat + ARG 2 amount + METHOD method_1993 canGetAchievement (Lnet/minecraft/class_24;)Z + ARG 1 achievement + METHOD method_1994 sync ()V + METHOD method_1995 loadStatsFrom (Ljava/util/Map;)V + ARG 1 stats + METHOD method_1996 tick ()V diff --git a/mappings/net/minecraft/stat/StatSyncher.mapping b/mappings/net/minecraft/stat/StatSyncher.mapping index 57a4c095..79181461 100644 --- a/mappings/net/minecraft/stat/StatSyncher.mapping +++ b/mappings/net/minecraft/stat/StatSyncher.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_605 net/minecraft/stat/StatSyncher FIELD field_2725 session Lnet/minecraft/class_237; METHOD method_2051 getStatsFromServer ()V METHOD method_2060 saveStats (Ljava/util/Map;)V + METHOD method_2061 sync (Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V + METHOD method_2064 sync (Ljava/util/Map;)V diff --git a/mappings/net/minecraft/util/ProgressListener.mapping b/mappings/net/minecraft/util/ProgressListener.mapping index 294e9e23..a9931bda 100644 --- a/mappings/net/minecraft/util/ProgressListener.mapping +++ b/mappings/net/minecraft/util/ProgressListener.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_62 net/minecraft/util/ProgressListener METHOD method_1794 progressStagePercentage (I)V METHOD method_1795 notifyIgnoreGameRunning (Ljava/lang/String;)V ARG 1 message + METHOD method_1796 notifySubMessage (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/util/ProgressListenerImpl.mapping b/mappings/net/minecraft/util/ProgressListenerImpl.mapping index 2b902931..687a93ac 100644 --- a/mappings/net/minecraft/util/ProgressListenerImpl.mapping +++ b/mappings/net/minecraft/util/ProgressListenerImpl.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_452 net/minecraft/util/ProgressListenerImpl + FIELD field_1714 submessage Ljava/lang/String; FIELD field_1715 minecraft Lnet/minecraft/client/Minecraft; FIELD field_1716 message Ljava/lang/String; + FIELD field_1717 lastTimeMillis J FIELD field_1718 ignoreGameRunning Z METHOD (Lnet/minecraft/client/Minecraft;)V ARG 1 minecraft METHOD method_1491 notifyWithGameRunning (Ljava/lang/String;)V ARG 1 message METHOD method_1492 notify (Ljava/lang/String;)V + ARG 1 message