From 83e3f3089bb4ce77a2f0b4c6ad933b1b58f5751c Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 28 Aug 2016 17:25:24 +0200 Subject: [PATCH] small World work --- .../minecraft/client/world/WorldClient.mapping | 2 ++ .../server/ServerConfigurationManager.mapping | 14 +++++++++++++- .../world/IWorldBorderListener.mapping | 11 ++++++++++- .../net/minecraft/world/IWorldListener.mapping | 5 ++++- .../minecraft/world/LocalDifficulty.mapping | 4 ++++ mappings/net/minecraft/world/World.mapping | 16 +++++++++++++++- .../net/minecraft/world/WorldBorder.mapping | 18 +++++++++++++++--- .../net/minecraft/world/WorldServer.mapping | 2 ++ mappings/none/ajd.mapping | 2 ++ mappings/none/boy.mapping | 5 ++++- mappings/none/le.mapping | 1 + mappings/none/lq.mapping | 11 ++++++++++- mappings/none/lv.mapping | 5 ++++- mappings/none/vv.mapping | 5 ++++- 14 files changed, 90 insertions(+), 11 deletions(-) diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index 9e2966c50f..2403b05517 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -21,6 +21,8 @@ CLASS none/bme net/minecraft/client/world/WorldClient ARG 0 entity METHOD b setTimeOfDay (J)V ARG 0 value + METHOD b onEntitySpawn (Lnone/se;)V + ARG 0 entity METHOD c getMinecraft (Lnone/bme;)Lnone/bdo; METHOD n createChunkProvider ()Lnone/ath; METHOD t updateWeather ()V diff --git a/mappings/net/minecraft/server/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/ServerConfigurationManager.mapping index b160c396fc..93738605cc 100644 --- a/mappings/net/minecraft/server/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/ServerConfigurationManager.mapping @@ -12,9 +12,18 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager ARG 1 oldSize ARG 2 newSize ARG 3 duration - METHOD b onSetWarningTime (Lnone/atd;I)V + METHOD a onSetWarningTime (Lnone/atd;I)V ARG 0 border ARG 1 warningTime + METHOD b onSetDamagePerBlock (Lnone/atd;D)V + ARG 0 border + ARG 1 damagePerBlock + METHOD b onSetWarningBlocks (Lnone/atd;I)V + ARG 0 border + ARG 1 warningBlocks + METHOD c onSetSafeZone (Lnone/atd;D)V + ARG 0 border + ARG 1 safeZone FIELD a BANNED_PLAYERS_FILE Ljava/io/File; FIELD b BANNED_IPS_FILE Ljava/io/File; FIELD c OPS_FILE Ljava/io/File; @@ -29,6 +38,7 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager FIELD l bannedIpList Lnone/mo; FIELD m opList Lnone/ms; FIELD n whitelist Lnone/my; + FIELD o statisticsMap Ljava/util/Map; FIELD p playerSaveHandler Lnone/bay; FIELD q whitelistEnabled Z FIELD r viewDistance I @@ -50,6 +60,7 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager ARG 0 packet ARG 1 dimensionId METHOD a setWhitelistEnabled (Z)V + ARG 0 value METHOD b savePlayerData (Lnone/lw;)V ARG 0 entityPlayerServer METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; @@ -65,6 +76,7 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager METHOD n getOppedNames ()[Ljava/lang/String; METHOD o getCurrentPlayerCount ()I METHOD p getMaxPlayerCount ()I + METHOD q getSavedPlayerIds ()[Ljava/lang/String; METHOD r isWhitelistEnabled ()Z METHOD s getViewDistance ()I METHOD t getUserData ()Lnone/dt; diff --git a/mappings/net/minecraft/world/IWorldBorderListener.mapping b/mappings/net/minecraft/world/IWorldBorderListener.mapping index 606235b4e7..bc4e5afa8e 100644 --- a/mappings/net/minecraft/world/IWorldBorderListener.mapping +++ b/mappings/net/minecraft/world/IWorldBorderListener.mapping @@ -11,6 +11,15 @@ CLASS none/atb net/minecraft/world/IWorldBorderListener ARG 1 oldSize ARG 2 newSize ARG 3 duration - METHOD b onSetWarningTime (Lnone/atd;I)V + METHOD a onSetWarningTime (Lnone/atd;I)V ARG 0 border ARG 1 warningTime + METHOD b onSetDamagePerBlock (Lnone/atd;D)V + ARG 0 border + ARG 1 damagePerBlock + METHOD b onSetWarningBlocks (Lnone/atd;I)V + ARG 0 border + ARG 1 warningBlocks + METHOD c onSetSafeZone (Lnone/atd;D)V + ARG 0 border + ARG 1 safeZone diff --git a/mappings/net/minecraft/world/IWorldListener.mapping b/mappings/net/minecraft/world/IWorldListener.mapping index cc09619f6e..ae8dd04bc8 100644 --- a/mappings/net/minecraft/world/IWorldListener.mapping +++ b/mappings/net/minecraft/world/IWorldListener.mapping @@ -1,5 +1,6 @@ CLASS none/aiw net/minecraft/world/IWorldListener - METHOD a playSound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V + METHOD a onSpawnParticle (IZDDDDDD[I)V + METHOD a onPlaySound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound ARG 2 category @@ -8,3 +9,5 @@ CLASS none/aiw net/minecraft/world/IWorldListener ARG 5 z ARG 6 volume ARG 7 pitch + METHOD a onEntitySpawn (Lnone/se;)V + ARG 0 entity diff --git a/mappings/net/minecraft/world/LocalDifficulty.mapping b/mappings/net/minecraft/world/LocalDifficulty.mapping index 453c533f84..34795e60fb 100644 --- a/mappings/net/minecraft/world/LocalDifficulty.mapping +++ b/mappings/net/minecraft/world/LocalDifficulty.mapping @@ -1 +1,5 @@ CLASS none/qy net/minecraft/world/LocalDifficulty + FIELD a difficulty Lnone/qx; + METHOD (Lnone/qx;JJF)V + ARG 0 difficulty + ARG 1 timeOfDay diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 17ea224272..231e3571a9 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -5,6 +5,9 @@ CLASS none/aiu net/minecraft/world/World FIELD L calendar Ljava/util/Calendar; FIELD N border Lnone/atd; FIELD a seaLevel I + FIELD e entities Ljava/util/List; + FIELD g tileEntities Ljava/util/List; + FIELD h tickingTileEntities Ljava/util/List; FIELD i players Ljava/util/List; FIELD r rand Ljava/util/Random; FIELD s dimensionProvider Lnone/auc; @@ -23,7 +26,7 @@ CLASS none/aiu net/minecraft/world/World ARG 0 pos METHOD D getLocalDifficulty (Lnone/cn;)Lnone/qy; ARG 0 pos - METHOD E isValidHeight (Lnone/cn;)Z + METHOD E isInvalidHeight (Lnone/cn;)Z ARG 0 pos METHOD G getChunkProviderStatus ()Ljava/lang/String; METHOD K getSeaLevel ()I @@ -52,6 +55,8 @@ CLASS none/aiu net/minecraft/world/World ARG 0 chunkX ARG 1 chunkZ METHOD a spawnParticle (IZDDDDDD[I)V + ARG 0 typeId + ARG 1 shouldIgnoreRange METHOD a setTime (J)V ARG 0 value METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcp;)Ljava/util/List; @@ -74,6 +79,10 @@ CLASS none/aiu net/minecraft/world/World ARG 3 category ARG 4 volume ARG 5 pitch + METHOD a registerWorldListener (Lnone/aiw;)V + ARG 0 listener + METHOD a (Lnone/arb;)Z + ARG 0 tileEntity METHOD a isAreaLoaded (Lnone/awx;)Z ARG 0 area METHOD a isValidPos (Lnone/cn;)Z @@ -117,6 +126,8 @@ CLASS none/aiu net/minecraft/world/World ARG 1 predicate METHOD b getPlayerByUuid (Ljava/util/UUID;)Lnone/aak; ARG 0 uuid + METHOD b unregisterWorldListener (Lnone/aiw;)V + ARG 0 listener METHOD b isAreaLoaded (Lnone/awx;Z)Z ARG 0 area METHOD b getBiome (Lnone/cn;)Lnone/ajh; @@ -124,6 +135,8 @@ CLASS none/aiu net/minecraft/world/World METHOD b isEmittingRedstonePower (Lnone/cn;Lnone/cu;)Z ARG 0 pos ARG 1 facingFrom + METHOD b onEntitySpawn (Lnone/se;)V + ARG 0 entity METHOD c (Lnone/cn;)Lnone/asj; METHOD c getEmittedRedstonePower (Lnone/cn;Lnone/cu;)I ARG 0 pos @@ -146,6 +159,7 @@ CLASS none/aiu net/minecraft/world/World METHOD o getBlockState (Lnone/cn;)Lnone/asj; ARG 0 pos METHOD r getTileEntity (Lnone/cn;)Lnone/arb; + ARG 0 pos METHOD t updateWeather ()V METHOD u getServer ()Lnet/minecraft/server/MinecraftServer; METHOD x getReceivedStrongRedstonePower (Lnone/cn;)I diff --git a/mappings/net/minecraft/world/WorldBorder.mapping b/mappings/net/minecraft/world/WorldBorder.mapping index d1c0fc4aa4..3dd0637cff 100644 --- a/mappings/net/minecraft/world/WorldBorder.mapping +++ b/mappings/net/minecraft/world/WorldBorder.mapping @@ -7,7 +7,10 @@ CLASS none/atd net/minecraft/world/WorldBorder FIELD f interpolationEnd J FIELD g interpolationStart J FIELD h portalTeleportPosLimit I - FIELD l warningTime I + FIELD i damagePerBlock D + FIELD j safeZone D + FIELD k warningTime I + FIELD l warningBlocks I METHOD a setSize (D)V ARG 0 size METHOD a interpolateSize (DDJ)V @@ -27,14 +30,20 @@ CLASS none/atd net/minecraft/world/WorldBorder METHOD a distanceFromBorder (Lnone/se;)D ARG 0 entity METHOD b getXMin ()D + METHOD b setSafeZone (D)V + ARG 0 value METHOD b distanceFromBorder (DD)D ARG 0 x ARG 1 z + METHOD b setWarningTime (I)V + ARG 0 value METHOD c getZMin ()D + METHOD c setDamagePerBlock (D)V + ARG 0 value METHOD c setCenter (DD)V ARG 0 centerX ARG 1 centerZ - METHOD c setWarningTime (I)V + METHOD c setWarningBlocks (I)V ARG 0 value METHOD d getXMax ()D METHOD e getZMax ()D @@ -45,4 +54,7 @@ CLASS none/atd net/minecraft/world/WorldBorder METHOD j getSize ()D METHOD k getListeners ()Ljava/util/List; METHOD l getPortalTeleportPosLimit ()I - METHOD q getWarningTime ()I + METHOD m getSafeZone ()D + METHOD n getDamagePerBlock ()D + METHOD p getWarningTime ()I + METHOD q getWarningBlocks ()I diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 56945698f4..cea012940e 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -11,6 +11,8 @@ CLASS none/lu net/minecraft/world/WorldServer ARG 0 entity METHOD aE isMainThread ()Z METHOD b getWorld ()Lnone/aiu; + METHOD b onEntitySpawn (Lnone/se;)V + ARG 0 entity METHOD e updateSleepingStatus ()V METHOD k updateEntities ()V METHOD n createChunkProvider ()Lnone/ath; diff --git a/mappings/none/ajd.mapping b/mappings/none/ajd.mapping index af9fc91b28..7b80f985d5 100644 --- a/mappings/none/ajd.mapping +++ b/mappings/none/ajd.mapping @@ -8,4 +8,6 @@ CLASS none/ajd METHOD d isAir (Lnone/cn;)Z ARG 0 pos METHOD o getBlockState (Lnone/cn;)Lnone/asj; + ARG 0 pos METHOD r getTileEntity (Lnone/cn;)Lnone/arb; + ARG 0 pos diff --git a/mappings/none/boy.mapping b/mappings/none/boy.mapping index dc6ce7eca2..da06235947 100644 --- a/mappings/none/boy.mapping +++ b/mappings/none/boy.mapping @@ -1,6 +1,7 @@ CLASS none/boy FIELD h mc Lnone/bdo; - METHOD a playSound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V + METHOD a onSpawnParticle (IZDDDDDD[I)V + METHOD a onPlaySound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound ARG 2 category @@ -11,3 +12,5 @@ CLASS none/boy ARG 7 pitch METHOD a onResourceReload (Lnone/bya;)V ARG 0 container + METHOD a onEntitySpawn (Lnone/se;)V + ARG 0 entity diff --git a/mappings/none/le.mapping b/mappings/none/le.mapping index 27850e34fd..fd46ff261a 100644 --- a/mappings/none/le.mapping +++ b/mappings/none/le.mapping @@ -1,5 +1,6 @@ CLASS none/le METHOD a setWhitelistEnabled (Z)V + ARG 0 value METHOD b getServer ()Lnone/lf; METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z diff --git a/mappings/none/lq.mapping b/mappings/none/lq.mapping index 6518ded9b3..b7cc48917b 100644 --- a/mappings/none/lq.mapping +++ b/mappings/none/lq.mapping @@ -12,7 +12,16 @@ CLASS none/lq ARG 1 oldSize ARG 2 newSize ARG 3 duration - METHOD b onSetWarningTime (Lnone/atd;I)V + METHOD a onSetWarningTime (Lnone/atd;I)V ARG 0 border ARG 1 warningTime + METHOD b onSetDamagePerBlock (Lnone/atd;D)V + ARG 0 border + ARG 1 damagePerBlock + METHOD b onSetWarningBlocks (Lnone/atd;I)V + ARG 0 border + ARG 1 warningBlocks + METHOD c onSetSafeZone (Lnone/atd;D)V + ARG 0 border + ARG 1 safeZone METHOD b getWorld ()Lnone/aiu; diff --git a/mappings/none/lv.mapping b/mappings/none/lv.mapping index c8835aa81f..f535380a67 100644 --- a/mappings/none/lv.mapping +++ b/mappings/none/lv.mapping @@ -1,5 +1,6 @@ CLASS none/lv - METHOD a playSound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V + METHOD a onSpawnParticle (IZDDDDDD[I)V + METHOD a onPlaySound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound ARG 2 category @@ -8,3 +9,5 @@ CLASS none/lv ARG 5 z ARG 6 volume ARG 7 pitch + METHOD a onEntitySpawn (Lnone/se;)V + ARG 0 entity diff --git a/mappings/none/vv.mapping b/mappings/none/vv.mapping index 2cd37a90de..6d39200d93 100644 --- a/mappings/none/vv.mapping +++ b/mappings/none/vv.mapping @@ -1,5 +1,6 @@ CLASS none/vv - METHOD a playSound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V + METHOD a onSpawnParticle (IZDDDDDD[I)V + METHOD a onPlaySound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound ARG 2 category @@ -8,3 +9,5 @@ CLASS none/vv ARG 5 z ARG 6 volume ARG 7 pitch + METHOD a onEntitySpawn (Lnone/se;)V + ARG 0 entity