Skip to content

Commit

Permalink
Rename conflicting names to fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@makamys
makamys committed Feb 29, 2024
1 parent d1b599b commit c78fb0e
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/Minecraft$15.tiny
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
tiny 2 0 srg named comment
c net/minecraft/client/Minecraft$15 net/minecraft/client/Minecraft$15
f Lnet/minecraft/client/Minecraft; field_152389_a field_152389_a #~, ~, ~, ~
m ()Ljava/lang/String; func_152388_a call #~, ~, call, :
m ()Ljava/lang/String; func_152388_a callImpl #~, ~, call, :
m ()Ljava/lang/Object; call call #~, ~, ~, ~
m (Lnet/minecraft/client/Minecraft;)V <init> <init> #~, ~, ~, ~
p 1 p_i1101_1_ mcIn #mcIn, :, ~, ~
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/GuiListExtended.tiny
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
tiny 2 0 srg named comment
c net/minecraft/client/gui/GuiListExtended net/minecraft/client/gui/GuiListExtended
m (III)Z func_148179_a mouseClicked #mouseClicked, :, :, :
m (III)Z func_148179_a mouseClickedVanilla #mouseClicked, :, :, :
p 1 p_148179_1_ mouseX #mouseX, :, :, :
p 2 p_148179_2_ mouseY #mouseY, :, :, :
p 3 p_148179_3_ mouseEvent #mouseEvent, :, button, :
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/GuiOptionsRowList.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ c net/minecraft/client/gui/GuiOptionsRowList net/minecraft/client/gui/GuiOptions
p 4 p_i45015_4_ yStart #~, ~, ~, yStart
p 5 p_i45015_5_ yEnd #~, ~, ~, yEnd
p 6 p_i45015_6_ entryHeight #~, ~, ~, entryHeight
p 7 p_i45015_7_ options #~, ~, ~, options
p 7 p_i45015_7_ optionsIn #~, ~, ~, options
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/renderer/RenderBlocks.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ c net/minecraft/client/renderer/RenderBlocks net/minecraft/client/renderer/Rende
p 4 p_147801_4_ z #~, ~, ~, z
m (Lnet/minecraft/block/BlockFlowerPot;III)Z func_147752_a renderBlockFlowerpot #renderBlockFlowerpot, :, ~, tessellateFlowerPot
c Renders flower pot
p 1 p_147752_1_ block #~, ~, ~, block
p 1 p_147752_1_ blockIn #~, ~, ~, block
p 2 p_147752_2_ x #~, ~, ~, x
p 3 p_147752_3_ y #~, ~, ~, y
p 4 p_147752_4_ z #~, ~, ~, z
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/stream/IStream.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ c net/minecraft/client/stream/IStream net/minecraft/client/stream/IStream
c Shuts down a steam
m ()V func_152935_j update #~, ~, update, :
m ()V func_152922_k submit #~, ~, submit, :
m ()Z func_152936_l isLoggedIn #~, ~, isLoginSuccessful, isLoggedIn
m ()Z func_152936_l isLoginSuccessful #~, ~, isLoginSuccessful, isLoggedIn
m ()Z func_152924_m isReadyToBroadcast #isReadyToBroadcast, :, isReady, isReadyToBroadcast
m ()Z func_152934_n isBroadcasting #isBroadcasting, :, isLive, isBroadcasting
m ()Z func_152919_o isPaused #isPaused, :, :, :
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/entity/passive/EntityWolf.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c net/minecraft/entity/passive/EntityWolf net/minecraft/entity/passive/EntityWol
f F field_70926_e headRotationCourse #headRotationCourse, :, ~, begAnimationProgress
c Float used to smooth the rotation of the wolf head
f F field_70924_f headRotationCourseOld #headRotationCourseOld, :, ~, lastBegAnimationProgress
f Z field_70925_g isShaking #isShaking, isWet, ~, furWet
f Z field_70925_g isWet #isShaking, isWet, ~, furWet
c true is the wolf is wet else false
f Z field_70928_h isShaking #isShaking, :, ~, canShakeWaterOff
c True if the wolf is shaking else False
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/network/play/server/S26PacketMapChunkBulk.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c net/minecraft/network/play/server/S26PacketMapChunkBulk net/minecraft/network/
f [I field_149265_c sections #~, ~, ~, sections
f [I field_149262_d sectionsWithBlockIdsUpper #~, ~, ~, sectionsWithBlockIdsUpper
f [B field_149263_e compressedData #~, ~, ~, compressedData
f [[B field_149260_f data #~, ~, ~, data
f [[B field_149260_f theData #~, ~, ~, data
f I field_149261_g size #~, ~, ~, size
f Z field_149267_h isOverworld #isOverworld, :, notNether, light
f [B field_149268_i buffer #~, ~, ~, buffer
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/server/management/PlayerProfileCache$Serializer.tiny
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
tiny 2 0 srg named comment
c net/minecraft/server/management/PlayerProfileCache$Serializer net/minecraft/server/management/PlayerProfileCache$Serializer
f Lnet/minecraft/server/management/PlayerProfileCache; field_152677_a field_152677_a #~, ~, ~, ~
m (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/server/management/PlayerProfileCache$ProfileEntry; func_152675_a deserialize #~, ~, deserialize, :
m (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/server/management/PlayerProfileCache$ProfileEntry; func_152675_a deserializeImpl #~, ~, deserialize, :
p 1 p_152675_1_ p_152675_1_ #~, ~, ~, ~
p 2 p_152675_2_ p_152675_2_ #~, ~, ~, ~
p 3 p_152675_3_ p_152675_3_ #~, ~, ~, ~
Expand Down
8 changes: 4 additions & 4 deletions mappings/net/minecraft/world/World.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ c net/minecraft/world/World net/minecraft/world/World
p 3 p_72901_3_ stopOnLiquid #stopOnLiquid, :, ~, allowLiquids
m (Lnet/minecraft/util/Vec3;Lnet/minecraft/util/Vec3;ZZZ)Lnet/minecraft/util/MovingObjectPosition; func_147447_a rayTraceBlocks #rayTraceBlocks, :, rayTrace, :
c Performs a raycast against all blocks in the world. Args : Vec1, Vec2, stopOnLiquid, ignoreBlockWithoutBoundingBox, returnLastUncollidableBlock
p 1 p_147447_1_ vec31 #vec31, :, start, from
p 2 p_147447_2_ vec32 #vec32, :, end, to
p 1 p_147447_1_ start #vec31, :, start, from
p 2 p_147447_2_ end #vec32, :, end, to
p 3 p_147447_3_ stopOnLiquid #stopOnLiquid, :, ~, allowLiquids
p 4 p_147447_4_ ignoreBlockWithoutBoundingBox #ignoreBlockWithoutBoundingBox, :, ~, ignoreBlocksWithoutCollision
p 5 p_147447_5_ returnLastUncollidableBlock #returnLastUncollidableBlock, :, ~, ~
Expand Down Expand Up @@ -730,8 +730,8 @@ c net/minecraft/world/World net/minecraft/world/World
p 1 p_147442_1_ strength #strength, :, thunderGradient, thunder
m (II)I func_72825_h getTopSolidOrLiquidBlock #getTopSolidOrLiquidBlock, :, ~, getSurfaceHeight
c Finds the highest block on the x, z coordinate that is solid and returns its y coord. Args x, z
p 1 p_72825_1_ x #~, ~, x, :
p 2 p_72825_2_ z #~, ~, z, :
p 1 p_72825_1_ xIn #~, ~, x, :
p 2 p_72825_2_ zIn #~, ~, z, :
m (III)Z func_72937_j canBlockSeeTheSky #canBlockSeeTheSky, :, isAboveHighestBlock, hasSkyAccess
c Checks if the specified block is able to see the sky
p 1 p_72937_1_ x #~, ~, x, :
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/world/chunk/Chunk.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ c net/minecraft/world/chunk/Chunk net/minecraft/world/chunk/Chunk
p 1 p_76611_1_ x #x, :, :, localX
p 2 p_76611_2_ z #z, :, :, localZ
m (III)I func_150808_b getBlockLightOpacity #getBlockLightOpacity, :, getBlockOpacity, getOpacityAt
p 1 p_150808_1_ x #x, :, :, localX
p 1 p_150808_1_ localX #x, :, :, localX
p 2 p_150808_2_ y #y, :, :, :
p 3 p_150808_3_ z #z, :, :, localZ
p 3 p_150808_3_ localZ #z, :, :, localZ
m (IIII)I func_76629_c getBlockLightValue #getBlockLightValue, :, ~, getLightAt
c Gets the amount of light on a block taking into account sunlight
p 1 p_76629_1_ localX #~, ~, ~, localX
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/world/chunk/storage/AnvilChunkLoader.tiny
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ c net/minecraft/world/chunk/storage/AnvilChunkLoader net/minecraft/world/chunk/s
m (Lnet/minecraft/world/World;IILnet/minecraft/nbt/NBTTagCompound;)Lnet/minecraft/world/chunk/Chunk; func_75822_a checkedReadChunkFromNBT #checkedReadChunkFromNBT, :, validateChunk, loadChunk
c Wraps readChunkFromNBT. Checks the coordinates and several NBT tags.
p 1 p_75822_1_ worldIn #worldIn, :, world, :
p 2 p_75822_2_ x #x, :, chunkX, :
p 3 p_75822_3_ z #z, :, chunkZ, :
p 2 p_75822_2_ chunkX #x, :, chunkX, :
p 3 p_75822_3_ chunkZ #z, :, chunkZ, :
p 4 p_75822_4_ compound #compound, :, nbt, :
m (Lnet/minecraft/world/World;Lnet/minecraft/nbt/NBTTagCompound;)Lnet/minecraft/world/chunk/Chunk; func_75823_a readChunkFromNBT #readChunkFromNBT, :, getChunk, createChunkFromNbt
c Reads the data stored in the passed NBTTagCompound and creates a Chunk with that data in the passed World. Returns the created Chunk.
Expand Down

0 comments on commit c78fb0e

Please sign in to comment.