From 18defd5bb95decad1af73fdc550cd3c37aa0e44c Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 28 Aug 2016 23:10:48 +0200 Subject: [PATCH] world, renderer improvements --- .../net/minecraft/client/GameSettings.mapping | 6 +++ .../client/audio/SoundLoader.mapping | 6 +-- .../client/render/VertexBuffer.mapping | 35 ++++++++++++- .../client/render/VertexFormat.mapping | 32 ++++++++++++ .../client/render/VertexFormatElement.mapping | 52 +++++++++++++++++++ .../client/render/WorldRenderer.mapping | 6 +++ .../client/sortme/SomeBufferUtils.mapping | 7 +++ .../client/texture/TextureManager.mapping | 3 ++ .../net/minecraft/realms/RealmsBridge.mapping | 1 - .../sortme/SomeTextFormattingHelper.mapping | 4 -- ...World.mapping => WidgetWorldEntry.mapping} | 5 +- mappings/net/minecraft/util/TextUtils.mapping | 8 +++ .../minecraft/world/WorldProperties.mapping | 12 ++--- .../storage}/IWorldStorage.mapping | 3 +- .../storage/WorldStorageAnvil.mapping} | 6 ++- .../storage/WorldStorageOld.mapping} | 7 +-- .../storage}/WorldSummary.mapping | 13 +++-- 17 files changed, 181 insertions(+), 25 deletions(-) create mode 100644 mappings/net/minecraft/client/render/VertexFormat.mapping create mode 100644 mappings/net/minecraft/client/render/VertexFormatElement.mapping create mode 100644 mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping delete mode 100644 mappings/net/minecraft/realms/RealmsBridge.mapping delete mode 100644 mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping rename mappings/net/minecraft/sortme/{GuiWorldSelectWorld.mapping => WidgetWorldEntry.mapping} (69%) create mode 100644 mappings/net/minecraft/util/TextUtils.mapping rename mappings/net/minecraft/{sortme => world/storage}/IWorldStorage.mapping (86%) rename mappings/net/minecraft/{sortme/WorldAnvilStorage.mapping => world/storage/WorldStorageAnvil.mapping} (70%) rename mappings/net/minecraft/{sortme/WorldOldFormatStorage.mapping => world/storage/WorldStorageOld.mapping} (85%) rename mappings/net/minecraft/{sortme => world/storage}/WorldSummary.mapping (67%) diff --git a/mappings/net/minecraft/client/GameSettings.mapping b/mappings/net/minecraft/client/GameSettings.mapping index ce0e7eb198..9c31120a02 100644 --- a/mappings/net/minecraft/client/GameSettings.mapping +++ b/mappings/net/minecraft/client/GameSettings.mapping @@ -131,6 +131,12 @@ CLASS none/bdq net/minecraft/client/GameSettings METHOD a load ()V METHOD a parseFloat (Ljava/lang/String;)F ARG 0 s + METHOD a get (Lnone/bdq$a;)F + ARG 0 option + METHOD a (Lnone/bdq$a;I)V + ARG 0 option METHOD b write ()V + METHOD b isEnabled (Lnone/bdq$a;)Z + ARG 0 option METHOD c getTranslatedName (Lnone/bdq$a;)Ljava/lang/String; ARG 0 option diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index 96435aef0e..39d614cd9b 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -7,9 +7,9 @@ CLASS none/cau net/minecraft/client/audio/SoundLoader FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c GSON Lcom/google/gson/Gson; FIELD d TYPE Ljava/lang/reflect/ParameterizedType; - FIELD e REGISTRY Lnone/cav; - FIELD f SOUND_MANAGER Lnone/cas; - FIELD g RESOURCE_MANAGER Lnone/bya; + FIELD e registry Lnone/cav; + FIELD f soundManager Lnone/cas; + FIELD g resourceManager Lnone/bya; METHOD (Lnone/bya;Lnone/bdq;)V ARG 0 manager ARG 1 settings diff --git a/mappings/net/minecraft/client/render/VertexBuffer.mapping b/mappings/net/minecraft/client/render/VertexBuffer.mapping index 8aea7903fb..fac72736fa 100644 --- a/mappings/net/minecraft/client/render/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/render/VertexBuffer.mapping @@ -4,9 +4,42 @@ CLASS none/bok net/minecraft/client/render/VertexBuffer FIELD c bufInt Ljava/nio/IntBuffer; FIELD d bufShort Ljava/nio/ShortBuffer; FIELD e bufFloat Ljava/nio/FloatBuffer; + FIELD f vertexes I + FIELD g currentElement Lnone/bxm; + FIELD h currentElementId I + FIELD k offsetX D + FIELD l offsetY D + FIELD m offsetZ D + FIELD n format Lnone/bxl; + FIELD o building Z METHOD a texture (DD)Lnone/bok; + METHOD a (FFF)V METHOD a color (FFFF)Lnone/bok; + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD a begin (ILnone/bxl;)V + ARG 1 format + METHOD a restoreState (Lnone/bok$a;)V + METHOD b clear ()V METHOD b pos (DDD)Lnone/bok; + METHOD b growBuffer (I)V + ARG 0 amount METHOD b color (IIII)Lnone/bok; - METHOD d end ()V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha + METHOD c setOffset (DDD)V + ARG 0 x + ARG 1 y + ARG 2 z + METHOD c normal (FFF)Lnone/bok; + METHOD d endVertex ()V + METHOD e end ()V + METHOD f getByteBuffer ()Ljava/nio/ByteBuffer; + METHOD g getVertexFormat ()Lnone/bxl; + METHOD h getVertexCount ()I + METHOD i getDrawMode ()I + METHOD k nextElement ()V diff --git a/mappings/net/minecraft/client/render/VertexFormat.mapping b/mappings/net/minecraft/client/render/VertexFormat.mapping new file mode 100644 index 0000000000..cc0f6571d3 --- /dev/null +++ b/mappings/net/minecraft/client/render/VertexFormat.mapping @@ -0,0 +1,32 @@ +CLASS none/bxl net/minecraft/client/render/VertexFormat + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b elements Ljava/util/List; + FIELD c offsets Ljava/util/List; + FIELD d size I + FIELD e offsetColor I + FIELD f offsetsUv Ljava/util/List; + FIELD g offsetNormal I + METHOD (Lnone/bxl;)V + ARG 0 format + METHOD a clear ()V + METHOD a hasUvElement (I)Z + ARG 0 id + METHOD a add (Lnone/bxm;)Lnone/bxl; + ARG 0 element + METHOD b hasNormalElement ()Z + METHOD b getUvOffset (I)I + ARG 0 id + METHOD c getNormalOffset ()I + METHOD c getElement (I)Lnone/bxm; + ARG 0 id + METHOD d hasColorElement ()Z + METHOD d getElementOffset (I)I + ARG 0 id + METHOD e getColorOffset ()I + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other + METHOD f getVertexSizeInteger ()I + METHOD g getVertexSize ()I + METHOD h getElements ()Ljava/util/List; + METHOD i getElementCount ()I + METHOD j hasPositionElement ()Z diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping new file mode 100644 index 0000000000..55f3b6df46 --- /dev/null +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -0,0 +1,52 @@ +CLASS none/bxm net/minecraft/client/render/VertexFormatElement + CLASS none/bxm$a Format + FIELD a FLOAT Lnone/bxm$a; + FIELD b UNSIGNED_BYTE Lnone/bxm$a; + FIELD c BYTE Lnone/bxm$a; + FIELD d UNSIGNED_SHORT Lnone/bxm$a; + FIELD e SHORT Lnone/bxm$a; + FIELD f UNSIGNED_INT Lnone/bxm$a; + FIELD g INT Lnone/bxm$a; + FIELD h id I + FIELD i name Ljava/lang/String; + FIELD j glId I + METHOD (Ljava/lang/String;IILjava/lang/String;I)V + ARG 0 id + ARG 1 name + ARG 2 glId + METHOD a getId ()I + METHOD b getName ()Ljava/lang/String; + METHOD c getGlId ()I + CLASS none/bxm$b Type + FIELD a POSITION Lnone/bxm$b; + FIELD b NORMAL Lnone/bxm$b; + FIELD c COLOR Lnone/bxm$b; + FIELD d UV Lnone/bxm$b; + FIELD e BONE_MATRIX Lnone/bxm$b; + FIELD f BLEND_WEIGHT Lnone/bxm$b; + FIELD g PADDING Lnone/bxm$b; + FIELD h name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name + METHOD a getName ()Ljava/lang/String; + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b format Lnone/bxm$a; + FIELD c type Lnone/bxm$b; + FIELD d index I + FIELD e count I + METHOD (ILnone/bxm$a;Lnone/bxm$b;I)V + ARG 0 index + ARG 1 format + ARG 2 type + ARG 3 count + METHOD a getFormat ()Lnone/bxm$a; + METHOD a isValidType (ILnone/bxm$b;)Z + ARG 0 index + ARG 1 type + METHOD b getType ()Lnone/bxm$b; + METHOD c getCount ()I + METHOD d getIndex ()I + METHOD e getSize ()I + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other + METHOD f isPosition ()Z diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 90ab586bfb..06c855db10 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,7 +1,13 @@ CLASS none/boq net/minecraft/client/render/WorldRenderer FIELD a anaglyphEnabled Z FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + FIELD f RAIN_LOC Lnone/kp; + FIELD g SNOW_LOC Lnone/kp; FIELD h mc Lnone/bdo; + FIELD i resourceContainer Lnone/bya; + METHOD (Lnone/bdo;Lnone/bya;)V + ARG 0 mc + ARG 1 resourceContainer METHOD a (FJ)V ARG 0 deltaTicks METHOD a onResourceReload (Lnone/bya;)V diff --git a/mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping b/mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping new file mode 100644 index 0000000000..73a55cffa8 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping @@ -0,0 +1,7 @@ +CLASS none/bdn net/minecraft/client/sortme/SomeBufferUtils + METHOD c allocateByteBuffer (I)Ljava/nio/ByteBuffer; + ARG 0 size + METHOD f allocateIntBuffer (I)Ljava/nio/IntBuffer; + ARG 0 size + METHOD h allocateFloatBuffer (I)Ljava/nio/FloatBuffer; + ARG 0 size diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 57a2082759..d73ed436b1 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -6,6 +6,9 @@ CLASS none/bxc net/minecraft/client/texture/TextureManager ARG 0 container METHOD a bindTexture (Lnone/kp;)V ARG 0 id + METHOD a registerTexture (Lnone/kp;Lnone/bxd;)Z + ARG 0 id + ARG 1 texture METHOD a (Lnone/kp;Lnone/bxg;)Z ARG 0 id METHOD b getTexture (Lnone/kp;)Lnone/bxd; diff --git a/mappings/net/minecraft/realms/RealmsBridge.mapping b/mappings/net/minecraft/realms/RealmsBridge.mapping deleted file mode 100644 index ca3c07a2bd..0000000000 --- a/mappings/net/minecraft/realms/RealmsBridge.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/realms/RealmsBridge net/minecraft/realms/RealmsBridge diff --git a/mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping b/mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping deleted file mode 100644 index d7d01204d5..0000000000 --- a/mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/ow net/minecraft/sortme/SomeTextFormattingHelper - FIELD a PATTERN Ljava/util/regex/Pattern; - METHOD a removeFormatting (Ljava/lang/String;)Ljava/lang/String; - ARG 0 text diff --git a/mappings/net/minecraft/sortme/GuiWorldSelectWorld.mapping b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping similarity index 69% rename from mappings/net/minecraft/sortme/GuiWorldSelectWorld.mapping rename to mappings/net/minecraft/sortme/WidgetWorldEntry.mapping index a5ad6b04e4..01a179dc76 100644 --- a/mappings/net/minecraft/sortme/GuiWorldSelectWorld.mapping +++ b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping @@ -1,13 +1,16 @@ -CLASS none/biw net/minecraft/sortme/GuiWorldSelectWorld +CLASS none/biw net/minecraft/sortme/WidgetWorldEntry CLASS none/biw$1 METHOD a handle (ZI)V CLASS none/biw$2 METHOD a handle (ZI)V FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b DATE_FORMAT Ljava/text/DateFormat; FIELD e minecraft Lnone/bdo; FIELD f guiWorldSelect Lnone/biv; FIELD g worldSummary Lnone/bav; + FIELD h iconLocation Lnone/kp; FIELD j iconFile Ljava/io/File; METHOD (Lnone/bix;Lnone/bav;Lnone/bau;)V ARG 1 worldSummary ARG 2 worldStorage + METHOD f loadIconTexture ()V diff --git a/mappings/net/minecraft/util/TextUtils.mapping b/mappings/net/minecraft/util/TextUtils.mapping new file mode 100644 index 0000000000..e7bab14c0e --- /dev/null +++ b/mappings/net/minecraft/util/TextUtils.mapping @@ -0,0 +1,8 @@ +CLASS none/ow net/minecraft/util/TextUtils + FIELD a FORMATTING_PATTERN Ljava/util/regex/Pattern; + METHOD a getTimeString (I)Ljava/lang/String; + ARG 0 ticks + METHOD a removeFormatting (Ljava/lang/String;)Ljava/lang/String; + ARG 0 text + METHOD b isEmpty (Ljava/lang/String;)Z + ARG 0 string diff --git a/mappings/net/minecraft/world/WorldProperties.mapping b/mappings/net/minecraft/world/WorldProperties.mapping index d50cea09ca..329c8d5801 100644 --- a/mappings/net/minecraft/world/WorldProperties.mapping +++ b/mappings/net/minecraft/world/WorldProperties.mapping @@ -15,9 +15,9 @@ CLASS none/bar net/minecraft/world/WorldProperties FIELD N dimensionData Ljava/util/Map; FIELD O gameRules Lnone/air; FIELD a dificulty Lnone/qx; - FIELD b name Ljava/lang/String; - FIELD c id I - FIELD d snapshot Z + FIELD b versionName Ljava/lang/String; + FIELD c versionId I + FIELD d versionSnapshot Z FIELD e randomSeed J FIELD f worldGenerator Lnone/aiz; FIELD g generatorOptions Ljava/lang/String; @@ -54,9 +54,9 @@ CLASS none/bar net/minecraft/world/WorldProperties METHOD H getBorderDamagePerBlock ()D METHOD I getBorderWarningBlocks ()I METHOD J getBorderWarningTime ()I - METHOD K getId ()I - METHOD L getSnapshot ()Z - METHOD M getName ()Ljava/lang/String; + METHOD K getVersionId ()I + METHOD L isVersionSnapshot ()Z + METHOD M getVersionName ()Ljava/lang/String; METHOD a getSeed ()J METHOD a setBorderSize (D)V ARG 0 borderSize diff --git a/mappings/net/minecraft/sortme/IWorldStorage.mapping b/mappings/net/minecraft/world/storage/IWorldStorage.mapping similarity index 86% rename from mappings/net/minecraft/sortme/IWorldStorage.mapping rename to mappings/net/minecraft/world/storage/IWorldStorage.mapping index c5db651e6d..0294bd5f84 100644 --- a/mappings/net/minecraft/sortme/IWorldStorage.mapping +++ b/mappings/net/minecraft/world/storage/IWorldStorage.mapping @@ -1,4 +1,4 @@ -CLASS none/bau net/minecraft/sortme/IWorldStorage +CLASS none/bau net/minecraft/world/storage/IWorldStorage METHOD a getName ()Ljava/lang/String; METHOD a isConvertible (Ljava/lang/String;)Z METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V @@ -6,6 +6,7 @@ CLASS none/bau net/minecraft/sortme/IWorldStorage ARG 1 to METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bas; + METHOD b getAvailableWorlds ()Ljava/util/List; METHOD b requiresConversion (Ljava/lang/String;)Z METHOD b getFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; METHOD c getWorldProperties (Ljava/lang/String;)Lnone/bar; diff --git a/mappings/net/minecraft/sortme/WorldAnvilStorage.mapping b/mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping similarity index 70% rename from mappings/net/minecraft/sortme/WorldAnvilStorage.mapping rename to mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping index 79a3b11644..5f1d9536c9 100644 --- a/mappings/net/minecraft/sortme/WorldAnvilStorage.mapping +++ b/mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping @@ -1,10 +1,12 @@ -CLASS none/ban net/minecraft/sortme/WorldAnvilStorage +CLASS none/ban net/minecraft/world/storage/WorldStorageAnvil FIELD c LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/io/File;Lnone/pf;)V - ARG 0 gameDir + ARG 0 saveDir METHOD a getName ()Ljava/lang/String; METHOD a isConvertible (Ljava/lang/String;)Z METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bas; + METHOD b getAvailableWorlds ()Ljava/util/List; METHOD b requiresConversion (Ljava/lang/String;)Z + METHOD c getVersion ()I METHOD d clearAll ()V diff --git a/mappings/net/minecraft/sortme/WorldOldFormatStorage.mapping b/mappings/net/minecraft/world/storage/WorldStorageOld.mapping similarity index 85% rename from mappings/net/minecraft/sortme/WorldOldFormatStorage.mapping rename to mappings/net/minecraft/world/storage/WorldStorageOld.mapping index 4b927f44b2..808a3573b9 100644 --- a/mappings/net/minecraft/sortme/WorldOldFormatStorage.mapping +++ b/mappings/net/minecraft/world/storage/WorldStorageOld.mapping @@ -1,8 +1,8 @@ -CLASS none/baq net/minecraft/sortme/WorldOldFormatStorage - FIELD a gameDir Ljava/io/File; +CLASS none/baq net/minecraft/world/storage/WorldStorageOld + FIELD a saveDir Ljava/io/File; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/io/File;Lnone/pf;)V - ARG 0 gameDir + ARG 0 saveDir METHOD a getName ()Ljava/lang/String; METHOD a getWorldProperties (Ljava/io/File;Lnone/pf;)Lnone/bar; ARG 0 levelDat @@ -14,6 +14,7 @@ CLASS none/baq net/minecraft/sortme/WorldOldFormatStorage METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bas; METHOD a deleteRecursive ([Ljava/io/File;)Z ARG 0 files + METHOD b getAvailableWorlds ()Ljava/util/List; METHOD b requiresConversion (Ljava/lang/String;)Z METHOD b getFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; METHOD c getWorldProperties (Ljava/lang/String;)Lnone/bar; diff --git a/mappings/net/minecraft/sortme/WorldSummary.mapping b/mappings/net/minecraft/world/storage/WorldSummary.mapping similarity index 67% rename from mappings/net/minecraft/sortme/WorldSummary.mapping rename to mappings/net/minecraft/world/storage/WorldSummary.mapping index 0078ec4634..e7a642e27e 100644 --- a/mappings/net/minecraft/sortme/WorldSummary.mapping +++ b/mappings/net/minecraft/world/storage/WorldSummary.mapping @@ -1,5 +1,5 @@ -CLASS none/bav net/minecraft/sortme/WorldSummary - FIELD a worldId Ljava/lang/String; +CLASS none/bav net/minecraft/world/storage/WorldSummary + FIELD a id Ljava/lang/String; FIELD b name Ljava/lang/String; FIELD c lastPlayed J FIELD d getSizeOnDisk J @@ -7,10 +7,16 @@ CLASS none/bav net/minecraft/sortme/WorldSummary FIELD f gameMode Lnone/ais; FIELD g hardcore Z FIELD h commandsAllowed Z + FIELD i versionName Ljava/lang/String; + FIELD j versionId I + FIELD k versionSnapshot Z METHOD (Lnone/bar;Ljava/lang/String;Ljava/lang/String;JZ)V ARG 0 properties ARG 1 worldId - METHOD a getWorldId ()Ljava/lang/String; + ARG 2 worldName + ARG 3 size + ARG 4 requiresConversion + METHOD a getId ()Ljava/lang/String; METHOD a compareTo (Lnone/bav;)I ARG 0 to METHOD b getName ()Ljava/lang/String; @@ -21,3 +27,4 @@ CLASS none/bav net/minecraft/sortme/WorldSummary METHOD g isHardcore ()Z METHOD h areCommandsAllowed ()Z METHOD i getDisplayName ()Ljava/lang/String; + METHOD m isTooNew ()Z