-
Notifications
You must be signed in to change notification settings - Fork 21
/
Copy pathuncollide-cb2pkgmcp.srg
110 lines (95 loc) · 15 KB
/
uncollide-cb2pkgmcp.srg
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
# Extra mappings for remapping CraftBukkit to MCP
# This augments the automatically-generated cb2pkgmcp.srg generated from mc-dev, adding
# mappings specifically needed for CraftBukkit's added or modified code
# New fields added by CB, distinct from deobfuscated methods in MCP with same name; resolve name collision
FD: net/minecraft/server/PlayerConnection/lastPosX net/minecraft/network/NetServerHandler/lastPosX__ForEvent_CB
FD: net/minecraft/server/PlayerConnection/lastPosY net/minecraft/network/NetServerHandler/lastPosY__ForEvent_CB
FD: net/minecraft/server/PlayerConnection/lastPosZ net/minecraft/network/NetServerHandler/lastPosZ__ForEvent_CB
# New method added by CB with same name as deobfuscated method
MD: net/minecraft/server/ChunkRegionLoader/loadChunk (Lnet/minecraft/server/World;II)[Ljava/lang/Object; net/minecraft/world/chunk/storage/AnvilChunkLoader/loadChunk__Async_CB (Lnet/minecraft/world/World;II)[Ljava/lang/Object;
# Redundant colliding synthetic method (type erasure?) - MCP has a manual patch to comment this out; just rename it
MD: net/minecraft/server/EntityMushroomCow/b (Lnet/minecraft/server/EntityAgeable;)Lnet/minecraft/server/EntityCow; net/minecraft/entity/passive/EntityMooshroom/spawnBabyAnimal__SyntheticUnused_CB (Lnet/minecraft/entity/EntityAgeable;)Lnet/minecraft/entity/passive/EntityCow;
# New inner class added by CB, implemented by world generators
CL: net/minecraft/server/BlockSapling/TreeGenerator net/minecraft/block/BlockSapling/TreeGenerator
MD: net/minecraft/server/BlockSapling/TreeGenerator/a (Lnet/minecraft/server/World;Ljava/util/Random;III)Z net/minecraft/world/block/BlockSapling/generate (Lnet/minecraft/world/World;Ljava/util/Random;III)Z
# New methods/classes added by CB overriding renamed methods
MD: net/minecraft/server/EntityBoat/collide (Lnet/minecraft/server/Entity;)V net/minecraft/entity/EntityBoat/applyEntityCollision (Lnet/minecraft/entity/Entity;)V
MD: net/minecraft/server/WorldServer/getTileEntity (III)Lnet/minecraft/server/TileEntity; net/minecraft/world/WorldServer/getBlockTileEntity (III)Lnet/minecraft/tileentity/TileEntity;
# Methods the Bukkit API requires, but renamed to MCP names
# Wrapper methods added by prerenamefixes to appease BlockChangeDelegate interface
MD: net/minecraft/server/WorldServer/getTypeId__API_CB (III)I net/minecraft/world/WorldServer/getTypeId (III)I
MD: net/minecraft/server/WorldServer/isEmpty__API_CB (III)Z net/minecraft/world/WorldServer/isEmpty (III)Z
# Interface implementors in OBC
# These are simply the interface method mappings, but with classes replaced by OBC's TODO: automatically generated
# IChunkProvider interface implementors
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/canSave ()Z net/minecraft/world/chunk/IChunkProvider/canSave ()Z
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/findNearestMapFeature (Lnet/minecraft/server/World;Ljava/lang/String;III)Lnet/minecraft/server/ChunkPosition; net/minecraft/world/chunk/IChunkProvider/findClosestStructure (Lnet/minecraft/world/World;Ljava/lang/String;III)Lnet/minecraft/world/ChunkPosition;
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/getChunkAt (II)Lnet/minecraft/server/Chunk; net/minecraft/world/chunk/IChunkProvider/loadChunk (II)Lnet/minecraft/world/chunk/Chunk;
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/getChunkAt (Lnet/minecraft/server/IChunkProvider;II)V net/minecraft/world/chunk/IChunkProvider/populate (Lnet/minecraft/world/chunk/IChunkProvider;II)V
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/getLoadedChunks ()I net/minecraft/world/chunk/IChunkProvider/getLoadedChunkCount ()I
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/getMobsFor (Lnet/minecraft/server/EnumCreatureType;III)Ljava/util/List; net/minecraft/world/chunk/IChunkProvider/getPossibleCreatures (Lnet/minecraft/entity/EnumCreatureType;III)Ljava/util/List;
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/getName ()Ljava/lang/String; net/minecraft/world/chunk/IChunkProvider/makeString ()Ljava/lang/String;
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/getOrCreateChunk (II)Lnet/minecraft/server/Chunk; net/minecraft/world/chunk/IChunkProvider/provideChunk (II)Lnet/minecraft/world/chunk/Chunk;
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/isChunkLoaded (II)Z net/minecraft/world/chunk/IChunkProvider/chunkExists (II)Z
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/recreateStructures (II)V net/minecraft/world/chunk/IChunkProvider/recreateStructures (II)V
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/saveChunks (ZLnet/minecraft/server/IProgressUpdate;)Z net/minecraft/world/chunk/IChunkProvider/saveChunks (ZLnet/minecraft/util/IProgressUpdate;)Z
MD: org/bukkit/craftbukkit/generator/NormalChunkGenerator/unloadChunks ()Z net/minecraft/world/chunk/IChunkProvider/unloadQueuedChunks ()Z
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/canSave ()Z net/minecraft/world/chunk/IChunkProvider/canSave ()Z
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/findNearestMapFeature (Lnet/minecraft/server/World;Ljava/lang/String;III)Lnet/minecraft/server/ChunkPosition; net/minecraft/world/chunk/IChunkProvider/findClosestStructure (Lnet/minecraft/world/World;Ljava/lang/String;III)Lnet/minecraft/world/ChunkPosition;
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/getChunkAt (II)Lnet/minecraft/server/Chunk; net/minecraft/world/chunk/IChunkProvider/loadChunk (II)Lnet/minecraft/world/chunk/Chunk;
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/getChunkAt (Lnet/minecraft/server/IChunkProvider;II)V net/minecraft/world/chunk/IChunkProvider/populate (Lnet/minecraft/world/chunk/IChunkProvider;II)V
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/getLoadedChunks ()I net/minecraft/world/chunk/IChunkProvider/getLoadedChunkCount ()I
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/getMobsFor (Lnet/minecraft/server/EnumCreatureType;III)Ljava/util/List; net/minecraft/world/chunk/IChunkProvider/getPossibleCreatures (Lnet/minecraft/entity/EnumCreatureType;III)Ljava/util/List;
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/getName ()Ljava/lang/String; net/minecraft/world/chunk/IChunkProvider/makeString ()Ljava/lang/String;
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/getOrCreateChunk (II)Lnet/minecraft/server/Chunk; net/minecraft/world/chunk/IChunkProvider/provideChunk (II)Lnet/minecraft/world/chunk/Chunk;
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/isChunkLoaded (II)Z net/minecraft/world/chunk/IChunkProvider/chunkExists (II)Z
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/recreateStructures (II)V net/minecraft/world/chunk/IChunkProvider/recreateStructures (II)V
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/saveChunks (ZLnet/minecraft/server/IProgressUpdate;)Z net/minecraft/world/chunk/IChunkProvider/saveChunks (ZLnet/minecraft/util/IProgressUpdate;)Z
MD: org/bukkit/craftbukkit/generator/CustomChunkGenerator/unloadChunks ()Z net/minecraft/world/chunk/IChunkProvider/unloadQueuedChunks ()Z
# ICommandSender(MCP)/ICommandListener(CB) interface implementors
MD: org/bukkit/craftbukkit/command/ServerCommandListener/a (ILjava/lang/String;)Z org/bukkit/craftbukkit/command/ServerCommandListener/canCommandSenderUseCommand (ILjava/lang/String;)Z
MD: org/bukkit/craftbukkit/command/ServerCommandListener/a (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; org/bukkit/craftbukkit/command/ServerCommandListener/translateString (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
MD: org/bukkit/craftbukkit/command/ServerCommandListener/b ()Lnet/minecraft/server/ChunkCoordinates; org/bukkit/craftbukkit/command/ServerCommandListener/getPlayerCoordinates ()Lnet/minecraft/util/ChunkCoordinates;
MD: org/bukkit/craftbukkit/command/ServerCommandListener/getName ()Ljava/lang/String; org/bukkit/craftbukkit/command/ServerCommandListener/getCommandSenderName ()Ljava/lang/String;
MD: org/bukkit/craftbukkit/command/ServerCommandListener/sendMessage (Ljava/lang/String;)V org/bukkit/craftbukkit/command/ServerCommandListener/sendChatToPlayer (Ljava/lang/String;)V
# Container interface implementor
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a ()Ljava/util/List; net/minecraft/inventory/Container/getInventory ()Ljava/util/List;
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (IIZLnet/minecraft/server/EntityHuman;)V net/minecraft/inventory/Container/retrySlotClick (IIZLnet/minecraft/entity/player/EntityPlayer;)V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Ljava/util/Set;ILnet/minecraft/server/ItemStack;I)V net/minecraft/inventory/Container/func_94525_a (Ljava/util/Set;ILnet/minecraft/item/ItemStack;I)V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/EntityHuman;)Z net/minecraft/inventory/Container/canInteractWith (Lnet/minecraft/entity/player/EntityPlayer;)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/EntityHuman;I)Z net/minecraft/inventory/Container/enchantItem (Lnet/minecraft/entity/player/EntityPlayer;I)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/EntityHuman;Z)V net/minecraft/inventory/Container/setPlayerIsPresent (Lnet/minecraft/entity/player/EntityPlayer;Z)V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/IInventory;)V net/minecraft/inventory/Container/onCraftMatrixChanged (Lnet/minecraft/inventory/IInventory;)V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/IInventory;I)Lnet/minecraft/server/Slot; net/minecraft/inventory/Container/getSlotFromInventory (Lnet/minecraft/inventory/IInventory;I)Lnet/minecraft/inventory/Slot;
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/ItemStack;IIZ)Z net/minecraft/inventory/Container/mergeItemStack (Lnet/minecraft/item/ItemStack;IIZ)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/ItemStack;Lnet/minecraft/server/Slot;)Z net/minecraft/inventory/Container/func_94530_a (Lnet/minecraft/item/ItemStack;Lnet/minecraft/inventory/Slot;)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/Slot;)Lnet/minecraft/server/Slot; net/minecraft/inventory/Container/addSlotToContainer (Lnet/minecraft/inventory/Slot;)Lnet/minecraft/inventory/Slot;
MD: org/bukkit/craftbukkit/inventory/CraftContainer/a (Lnet/minecraft/server/Slot;Lnet/minecraft/server/ItemStack;Z)Z net/minecraft/inventory/Container/func_94527_a (Lnet/minecraft/inventory/Slot;Lnet/minecraft/item/ItemStack;Z)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/addSlotListener (Lnet/minecraft/server/ICrafting;)V net/minecraft/inventory/Container/addCraftingToCrafters (Lnet/minecraft/inventory/ICrafting;)V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/b ()V net/minecraft/inventory/Container/detectAndSendChanges ()V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/b (I)I net/minecraft/inventory/Container/func_94529_b (I)I
MD: org/bukkit/craftbukkit/inventory/CraftContainer/b (Lnet/minecraft/server/EntityHuman;)V net/minecraft/inventory/Container/onCraftGuiClosed (Lnet/minecraft/entity/player/EntityPlayer;)V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/b (Lnet/minecraft/server/EntityHuman;I)Lnet/minecraft/server/ItemStack; net/minecraft/inventory/Container/transferStackInSlot (Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;
MD: org/bukkit/craftbukkit/inventory/CraftContainer/b (Lnet/minecraft/server/IInventory;)I net/minecraft/inventory/Container/func_94526_b (Lnet/minecraft/inventory/IInventory;)I
MD: org/bukkit/craftbukkit/inventory/CraftContainer/b (Lnet/minecraft/server/Slot;)Z net/minecraft/inventory/Container/func_94531_b (Lnet/minecraft/inventory/Slot;)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/c (I)I net/minecraft/inventory/Container/func_94532_c (I)I
MD: org/bukkit/craftbukkit/inventory/CraftContainer/c (Lnet/minecraft/server/EntityHuman;)Z net/minecraft/inventory/Container/isPlayerNotUsingContainer (Lnet/minecraft/entity/player/EntityPlayer;)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/clickItem (IIILnet/minecraft/server/EntityHuman;)Lnet/minecraft/server/ItemStack; net/minecraft/inventory/Container/slotClick (IIILnet/minecraft/entity/player/EntityPlayer;)Lnet/minecraft/item/ItemStack;
MD: org/bukkit/craftbukkit/inventory/CraftContainer/d ()V net/minecraft/inventory/Container/func_94533_d ()V
MD: org/bukkit/craftbukkit/inventory/CraftContainer/d (I)Z net/minecraft/inventory/Container/func_94528_d (I)Z
MD: org/bukkit/craftbukkit/inventory/CraftContainer/getSlot (I)Lnet/minecraft/server/Slot; net/minecraft/inventory/Container/getSlot (I)Lnet/minecraft/inventory/Slot;
MD: org/bukkit/craftbukkit/inventory/CraftContainer/setItem (ILnet/minecraft/server/ItemStack;)V net/minecraft/inventory/Container/putStackInSlot (ILnet/minecraft/item/ItemStack;)V
# IInventory interface implementor
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/a (Lnet/minecraft/server/EntityHuman;)Z net/minecraft/inventory/IInventory/isUseableByPlayer (Lnet/minecraft/entity/player/EntityPlayer;)Z
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/b (ILnet/minecraft/server/ItemStack;)Z net/minecraft/inventory/IInventory/func_94041_b (ILnet/minecraft/item/ItemStack;)Z
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/c ()Z net/minecraft/inventory/IInventory/func_94042_c ()Z
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/g ()V net/minecraft/inventory/IInventory/closeChest ()V
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/getItem (I)Lnet/minecraft/server/ItemStack; net/minecraft/inventory/IInventory/getStackInSlot (I)Lnet/minecraft/item/ItemStack;
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/getMaxStackSize ()I net/minecraft/inventory/IInventory/getInventoryStackLimit ()I
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/getName ()Ljava/lang/String; net/minecraft/inventory/IInventory/getInvName ()Ljava/lang/String;
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/getSize ()I net/minecraft/inventory/IInventory/getSizeInventory ()I
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/setItem (ILnet/minecraft/server/ItemStack;)V net/minecraft/inventory/IInventory/setInventorySlotContents (ILnet/minecraft/item/ItemStack;)V
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/splitStack (II)Lnet/minecraft/server/ItemStack; net/minecraft/inventory/IInventory/decrStackSize (II)Lnet/minecraft/item/ItemStack;
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/splitWithoutUpdate (I)Lnet/minecraft/server/ItemStack; net/minecraft/inventory/IInventory/getStackInSlotOnClosing (I)Lnet/minecraft/item/ItemStack;
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/startOpen ()V net/minecraft/inventory/IInventory/openChest ()V
MD: org/bukkit/craftbukkit/inventory/CraftInventoryCustom/MinecraftInventory/update ()V net/minecraft/inventory/IInventory/onInventoryChanged ()V