From 73fe633819527e4a810ef71dd5cf5b9dfe3bb7cb Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 8 Jul 2024 15:43:17 +0200 Subject: [PATCH 1/3] Update preprocessor --- jGui | 2 +- root.gradle.kts | 4 ++- settings.gradle.kts | 2 +- .../com/replaymod/core/versions/Patterns.java | 15 ---------- .../replaymod/replay/FullReplaySender.java | 17 ++--------- versions/mapping-fabric-1.17.1-1.16.4.txt | 3 +- versions/mapping-fabric-1.19.4-1.19.3.txt | 2 ++ versions/mapping-forge-1.14.4-1.12.2.txt | 30 ++++--------------- 8 files changed, 16 insertions(+), 59 deletions(-) create mode 100644 versions/mapping-fabric-1.19.4-1.19.3.txt diff --git a/jGui b/jGui index d2626659..e4d4d127 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit d2626659b0a7e6904787bf29904e319c0ca245aa +Subproject commit e4d4d127a1b26ef81b23437577cb55819fa696da diff --git a/root.gradle.kts b/root.gradle.kts index e554ebc7..4096eb7a 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -201,6 +201,8 @@ val doRelease by tasks.registering { defaultTasks("bundleJar") preprocess { + strictExtraMappings.set(true) + val mc12100 = createNode("1.21", 12100, "yarn") val mc12006 = createNode("1.20.6", 12006, "yarn") val mc12004 = createNode("1.20.4", 12004, "yarn") @@ -235,7 +237,7 @@ preprocess { mc12004.link(mc12002, file("versions/mapping-fabric-1.20.4-1.20.2.txt")) mc12002.link(mc12001) mc12001.link(mc11904, file("versions/mapping-fabric-1.20.1-1.19.4.txt")) - mc11904.link(mc11903) + mc11904.link(mc11903, file("versions/mapping-fabric-1.19.4-1.19.3.txt")) mc11903.link(mc11902, file("versions/mapping-fabric-1.19.3-1.19.2.txt")) mc11902.link(mc11901) mc11901.link(mc11900) diff --git a/settings.gradle.kts b/settings.gradle.kts index 4eba5b03..dcf932b1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ pluginManagement { maven("https://repo.essential.gg/repository/maven-public") } plugins { - id("gg.essential.multi-version.root") version "0.6.1" + id("gg.essential.multi-version.root") version "0.6.2" id("io.github.goooler.shadow") version "8.1.7" } } diff --git a/src/main/java/com/replaymod/core/versions/Patterns.java b/src/main/java/com/replaymod/core/versions/Patterns.java index 49954a56..fb998515 100644 --- a/src/main/java/com/replaymod/core/versions/Patterns.java +++ b/src/main/java/com/replaymod/core/versions/Patterns.java @@ -47,7 +47,6 @@ import org.lwjgl.opengl.GL11; //#if MC>=11600 import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; import net.minecraft.util.math.Matrix4f; import net.minecraft.util.math.Quaternion; @@ -606,20 +605,6 @@ class Patterns { //#endif } - // FIXME preprocessor bug: there are mappings for this, not sure why it doesn't remap by itself - //#if MC>=11600 - @Pattern - private static Matrix4f getPositionMatrix(MatrixStack.Entry stack) { - //#if MC>=11800 - //$$ return stack.getPositionMatrix(); - //#else - return stack.getModel(); - //#endif - } - //#else - //$$ private static void getPositionMatrix() {} - //#endif - @SuppressWarnings("rawtypes") // preprocessor bug: doesn't work with generics @Pattern private static void Futures_addCallback(ListenableFuture future, FutureCallback callback) { diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index 3689c1dd..2a2e3f2a 100644 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -403,12 +403,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re if (mc.world != null) { for (PlayerEntity playerEntity : mc.world.getPlayers()) { if (!playerEntity.updateNeeded && playerEntity instanceof OtherClientPlayerEntity) { - // FIXME preprocessor should (and used to) be able to map this - //#if MC>=11400 playerEntity.tickMovement(); - //#else - //$$ playerEntity.onLivingUpdate(); - //#endif } } } @@ -1383,11 +1378,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re //#if MC>=11400 ClientWorld world = mc.world; ChunkManager chunkProvider = world.getChunkManager(); - WorldChunk chunk = chunkProvider.getWorldChunk(x, z - //#if MC<11500 - //$$ , false - //#endif - ); + WorldChunk chunk = chunkProvider.getWorldChunk(x, z); if (chunk != null) { //#else //$$ World world = mc.world; @@ -1425,11 +1416,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re // Entity has left the chunk chunk.remove(entity, entity.chunkY); } - WorldChunk newChunk = chunkProvider.getWorldChunk(chunkX, chunkZ - //#if MC<11500 - //$$ , false - //#endif - ); + WorldChunk newChunk = chunkProvider.getWorldChunk(chunkX, chunkZ); if (newChunk != null) { newChunk.addEntity(entity); } else { diff --git a/versions/mapping-fabric-1.17.1-1.16.4.txt b/versions/mapping-fabric-1.17.1-1.16.4.txt index 193eb19b..62b472af 100644 --- a/versions/mapping-fabric-1.17.1-1.16.4.txt +++ b/versions/mapping-fabric-1.17.1-1.16.4.txt @@ -1,6 +1,5 @@ com.mojang.blaze3d.systems.RenderSystem com.mojang.blaze3d.platform.GlStateManager com.mojang.blaze3d.systems.RenderSystem setShaderFogStart() fogStart() com.mojang.blaze3d.systems.RenderSystem setShaderFogEnd() fogEnd() -net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket getDimensionType() method_29445() net.minecraft.entity.Entity getId() getEntityId() -net.minecraft.client.network.ClientPlayerEntity init() net.minecraft.entity.player.PlayerEntity afterSpawn() +net.minecraft.client.network.ClientPlayerEntity init() net.minecraft.entity.Entity afterSpawn() diff --git a/versions/mapping-fabric-1.19.4-1.19.3.txt b/versions/mapping-fabric-1.19.4-1.19.3.txt new file mode 100644 index 00000000..13098a16 --- /dev/null +++ b/versions/mapping-fabric-1.19.4-1.19.3.txt @@ -0,0 +1,2 @@ +net.minecraft.client.gui.widget.Widget setX() net.minecraft.client.gui.widget.ClickableWidget setX() +net.minecraft.client.gui.widget.Widget setY() net.minecraft.client.gui.widget.ClickableWidget setY() diff --git a/versions/mapping-forge-1.14.4-1.12.2.txt b/versions/mapping-forge-1.14.4-1.12.2.txt index 90dff9e6..befba333 100644 --- a/versions/mapping-forge-1.14.4-1.12.2.txt +++ b/versions/mapping-forge-1.14.4-1.12.2.txt @@ -8,7 +8,7 @@ net.minecraft.resources.IResourceManager net.minecraft.client.resources.IResourc net.minecraft.client.resources.DownloadingPackFinder net.minecraft.client.resources.ResourcePackRepository net.minecraft.client.renderer.chunk.ChunkRenderTask net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator net.minecraft.client.settings.AbstractOption net.minecraft.client.settings.GameSettings.Options -net.minecraft.client.settings.AbstractOption func_216728_a() setValueMax() +net.minecraft.client.settings.SliderPercentageOption func_216728_a() net.minecraft.client.settings.GameSettings.Options setValueMax() net.minecraftforge.eventbus.api.SubscribeEvent net.minecraftforge.fml.common.eventhandler.SubscribeEvent net.minecraftforge.eventbus.api.EventPriority net.minecraftforge.fml.common.eventhandler.EventPriority net.minecraftforge.eventbus.api.Cancelable net.minecraftforge.fml.common.eventhandler.Cancelable @@ -25,13 +25,12 @@ net.minecraft.client.audio.SimpleSound net.minecraft.client.audio.PositionedSoun net.minecraft.client.gui.IngameGui net.minecraft.client.gui.GuiIngame net.minecraft.util.HandSide net.minecraft.util.EnumHandSide -net.minecraft.resources.FolderPack getInputStream() getInputStreamByName() -net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked() +net.minecraft.resources.ResourcePack getInputStream() net.minecraft.client.resources.AbstractResourcePack getInputStreamByName() net.minecraft.util.text.ITextComponent getString() getUnformattedText() -net.minecraft.network.play.server.SPacketRespawn func_212643_b() getDimensionID() net.minecraft.client.Minecraft getPackFinder() getResourcePackRepository() -net.minecraft.entity.Entity getPositionVec() getPositionVector() +net.minecraft.entity.Entity getPositionVec() net.minecraft.command.ICommandSender getPositionVector() +net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent addWidget() addButton() net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent removeWidget() removeButton() net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent getWidgetList() getButtonList() @@ -110,7 +109,7 @@ net.minecraft.client.gui.screen.WorldSelectionScreen net.minecraft.client.gui.Gu # Note: GuiButton has been split into Button and Widget (now shared with e.g. checkboxes), # most members are actually on the latter (there's also AbstractButton in the middle, but it isn't interesting) net.minecraft.client.gui.widget.Widget net.minecraft.client.gui.GuiButton -net.minecraft.client.gui.widget.button.AbstractButton active net.minecraft.client.gui.GuiButton enabled +net.minecraft.client.gui.widget.Widget active net.minecraft.client.gui.GuiButton enabled net.minecraft.client.gui.screen.MainMenuScreen net.minecraft.client.gui.GuiMainMenu net.minecraft.client.gui.screen.MainMenuScreen realmsNotificationGui realmsNotification net.minecraft.realms.RealmsScreenProxy net.minecraft.client.gui.GuiScreenRealmsProxy @@ -162,10 +161,6 @@ com.mojang.blaze3d.platform.GlStateManager.Texture2DState capState texture2DStat net.minecraft.SharedConstants isValidChar() isAllowedCharacter() net.minecraft.SharedConstants net.minecraft.util.SharedConstants net.minecraft.server.MinecraftServer getLevelName() getWorldName() -com.replaymod.core.versions.MCVer.Keyboard onKey() onKeyEvent() -com.replaymod.core.versions.MCVer.Keyboard pollDebugCrash() tick() -com.replaymod.core.versions.MCVer.Keyboard getClipboard() getClipboardString() -com.replaymod.core.versions.MCVer.Keyboard setClipboard() setClipboardString() net.minecraft.client.gui.screen.ConfirmScreen net.minecraft.client.gui.GuiYesNo net.minecraft.client.Mouse getX() getMouseX() net.minecraft.client.Mouse getY() getMouseY() @@ -181,7 +176,7 @@ net.minecraft.client.gui.DrawableHelper fill() drawRect() net.minecraft.client.gui.DrawableHelper net.minecraft.client.gui.Gui net.minecraft.client.gui.screen.Screen hasControlDown() isCtrlKeyDown() net.minecraft.client.gui.screen.Screen hasShiftDown() isShiftKeyDown() -net.minecraft.client.gui.screen.Screen init() setWorldAndResolution() +net.minecraft.client.gui.screen.Screen init(Lnet/minecraft/client/Minecraft;II)V setWorldAndResolution() net.minecraft.client.gui.screen.Screen minecraft mc net.minecraft.client.gui.screen.Screen net.minecraft.client.gui.GuiScreen net.minecraft.client.gui.screen.Screen resize() onResize() @@ -308,13 +303,9 @@ net.minecraft.network.login.server.SCustomPayloadLoginPacket net.minecraft.netwo net.minecraft.network.login.server.SEnableCompressionPacket net.minecraft.network.login.server.SPacketEnableCompression net.minecraft.network.login.server.SLoginSuccessPacket net.minecraft.network.login.server.SPacketLoginSuccess net.minecraft.network.play.server.SJoinGamePacket net.minecraft.network.play.server.SPacketJoinGame -net.minecraft.client.network.packet.GameJoinS2CPacket getEntityId() getPlayerId() -net.minecraft.client.network.packet.GameJoinS2CPacket getDimension() func_212642_e() -net.minecraft.client.network.packet.GameJoinS2CPacket getDifficulty() getDifficulty() net.minecraft.network.play.server.SChatPacket net.minecraft.network.play.server.SPacketChat net.minecraft.network.play.server.SSpawnParticlePacket net.minecraft.network.play.server.SPacketParticles net.minecraft.network.play.server.SChangeGameStatePacket net.minecraft.network.play.server.SPacketChangeGameState -net.minecraft.client.network.packet.GameStateChangeS2CPacket getReason() getGameState() net.minecraft.network.play.server.SPlayerPositionLookPacket net.minecraft.network.play.server.SPacketPlayerPosLook net.minecraft.network.play.server.SPlayerPositionLookPacket.Flag net.minecraft.network.play.server.SPacketPlayerPosLook.EnumFlags net.minecraft.network.play.server.SPlayerListItemPacket net.minecraft.network.play.server.SPacketPlayerListItem @@ -322,13 +313,8 @@ net.minecraft.network.play.server.SPlayerListItemPacket.Action net.minecraft.net net.minecraft.network.play.server.SPlayerListItemPacket.Entry net.minecraft.network.play.server.SPacketPlayerListItem.AddPlayerData net.minecraft.network.play.server.SRespawnPacket net.minecraft.network.play.server.SPacketRespawn net.minecraft.network.play.server.SSpawnPlayerPacket net.minecraft.network.play.server.SPacketSpawnPlayer -net.minecraft.client.network.packet.PlayerSpawnS2CPacket getPlayerUuid() getUniqueId() -net.minecraft.client.network.packet.PlayerSpawnS2CPacket getTrackedValues() getDataManagerEntries() -net.minecraft.client.network.packet.PlayerSpawnS2CPacket dataTracker watcher net.minecraft.network.play.server.SSpawnObjectPacket net.minecraft.network.play.server.SPacketSpawnObject net.minecraft.network.play.server.SSpawnMobPacket net.minecraft.network.play.server.SPacketSpawnMob -net.minecraft.client.network.packet.MobSpawnS2CPacket getTrackedValues() getDataManagerEntries() -net.minecraft.client.network.packet.MobSpawnS2CPacket dataTracker dataManager net.minecraft.network.play.server.SSpawnGlobalEntityPacket net.minecraft.network.play.server.SPacketSpawnGlobalEntity net.minecraft.network.play.server.SSpawnPaintingPacket net.minecraft.network.play.server.SPacketSpawnPainting net.minecraft.network.play.server.SSpawnExperienceOrbPacket net.minecraft.network.play.server.SPacketSpawnExperienceOrb @@ -339,15 +325,11 @@ net.minecraft.network.play.server.SEntityVelocityPacket net.minecraft.network.pl net.minecraft.network.play.server.SMountEntityPacket net.minecraft.network.play.server.SPacketEntityAttach net.minecraft.network.play.server.SAnimateHandPacket net.minecraft.network.play.server.SPacketAnimation net.minecraft.network.play.server.SCollectItemPacket net.minecraft.network.play.server.SPacketCollectItem -net.minecraft.client.network.packet.ItemPickupAnimationS2CPacket getEntityId() getEntityID() net.minecraft.network.play.server.SAnimateBlockBreakPacket net.minecraft.network.play.server.SPacketBlockBreakAnim net.minecraft.network.play.client.CResourcePackStatusPacket net.minecraft.network.play.client.CPacketResourcePackStatus net.minecraft.network.play.client.CResourcePackStatusPacket.Status net.minecraft.network.play.client.CPacketResourcePackStatus.Action net.minecraft.network.play.server.SSendResourcePackPacket net.minecraft.network.play.server.SPacketResourcePackSend -net.minecraft.client.network.packet.ResourcePackSendS2CPacket getSHA1() getHash() net.minecraft.network.play.server.SCustomPayloadPlayPacket net.minecraft.network.play.server.SPacketCustomPayload -net.minecraft.client.network.packet.CustomPayloadS2CPacket getChannel() getChannelName() -net.minecraft.client.network.packet.CustomPayloadS2CPacket getData() getBufferData() net.minecraft.network.play.server.SDisconnectPacket net.minecraft.network.play.server.SPacketDisconnect net.minecraft.network.login.server.SLoginSuccessPacket net.minecraft.network.login.server.SPacketLoginSuccess net.minecraft.network.play.server.SUpdateRecipesPacket net.minecraft.network.play.server.SPacketRecipeBook From 8503ff0e67e95a2f8b93b47ce0ae93639dca0c34 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 8 Jul 2024 17:30:09 +0200 Subject: [PATCH 2/3] Remove unnecessary manual mappings --- root.gradle.kts | 12 +- versions/mapping-1.14.4-fabric-forge.txt | 0 versions/mapping-fabric-1.15.2-1.14.4.txt | 12 - versions/mapping-fabric-1.16.1-1.15.2.txt | 2 - versions/mapping-fabric-1.18.1-1.17.1.txt | 7 - versions/mapping-fabric-1.19-1.18.2.txt | 4 - versions/mapping-fabric-1.19.3-1.19.2.txt | 1 - versions/mapping-forge-1.11-1.10.2.txt | 0 versions/mapping-forge-1.11.2-1.11.txt | 2 - versions/mapping-forge-1.12-1.11.2.txt | 1 - versions/mapping-forge-1.14.4-1.12.2.txt | 303 ---------------------- versions/mapping-forge-1.9.4-1.8.9.txt | 65 ----- 12 files changed, 6 insertions(+), 403 deletions(-) delete mode 100644 versions/mapping-1.14.4-fabric-forge.txt delete mode 100644 versions/mapping-fabric-1.16.1-1.15.2.txt delete mode 100644 versions/mapping-fabric-1.19-1.18.2.txt delete mode 100644 versions/mapping-forge-1.11-1.10.2.txt delete mode 100644 versions/mapping-forge-1.11.2-1.11.txt delete mode 100644 versions/mapping-forge-1.12-1.11.2.txt diff --git a/root.gradle.kts b/root.gradle.kts index 4096eb7a..14033c19 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -241,20 +241,20 @@ preprocess { mc11903.link(mc11902, file("versions/mapping-fabric-1.19.3-1.19.2.txt")) mc11902.link(mc11901) mc11901.link(mc11900) - mc11900.link(mc11802, file("versions/mapping-fabric-1.19-1.18.2.txt")) + mc11900.link(mc11802) mc11802.link(mc11801) mc11801.link(mc11701, file("versions/mapping-fabric-1.18.1-1.17.1.txt")) mc11701.link(mc11604, file("versions/mapping-fabric-1.17.1-1.16.4.txt")) mc11604.link(mc11601) - mc11601.link(mc11502, file("versions/mapping-fabric-1.16.1-1.15.2.txt")) + mc11601.link(mc11502) mc11502.link(mc11404, file("versions/mapping-fabric-1.15.2-1.14.4.txt")) - mc11404.link(mc11404Forge, file("versions/mapping-1.14.4-fabric-forge.txt")) + mc11404.link(mc11404Forge) mc11404Forge.link(mc11202, file("versions/mapping-forge-1.14.4-1.12.2.txt")) mc11202.link(mc11201) mc11201.link(mc11200) - mc11200.link(mc11102, file("versions/mapping-forge-1.12-1.11.2.txt")) - mc11102.link(mc11100, file("versions/mapping-forge-1.11.2-1.11.txt")) - mc11100.link(mc11002, file("versions/mapping-forge-1.11-1.10.2.txt")) + mc11200.link(mc11102) + mc11102.link(mc11100) + mc11100.link(mc11002) mc11002.link(mc10904) mc10904.link(mc10809, file("versions/mapping-forge-1.9.4-1.8.9.txt")) mc10809.link(mc10800, file("versions/mapping-forge-1.8.9-1.8.txt")) diff --git a/versions/mapping-1.14.4-fabric-forge.txt b/versions/mapping-1.14.4-fabric-forge.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/versions/mapping-fabric-1.15.2-1.14.4.txt b/versions/mapping-fabric-1.15.2-1.14.4.txt index 96c87321..5a92ae07 100644 --- a/versions/mapping-fabric-1.15.2-1.14.4.txt +++ b/versions/mapping-fabric-1.15.2-1.14.4.txt @@ -1,15 +1,3 @@ net.minecraft.client.util.math.MatrixStack de.johni0702.minecraft.gui.versions.MatrixStack -net.minecraft.client.render.entity.EntityRenderer shouldRender() isVisible() net.minecraft.client.render.GameRenderer renderWorld() renderCenter() -net.minecraft.entity.LivingEntity serverX field_6224 -net.minecraft.entity.LivingEntity serverY field_6245 -net.minecraft.entity.LivingEntity serverZ field_6263 -net.minecraft.entity.LivingEntity serverYaw field_6284 -net.minecraft.entity.LivingEntity serverPitch field_6221 net.minecraft.client.render.WorldRenderer drawBlockOutline() drawHighlightedBlockOutline() -net.minecraft.client.render.GameRenderer method_22973() applyCameraTransformations() -net.minecraft.client.util.math.Matrix4f viewboxMatrix() method_4929() -net.minecraft.client.util.ScreenshotUtils takeScreenshot() method_1663() -net.minecraft.client.util.ScreenshotUtils saveScreenshot() method_1659() -net.minecraft.client.render.WorldRenderer setupTerrain() setUpTerrain() -net.minecraft.client.gui.hud.SpectatorHud cycleSlot() method_1976() diff --git a/versions/mapping-fabric-1.16.1-1.15.2.txt b/versions/mapping-fabric-1.16.1-1.15.2.txt deleted file mode 100644 index 25f2e2db..00000000 --- a/versions/mapping-fabric-1.16.1-1.15.2.txt +++ /dev/null @@ -1,2 +0,0 @@ -net.minecraft.client.network.ClientPlayerEntity getUnderwaterVisibility() method_3140() -net.minecraft.client.render.GameRenderer getBasicProjectionMatrix() method_22973() diff --git a/versions/mapping-fabric-1.18.1-1.17.1.txt b/versions/mapping-fabric-1.18.1-1.17.1.txt index 1384942e..2be3440e 100644 --- a/versions/mapping-fabric-1.18.1-1.17.1.txt +++ b/versions/mapping-fabric-1.18.1-1.17.1.txt @@ -1,14 +1,7 @@ -net.minecraft.client.util.math.MatrixStack multiplyPositionMatrix() method_34425() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket playerEntityId() getEntityId() -net.minecraft.network.packet.s2c.play.GameJoinS2CPacket hardcore() isHardcore() -net.minecraft.network.packet.s2c.play.GameJoinS2CPacket gameMode() getGameMode() -net.minecraft.network.packet.s2c.play.GameJoinS2CPacket previousGameMode() getPreviousGameMode() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket dimensionIds() getDimensionIds() -net.minecraft.network.packet.s2c.play.GameJoinS2CPacket registryManager() getRegistryManager() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket dimensionType() getDimensionType() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket dimensionId() getDimensionId() -net.minecraft.network.packet.s2c.play.GameJoinS2CPacket sha256Seed() getSha256Seed() -net.minecraft.network.packet.s2c.play.GameJoinS2CPacket maxPlayers() getMaxPlayers() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket viewDistance() getViewDistance() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket reducedDebugInfo() hasReducedDebugInfo() net.minecraft.network.packet.s2c.play.GameJoinS2CPacket showDeathScreen() showsDeathScreen() diff --git a/versions/mapping-fabric-1.19-1.18.2.txt b/versions/mapping-fabric-1.19-1.18.2.txt deleted file mode 100644 index 7ac37640..00000000 --- a/versions/mapping-fabric-1.19-1.18.2.txt +++ /dev/null @@ -1,4 +0,0 @@ -# FIXME remap should be able to map these without us explicitly declaring them -net.minecraft.client.render.WorldRenderer fullUpdateFuture field_34808 -net.minecraft.client.render.WorldRenderer updateFinished field_34809 -net.minecraft.client.render.WorldRenderer shouldUpdate field_34810 diff --git a/versions/mapping-fabric-1.19.3-1.19.2.txt b/versions/mapping-fabric-1.19.3-1.19.2.txt index fa2e425d..ba977612 100644 --- a/versions/mapping-fabric-1.19.3-1.19.2.txt +++ b/versions/mapping-fabric-1.19.3-1.19.2.txt @@ -1,4 +1,3 @@ -org.joml.Matrix3 net.minecraft.util.math.Matrix3f org.joml.Matrix4f net.minecraft.util.math.Matrix4f org.joml.Quaternionf net.minecraft.util.math.Quaternion org.joml.Vector3f net.minecraft.util.math.Vec3f diff --git a/versions/mapping-forge-1.11-1.10.2.txt b/versions/mapping-forge-1.11-1.10.2.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/versions/mapping-forge-1.11.2-1.11.txt b/versions/mapping-forge-1.11.2-1.11.txt deleted file mode 100644 index 48e74eec..00000000 --- a/versions/mapping-forge-1.11.2-1.11.txt +++ /dev/null @@ -1,2 +0,0 @@ -net.minecraft.item.ItemStack EMPTY field_190927_a -net.minecraft.util.NonNullList withSize() func_191197_a() diff --git a/versions/mapping-forge-1.12-1.11.2.txt b/versions/mapping-forge-1.12-1.11.2.txt deleted file mode 100644 index 7f5599f4..00000000 --- a/versions/mapping-forge-1.12-1.11.2.txt +++ /dev/null @@ -1 +0,0 @@ -net.minecraft.client.renderer.BufferBuilder net.minecraft.client.renderer.VertexBuffer diff --git a/versions/mapping-forge-1.14.4-1.12.2.txt b/versions/mapping-forge-1.14.4-1.12.2.txt index befba333..f439858e 100644 --- a/versions/mapping-forge-1.14.4-1.12.2.txt +++ b/versions/mapping-forge-1.14.4-1.12.2.txt @@ -1,357 +1,54 @@ -net.minecraft.entity.player.PlayerInventory net.minecraft.entity.player.InventoryPlayer -net.minecraft.potion.EffectInstance net.minecraft.potion.PotionEffect -net.minecraft.client.gui.screen.AddServerScreen net.minecraft.client.gui.GuiScreenAddServer -net.minecraft.resources.AbstractResourcePack net.minecraft.client.resources.AbstractResourcePack net.minecraft.resources.FolderPack net.minecraft.client.resources.FolderResourcePack net.minecraft.resources.IResource net.minecraft.client.resources.IResource net.minecraft.resources.IResourceManager net.minecraft.client.resources.IResourceManager net.minecraft.client.resources.DownloadingPackFinder net.minecraft.client.resources.ResourcePackRepository -net.minecraft.client.renderer.chunk.ChunkRenderTask net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator net.minecraft.client.settings.AbstractOption net.minecraft.client.settings.GameSettings.Options net.minecraft.client.settings.SliderPercentageOption func_216728_a() net.minecraft.client.settings.GameSettings.Options setValueMax() net.minecraftforge.eventbus.api.SubscribeEvent net.minecraftforge.fml.common.eventhandler.SubscribeEvent net.minecraftforge.eventbus.api.EventPriority net.minecraftforge.fml.common.eventhandler.EventPriority net.minecraftforge.eventbus.api.Cancelable net.minecraftforge.fml.common.eventhandler.Cancelable net.minecraftforge.eventbus.api.Event net.minecraftforge.fml.common.eventhandler.Event -net.minecraft.crash.ReportedException net.minecraft.util.ReportedException -net.minecraftforge.eventbus.api.IEventBus net.minecraftforge.fml.common.eventhandler.EventBus -net.minecraft.network.play.server.SPacketEntity.Move net.minecraft.network.play.server.SPacketEntity.S17PacketEntityLookMove net.minecraftforge.fml.network.NetworkRegistry net.minecraftforge.fml.common.network.NetworkRegistry -net.minecraft.client.particle.ParticleManager queue queueEntityFX org.apache.maven.artifact.versioning.ComparableVersion net.minecraftforge.fml.common.versioning.ComparableVersion org.lwjgl.glfw.GLFW com.replaymod.core.versions.GLFW net.minecraft.client.MainWindow com.replaymod.core.versions.Window -net.minecraft.client.audio.SimpleSound net.minecraft.client.audio.PositionedSoundRecord -net.minecraft.client.gui.IngameGui net.minecraft.client.gui.GuiIngame -net.minecraft.util.HandSide net.minecraft.util.EnumHandSide net.minecraft.resources.ResourcePack getInputStream() net.minecraft.client.resources.AbstractResourcePack getInputStreamByName() net.minecraft.util.text.ITextComponent getString() getUnformattedText() net.minecraft.client.Minecraft getPackFinder() getResourcePackRepository() net.minecraft.entity.Entity getPositionVec() net.minecraft.command.ICommandSender getPositionVector() -net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent -net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent addWidget() addButton() -net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent removeWidget() removeButton() -net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent getWidgetList() getButtonList() -net.minecraftforge.event.TickEvent net.minecraftforge.fml.common.gameevent.TickEvent -net.minecraft.potion.Effects net.minecraft.init.MobEffects net.minecraftforge.event.entity.player.PlayerEvent net.minecraftforge.fml.common.gameevent.PlayerEvent -net.minecraftforge.event.entity.player.PlayerEvent.ItemPickupEvent net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent -# -# Note: These were in large part written before the preprocessor got smart, a good deal of them can probably be removed -# by now. Just gotta find someone to do it. Or automate it. Probably the latter, later. -# They're also in some parts outdated since they used to be 1.14.4-fabric to 1.13.2-forge but are now used for -# 1.14.4-forge to 1.12.2-forge (since the preprocessor handles the fabric-forge jump on 1.14.4). -# -net.minecraft.client.particle.Particle x posX -net.minecraft.client.particle.Particle y posY -net.minecraft.client.particle.Particle z posZ -net.minecraft.client.particle.Particle cameraX interpPosX -net.minecraft.client.particle.Particle cameraY interpPosY -net.minecraft.client.particle.Particle cameraZ interpPosZ -net.minecraft.entity.player.PlayerModelPart net.minecraft.entity.player.EnumPlayerModelParts -net.minecraft.util.Direction net.minecraft.util.EnumFacing -net.minecraft.client.render.model.BakedQuad net.minecraft.client.renderer.model.BakedQuad -net.minecraft.client.render.model.BakedQuad hasColor() hasTintIndex() -net.minecraft.client.render.model.BakedQuad getColorIndex() getTintIndex() -net.minecraft.client.renderer.tileentity.EndPortalTileEntityRenderer net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer -net.minecraft.client.render.model.BakedModel net.minecraft.client.renderer.model.IBakedModel -net.minecraft.client.util.math.Matrix4f net.minecraft.client.renderer.Matrix4f -net.minecraft.client.util.math.Matrix4f method_4929() perspective() -net.minecraft.client.render.Frustum net.minecraft.client.renderer.culling.Frustum -net.minecraft.client.render.Frustum intersects() isBoxInFrustum() -net.minecraft.client.texture.NativeImage net.minecraft.client.renderer.texture.NativeImage -net.minecraft.client.particle.ParticleManager newParticles queue -net.minecraft.client.particle.ParticleManager setWorld() clearEffects() -net.minecraft.client.util.Session net.minecraft.util.Session -net.minecraft.server.integrated.IntegratedServer field_5524 isGamePaused -net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer -# Note: method actually part of super class but Remap doesn't support those for @Redirect -net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer method_3591() render() -net.minecraft.client.render.block.entity.BlockEntityRenderer net.minecraft.client.renderer.tileentity.TileEntityRenderer -net.minecraft.client.render.block.entity.BlockEntityRenderer method_3591() render() -net.minecraft.client.gui.SpectatorGui net.minecraft.client.gui.GuiSpectator -net.minecraft.client.gui.SpectatorGui method_1976() onHotbarSelected() -net.minecraft.entity.passive.AnimalEntity net.minecraft.entity.passive.EntityAnimal -net.minecraft.item.ItemStack getName() getDisplayName() -net.minecraft.client.gui.Element net.minecraft.client.gui.IGuiEventListener -net.minecraft.util.text.StringTextComponent net.minecraft.util.text.TextComponentString -net.minecraft.util.text.TranslationTextComponent net.minecraft.util.text.TextComponentTranslation -net.minecraft.client.renderer.entity.LivingRenderer net.minecraft.client.renderer.entity.RenderLivingBase -net.minecraft.client.renderer.entity.LivingRenderer method_4055() canRenderName() -net.minecraft.client.renderer.entity.LivingRenderer render() renderModel() -net.minecraft.client.renderer.entity.LivingRenderer scaleAndTranslate() prepareScale() -net.minecraft.client.renderer.entity.LivingRenderer method_4054() doRender() net.minecraft.client.renderer.entity.TippedArrowRenderer net.minecraft.client.renderer.entity.RenderArrow -net.minecraft.client.renderer.entity.EntityRenderer net.minecraft.client.renderer.entity.Render -net.minecraft.client.renderer.entity.EntityRenderer render() doRender() -net.minecraft.client.renderer.entity.EntityRenderer renderLabel() renderLivingLabel() -net.minecraft.client.multiplayer.PlayerController net.minecraft.client.multiplayer.PlayerControllerMP -net.minecraft.client.multiplayer.PlayerController client mc -net.minecraft.client.multiplayer.PlayerController networkHandler connection -net.minecraft.client.multiplayer.PlayerController isFlyingLocked() isSpectatorMode() -net.minecraft.client.multiplayer.PlayerController getCurrentGameMode() getCurrentGameType() com.mojang.blaze3d.platform.GLX net.minecraft.client.renderer.OpenGlHelper -com.mojang.blaze3d.platform.GLX isUsingFBOs() isFramebufferEnabled() -net.minecraft.client.renderer.chunk.ChunkRender net.minecraft.client.renderer.chunk.RenderChunk -net.minecraft.client.renderer.chunk.ChunkRender unscheduleRebuild() clearNeedsUpdate() -net.minecraft.nbt.CompoundNBT net.minecraft.nbt.NBTTagCompound -net.minecraft.client.render.BackgroundRenderer net.minecraft.client.renderer.FogRenderer -net.minecraft.client.render.BackgroundRenderer applyFog() setupFog() -net.minecraft.resource.Resource net.minecraft.resources.IResource net.minecraft.client.renderer.ItemRenderer net.minecraft.client.renderer.RenderItem net.minecraft.client.renderer.FirstPersonRenderer net.minecraft.client.renderer.ItemRenderer net.minecraft.client.gui.screen.IngameMenuScreen net.minecraft.client.gui.GuiIngameMenu -net.minecraft.client.gui.screen.MultiplayerScreen net.minecraft.client.gui.GuiMultiplayer -net.minecraft.client.gui.screen.WorldSelectionScreen net.minecraft.client.gui.GuiWorldSelection # Note: GuiButton has been split into Button and Widget (now shared with e.g. checkboxes), # most members are actually on the latter (there's also AbstractButton in the middle, but it isn't interesting) net.minecraft.client.gui.widget.Widget net.minecraft.client.gui.GuiButton net.minecraft.client.gui.widget.Widget active net.minecraft.client.gui.GuiButton enabled -net.minecraft.client.gui.screen.MainMenuScreen net.minecraft.client.gui.GuiMainMenu -net.minecraft.client.gui.screen.MainMenuScreen realmsNotificationGui realmsNotification -net.minecraft.realms.RealmsScreenProxy net.minecraft.client.gui.GuiScreenRealmsProxy -net.minecraft.resource.ResourceNotFoundException net.minecraft.resources.ResourcePackFileNotFoundException -net.minecraft.resource.ResourcePack net.minecraft.resources.IResourcePack -net.minecraft.resource.ResourcePack findResources() getAllResourceLocations() -net.minecraft.resource.ResourcePack getNamespaces() getResourceNamespaces() -net.minecraft.resource.ResourceType net.minecraft.resources.ResourcePackType net.minecraft.network.PacketDirection net.minecraft.network.EnumPacketDirection -net.minecraft.network.ProtocolType net.minecraft.network.EnumConnectionState -net.minecraft.network.IPacket net.minecraft.network.Packet net.minecraft.client.gui.screen.DownloadTerrainScreen net.minecraft.client.gui.GuiDownloadTerrain net.minecraft.client.gui.screen.AlertScreen net.minecraft.client.gui.GuiErrorScreen net.minecraft.client.entity.player.RemoteClientPlayerEntity net.minecraft.client.entity.EntityOtherPlayerMP -net.minecraft.world.Difficulty net.minecraft.world.EnumDifficulty -net.minecraft.world.chunk.IChunkLightProvider net.minecraft.world.chunk.IChunkProvider -net.minecraft.profiler.IProfiler net.minecraft.profiler.Profiler -net.minecraft.client.renderer.GameRenderer net.minecraft.client.renderer.EntityRenderer -net.minecraft.client.renderer.GameRenderer firstPersonRenderer itemRenderer -net.minecraft.client.renderer.GameRenderer client mc -net.minecraft.client.renderer.GameRenderer render() updateCameraAndRender() -net.minecraft.client.renderer.GameRenderer applyCameraTransformations() setupCameraTransform() -net.minecraft.client.renderer.GameRenderer renderAboveClouds() renderCloudsCheck() -net.minecraft.client.renderer.GameRenderer func_215308_a() renderHand() -net.minecraft.client.renderer.WorldRenderer net.minecraft.client.renderer.RenderGlobal -net.minecraft.client.renderer.WorldRenderer setBlockBreakingProgress() sendBlockBreakProgress() -net.minecraft.client.renderer.WorldRenderer drawHighlightedBlockOutline() drawSelectionBox() -net.minecraft.client.renderer.WorldRenderer chunkBatcher renderDispatcher -net.minecraft.client.renderer.WorldRenderer chunkInfos renderInfos -net.minecraft.client.renderer.WorldRenderer chunkRenderers chunksToUpdate -net.minecraft.client.renderer.WorldRenderer terrainUpdateNecessary displayListEntitiesDirty -net.minecraft.client.renderer.WorldRenderer field_4076 renderEntitiesStartupCounter -net.minecraft.client.renderer.WorldRenderer setUpTerrain() setupTerrain() -net.minecraft.client.renderer.WorldRenderer setWorld() setWorldAndLoadRenderers() -net.minecraft.client.renderer.WorldRenderer reload() loadRenderers() -com.mojang.blaze3d.platform.GlStateManager popAttributes() popAttrib() -com.mojang.blaze3d.platform.GlStateManager disableColorLogicOp() disableColorLogic() com.mojang.blaze3d.platform.GlStateManager disableTexture() disableTexture2D() -com.mojang.blaze3d.platform.GlStateManager enableColorLogicOp() enableColorLogic() com.mojang.blaze3d.platform.GlStateManager enableTexture() enableTexture2D() com.mojang.blaze3d.platform.GlStateManager enableAlphaTest() enableAlpha() com.mojang.blaze3d.platform.GlStateManager activeTexture activeTextureUnit com.mojang.blaze3d.platform.GlStateManager net.minecraft.client.renderer.GlStateManager -com.mojang.blaze3d.platform.GlStateManager.CapabilityTracker net.minecraft.client.renderer.GlStateManager.BooleanState -com.mojang.blaze3d.platform.GlStateManager.FogState net.minecraft.client.renderer.GlStateManager.FogState -com.mojang.blaze3d.platform.GlStateManager.FogState capState fog -com.mojang.blaze3d.platform.GlStateManager.Texture2DState net.minecraft.client.renderer.GlStateManager.Texture2DState -com.mojang.blaze3d.platform.GlStateManager.Texture2DState capState texture2DState -net.minecraft.SharedConstants isValidChar() isAllowedCharacter() -net.minecraft.SharedConstants net.minecraft.util.SharedConstants -net.minecraft.server.MinecraftServer getLevelName() getWorldName() -net.minecraft.client.gui.screen.ConfirmScreen net.minecraft.client.gui.GuiYesNo -net.minecraft.client.Mouse getX() getMouseX() -net.minecraft.client.Mouse getY() getMouseY() -net.minecraft.client.Mouse net.minecraft.client.MouseHelper -net.minecraft.client.Mouse isCursorLocked mouseGrabbed -net.minecraft.client.Mouse lockCursor() grabMouse() -net.minecraft.client.Mouse unlockCursor() ungrabMouse() -net.minecraft.client.Mouse isCursorLocked() isMouseGrabbed() -net.minecraft.client.Mouse onMouseScroll() scrollCallback() -net.minecraft.client.audio.PositionedSoundInstance master() getMasterRecord() -net.minecraft.client.audio.PositionedSoundInstance net.minecraft.client.audio.SimpleSound -net.minecraft.client.gui.DrawableHelper fill() drawRect() -net.minecraft.client.gui.DrawableHelper net.minecraft.client.gui.Gui net.minecraft.client.gui.screen.Screen hasControlDown() isCtrlKeyDown() net.minecraft.client.gui.screen.Screen hasShiftDown() isShiftKeyDown() net.minecraft.client.gui.screen.Screen init(Lnet/minecraft/client/Minecraft;II)V setWorldAndResolution() -net.minecraft.client.gui.screen.Screen minecraft mc net.minecraft.client.gui.screen.Screen net.minecraft.client.gui.GuiScreen net.minecraft.client.gui.screen.Screen resize() onResize() -net.minecraft.client.gui.screen.Screen passEvents allowUserInput net.minecraft.client.gui.screen.Screen removed() onGuiClosed() -net.minecraft.client.gui.screen.Screen renderBackground() drawDefaultBackground() -net.minecraft.client.gui.screen.Screen renderDirtBackground() drawBackground() -net.minecraft.client.gui.hud.ChatHud net.minecraft.client.gui.GuiNewChat -net.minecraft.client.GameSettings net.minecraft.client.settings.GameSettings -net.minecraft.client.GameSettings debugEnabled showDebugInfo -net.minecraft.client.GameSettings viewDistance renderDistanceChunks -net.minecraft.client.GameSettings hudHidden hideGUI -net.minecraft.client.GameSettings gamma gammaSetting -net.minecraft.client.GameSettings keysAll keyBindings -net.minecraft.client.GameSettings keyChat keyBindChat -net.minecraft.client.GameSettings keyCommand keyBindCommand -net.minecraft.client.GameSettings keyAttack keyBindAttack -net.minecraft.client.GameSettings keyUse keyBindUseItem -net.minecraft.client.GameSettings keySneak keyBindSneak -net.minecraft.client.GameSettings keyForward keyBindForward -net.minecraft.client.GameSettings keyBack keyBindBack -net.minecraft.client.GameSettings keyLeft keyBindLeft -net.minecraft.client.GameSettings keyRight keyBindRight -net.minecraft.client.GameSettings keyJump keyBindJump -net.minecraft.client.util.Window getScaleFactor() getGuiScaleFactor() -net.minecraft.client.util.Window setFullscreen() update() -net.minecraft.client.util.Window method_4493() setupOverlayRendering() -net.minecraft.client.util.Window net.minecraft.client.MainWindow -net.minecraft.resources.AbstractResourcePack net.minecraft.resources.AbstractResourcePack -net.minecraft.resources.AbstractResourcePack containsFile() resourceExists() -net.minecraft.resources.AbstractResourcePack base file -net.minecraft.resource.ResourcePackContainer net.minecraft.resources.ResourcePackInfo -net.minecraft.resource.ResourcePackContainer.Factory net.minecraft.resources.ResourcePackInfo.IFactory -net.minecraft.resource.ResourcePackContainer.InsertionPosition net.minecraft.resources.ResourcePackInfo.Priority -net.minecraft.resource.ResourcePackContainer of() func_195793_a() -net.minecraft.resource.ResourcePackContainerManager net.minecraft.resources.ResourcePackList -net.minecraft.resource.ResourcePackContainerManager addCreator() addPackFinder() -net.minecraft.resource.ResourcePackCreator net.minecraft.resources.IPackFinder -net.minecraft.resource.ResourcePackCreator registerContainer() addPackInfosToMap() -net.minecraft.world.World getGeneratorType() getWorldType() net.minecraft.world.IEntityReader getPlayerByUuid() net.minecraft.world.World getPlayerEntityByUUID() -net.minecraft.client.renderer.entity.EntityRendererManager net.minecraft.client.renderer.entity.RenderManager -net.minecraft.client.renderer.entity.EntityRendererManager cameraYaw playerViewY -net.minecraft.client.renderer.entity.EntityRendererManager cameraPitch playerViewX -net.minecraft.client.renderer.entity.EntityRendererManager configure() cacheActiveRenderInfo() -net.minecraft.client.renderer.entity.EntityRendererManager render() renderEntityStatic() -net.minecraft.client.util.InputUtil net.minecraft.client.util.InputMappings -net.minecraft.client.util.InputUtil isKeyPressed() isKeyDown() -net.minecraft.client.util.InputUtil$KeyCode net.minecraft.client.util.InputMappings$Input net.minecraft.client.resources.DownloadingPackFinder func_217818_a() downloadResourcePack() net.minecraft.client.resources.DownloadingPackFinder func_217816_a() setServerResourcePack() -net.minecraft.client.entity.player.ClientPlayerEntity net.minecraft.client.entity.EntityPlayerSP -net.minecraft.client.entity.player.ClientPlayerEntity client mc -net.minecraft.client.entity.player.ClientPlayerEntity renderYaw renderArmYaw -net.minecraft.client.entity.player.ClientPlayerEntity renderPitch renderArmPitch -net.minecraft.client.entity.player.ClientPlayerEntity lastRenderYaw prevRenderArmYaw -net.minecraft.client.entity.player.ClientPlayerEntity lastRenderPitch prevRenderArmPitch -net.minecraft.client.entity.player.AbstractClientPlayerEntity net.minecraft.client.entity.AbstractClientPlayer -net.minecraft.client.network.login.ClientLoginNetHandler net.minecraft.client.network.NetHandlerLoginClient -net.minecraft.client.network.login.ClientLoginNetHandler connection networkManager -net.minecraft.client.network.login.ClientLoginNetHandler onQueryRequest() func_209521_a() -net.minecraft.client.network.login.ClientLoginNetHandler onLoginSuccess() handleLoginSuccess() -net.minecraft.client.network.play.ClientPlayNetHandler net.minecraft.client.network.NetHandlerPlayClient -net.minecraft.client.network.play.ClientPlayNetHandler playerListEntries playerInfoMap -net.minecraft.client.network.play.ClientPlayNetHandler onPlayerList() handlePlayerListItem() -net.minecraft.client.network.play.ClientPlayNetHandler onPlayerRespawn() handleRespawn() -net.minecraft.client.network.play.NetworkPlayerInfo net.minecraft.client.network.NetworkPlayerInfo -net.minecraft.entity.item.ItemFrameEntity net.minecraft.entity.item.EntityItemFrame -net.minecraft.entity.player.PlayerEntity net.minecraft.entity.player.EntityPlayer -net.minecraft.entity.player.PlayerEntity selectedItem itemStackMainHand -net.minecraft.entity.player.PlayerEntity isSleeping() isPlayerSleeping() -net.minecraft.entity.MobEntity net.minecraft.entity.EntityLiving -net.minecraft.entity.LivingEntity net.minecraft.entity.EntityLivingBase -net.minecraft.entity.LivingEntity headYaw rotationYawHead -net.minecraft.entity.LivingEntity prevHeadYaw prevRotationYawHead -net.minecraft.entity.LivingEntity isHandSwinging isSwingInProgress -net.minecraft.entity.LivingEntity handSwingTicks swingProgressInt -net.minecraft.entity.LivingEntity preferredHand swingingHand -net.minecraft.entity.LivingEntity itemUseTimeLeft activeItemStackUseCount -net.minecraft.entity.LivingEntity field_6224 interpTargetX -net.minecraft.entity.LivingEntity field_6245 interpTargetY -net.minecraft.entity.LivingEntity field_6263 interpTargetZ -net.minecraft.entity.LivingEntity field_6284 interpTargetYaw -net.minecraft.entity.LivingEntity field_6221 interpTargetPitch -net.minecraft.entity.LivingEntity isSleeping() isPlayerSleeping() -net.minecraft.entity.LivingEntity tickMovement() livingTick() -net.minecraft.entity.Entity afterSpawn() preparePlayerToSpawn() -net.minecraft.entity.Entity spawnSprintingParticles() createRunningParticles() -net.minecraft.entity.Entity isRowingBoat() isRiding() -net.minecraft.entity.Entity updateNeeded addedToChunk -net.minecraft.entity.Entity chunkX chunkCoordX -net.minecraft.entity.Entity chunkY chunkCoordY -net.minecraft.entity.Entity chunkZ chunkCoordZ -net.minecraft.entity.Entity x posX -net.minecraft.entity.Entity y posY -net.minecraft.entity.Entity z posZ -net.minecraft.entity.Entity yaw rotationYaw -net.minecraft.entity.Entity pitch rotationPitch -net.minecraft.entity.Entity prevX prevPosX -net.minecraft.entity.Entity prevY prevPosY -net.minecraft.entity.Entity prevZ prevPosZ -net.minecraft.entity.Entity prevYaw prevRotationYaw -net.minecraft.entity.Entity prevPitch prevRotationPitch -net.minecraft.entity.Entity prevRenderX lastTickPosX -net.minecraft.entity.Entity prevRenderY lastTickPosY -net.minecraft.entity.Entity prevRenderZ lastTickPosZ -net.minecraft.util.math.RayTraceContext net.minecraft.util.math.RayTraceResult -net.minecraft.inventory.EquipmentSlotType net.minecraft.inventory.EntityEquipmentSlot -net.minecraft.client.recipe.book.ClientRecipeBook net.minecraft.client.util.RecipeBookClient net.minecraft.util.Hand net.minecraft.util.EnumHand -net.minecraft.client.renderer.model.ModelBox net.minecraft.client.model.ModelBox -net.minecraft.client.renderer.entity.model.RendererModel net.minecraft.client.model.ModelRenderer -net.minecraft.client.renderer.entity.model.RendererModel boxes cubeList -net.minecraft.client.renderer.entity.model.RendererModel name boxName -net.minecraft.client.renderer.entity.model.RendererModel method_2852() renderWithRotation() -net.minecraft.client.renderer.texture.AtlasTexture net.minecraft.client.renderer.texture.TextureMap -net.minecraft.client.renderer.texture.AtlasTexture BLOCK_ATLAS_TEX LOCATION_BLOCKS_TEXTURE -net.minecraft.client.world.ClientWorld net.minecraft.client.multiplayer.WorldClient -net.minecraft.client.world.ClientWorld client mc -net.minecraft.client.world.ClientWorld disconnect() sendQuittingDisconnectingPacket() -#net.minecraft.client.network.packet net.minecraft.network.play.server -net.minecraft.network.login.server.SCustomPayloadLoginPacket net.minecraft.network.login.server.SPacketCustomPayloadLogin -net.minecraft.network.login.server.SEnableCompressionPacket net.minecraft.network.login.server.SPacketEnableCompression -net.minecraft.network.login.server.SLoginSuccessPacket net.minecraft.network.login.server.SPacketLoginSuccess -net.minecraft.network.play.server.SJoinGamePacket net.minecraft.network.play.server.SPacketJoinGame -net.minecraft.network.play.server.SChatPacket net.minecraft.network.play.server.SPacketChat -net.minecraft.network.play.server.SSpawnParticlePacket net.minecraft.network.play.server.SPacketParticles -net.minecraft.network.play.server.SChangeGameStatePacket net.minecraft.network.play.server.SPacketChangeGameState -net.minecraft.network.play.server.SPlayerPositionLookPacket net.minecraft.network.play.server.SPacketPlayerPosLook -net.minecraft.network.play.server.SPlayerPositionLookPacket.Flag net.minecraft.network.play.server.SPacketPlayerPosLook.EnumFlags -net.minecraft.network.play.server.SPlayerListItemPacket net.minecraft.network.play.server.SPacketPlayerListItem -net.minecraft.network.play.server.SPlayerListItemPacket.Action net.minecraft.network.play.server.SPacketPlayerListItem.Action -net.minecraft.network.play.server.SPlayerListItemPacket.Entry net.minecraft.network.play.server.SPacketPlayerListItem.AddPlayerData -net.minecraft.network.play.server.SRespawnPacket net.minecraft.network.play.server.SPacketRespawn -net.minecraft.network.play.server.SSpawnPlayerPacket net.minecraft.network.play.server.SPacketSpawnPlayer -net.minecraft.network.play.server.SSpawnObjectPacket net.minecraft.network.play.server.SPacketSpawnObject -net.minecraft.network.play.server.SSpawnMobPacket net.minecraft.network.play.server.SPacketSpawnMob -net.minecraft.network.play.server.SSpawnGlobalEntityPacket net.minecraft.network.play.server.SPacketSpawnGlobalEntity -net.minecraft.network.play.server.SSpawnPaintingPacket net.minecraft.network.play.server.SPacketSpawnPainting -net.minecraft.network.play.server.SSpawnExperienceOrbPacket net.minecraft.network.play.server.SPacketSpawnExperienceOrb -net.minecraft.network.play.server.SDestroyEntitiesPacket net.minecraft.network.play.server.SPacketDestroyEntities -net.minecraft.network.play.server.SEntityTeleportPacket net.minecraft.network.play.server.SPacketEntityTeleport -net.minecraft.network.play.server.SEntityHeadLookPacket net.minecraft.network.play.server.SPacketEntityHeadLook -net.minecraft.network.play.server.SEntityVelocityPacket net.minecraft.network.play.server.SPacketEntityVelocity -net.minecraft.network.play.server.SMountEntityPacket net.minecraft.network.play.server.SPacketEntityAttach -net.minecraft.network.play.server.SAnimateHandPacket net.minecraft.network.play.server.SPacketAnimation -net.minecraft.network.play.server.SCollectItemPacket net.minecraft.network.play.server.SPacketCollectItem -net.minecraft.network.play.server.SAnimateBlockBreakPacket net.minecraft.network.play.server.SPacketBlockBreakAnim -net.minecraft.network.play.client.CResourcePackStatusPacket net.minecraft.network.play.client.CPacketResourcePackStatus -net.minecraft.network.play.client.CResourcePackStatusPacket.Status net.minecraft.network.play.client.CPacketResourcePackStatus.Action -net.minecraft.network.play.server.SSendResourcePackPacket net.minecraft.network.play.server.SPacketResourcePackSend -net.minecraft.network.play.server.SCustomPayloadPlayPacket net.minecraft.network.play.server.SPacketCustomPayload -net.minecraft.network.play.server.SDisconnectPacket net.minecraft.network.play.server.SPacketDisconnect -net.minecraft.network.login.server.SLoginSuccessPacket net.minecraft.network.login.server.SPacketLoginSuccess net.minecraft.network.play.server.SUpdateRecipesPacket net.minecraft.network.play.server.SPacketRecipeBook -net.minecraft.network.play.server.SAdvancementInfoPacket net.minecraft.network.play.server.SPacketAdvancementInfo -net.minecraft.network.play.server.SSelectAdvancementsTabPacket net.minecraft.network.play.server.SPacketSelectAdvancementsTab -net.minecraft.network.play.server.SUpdateHealthPacket net.minecraft.network.play.server.SPacketUpdateHealth net.minecraft.network.play.server.SOpenHorseWindowPacket net.minecraft.network.play.server.SPacketOpenWindow -net.minecraft.network.play.server.SCloseWindowPacket net.minecraft.network.play.server.SPacketCloseWindow -net.minecraft.network.play.server.SSetSlotPacket net.minecraft.network.play.server.SPacketSetSlot net.minecraft.network.play.server.SWindowPropertyPacket net.minecraft.network.play.server.SPacketWindowItems -net.minecraft.network.play.server.SOpenSignMenuPacket net.minecraft.network.play.server.SPacketSignEditorOpen -net.minecraft.network.play.server.SStatisticsPacket net.minecraft.network.play.server.SPacketStatistics -net.minecraft.network.play.server.SSetExperiencePacket net.minecraft.network.play.server.SPacketSetExperience -net.minecraft.network.play.server.SCameraPacket net.minecraft.network.play.server.SPacketCamera -net.minecraft.network.play.server.SPlayerAbilitiesPacket net.minecraft.network.play.server.SPacketPlayerAbilities -net.minecraft.network.play.server.STitlePacket net.minecraft.network.play.server.SPacketTitle -net.minecraft.network.play.server.SUnloadChunkPacket net.minecraft.network.play.server.SPacketUnloadChunk -net.minecraft.network.play.server.SPlaySoundEffectPacket net.minecraft.network.play.server.SPacketSoundEffect -net.minecraft.network.play.server.SPlaySoundEventPacket net.minecraft.network.play.server.SPacketEffect -net.minecraft.network.play.server.SEntityMetadataPacket net.minecraft.network.play.server.SPacketEntityMetadata -net.minecraft.network.play.server.SEntityEquipmentPacket net.minecraft.network.play.server.SPacketEntityEquipment -net.minecraft.network.play.server.SEntityPacket net.minecraft.network.play.server.SPacketEntity -net.minecraft.network.play.server.SEntityPacket.Rotate net.minecraft.network.play.server.SPacketEntity.Look -net.minecraft.network.play.server.SEntityPacket.MoveRelative net.minecraft.network.play.server.SPacketEntity.RelMove -net.minecraft.network.play.server.SEntityPacket.MovePacket net.minecraft.network.play.server.SPacketEntity.Move diff --git a/versions/mapping-forge-1.9.4-1.8.9.txt b/versions/mapping-forge-1.9.4-1.8.9.txt index 9e250f8b..fcd55dd9 100644 --- a/versions/mapping-forge-1.9.4-1.8.9.txt +++ b/versions/mapping-forge-1.9.4-1.8.9.txt @@ -1,71 +1,6 @@ -net.minecraft.stats.StatisticsManager net.minecraft.stats.StatFileWriter net.minecraft.init.MobEffects net.minecraft.potion.Potion -net.minecraft.util.math.Vec3d net.minecraft.util.Vec3 -net.minecraft.util.text.TextComponentString net.minecraft.util.ChatComponentText -net.minecraft.util.text.TextComponentTranslation net.minecraft.util.ChatComponentTranslation -net.minecraft.util.text.Style net.minecraft.util.ChatStyle -net.minecraft.util.text.TextFormatting net.minecraft.util.EnumChatFormatting -net.minecraft.util.text.ITextComponent net.minecraft.util.IChatComponent net.minecraft.network.datasync.EntityDataManager net.minecraft.entity.DataWatcher -net.minecraft.network.datasync.EntityDataManager.DataEntry net.minecraft.entity.DataWatcher.WatchableObject net.minecraft.client.renderer.ItemRenderer rotateArm() rotateWithPlayerRotations() -net.minecraft.client.renderer.VertexBuffer net.minecraft.client.renderer.WorldRenderer -net.minecraft.client.particle.Particle net.minecraft.client.particle.EntityFX -net.minecraft.util.math.MathHelper net.minecraft.util.MathHelper net.minecraft.util.SoundCategory net.minecraft.client.audio.SoundCategory -net.minecraft.util.math.BlockPos net.minecraft.util.BlockPos -net.minecraft.client.gui.GuiWorldSelection net.minecraft.client.gui.GuiSelectWorld -net.minecraft.util.math.AxisAlignedBB net.minecraft.util.AxisAlignedBB -net.minecraft.util.math.RayTraceResult net.minecraft.util.MovingObjectPosition -net.minecraft.client.renderer.Matrix4f net.minecraft.util.Matrix4f -net.minecraft.client.renderer.RenderItem net.minecraft.client.renderer.entity.RenderItem -net.minecraft.network.play.server.SPacketSpawnMob dataManager field_149043_l -net.minecraft.network.play.server.SPacketSpawnMob getDataManagerEntries() func_149027_c() -net.minecraft.network.play.server.SPacketSpawnPlayer getDataManagerEntries() func_148944_c() -net.minecraft.client.multiplayer.ServerList saveSingleServer() func_147414_b() net.minecraft.util.SoundEvent com.replaymod.core.versions.MCVer.SoundEvent -net.minecraft.network.NettyPacketDecoder net.minecraft.util.MessageDeserializer -net.minecraft.network.NettyPacketEncoder net.minecraft.util.MessageSerializer -net.minecraft.network.play.server.SPacketJoinGame net.minecraft.network.play.server.S01PacketJoinGame -net.minecraft.network.play.server.SPacketChat net.minecraft.network.play.server.S02PacketChat -net.minecraft.network.play.server.SPacketParticles net.minecraft.network.play.server.S2APacketParticles -net.minecraft.network.play.server.SPacketChangeGameState net.minecraft.network.play.server.S2BPacketChangeGameState -net.minecraft.network.play.server.SPacketPlayerPosLook net.minecraft.network.play.server.S08PacketPlayerPosLook -net.minecraft.network.play.server.SPacketPlayerListItem net.minecraft.network.play.server.S38PacketPlayerListItem -net.minecraft.network.play.server.SPacketRespawn net.minecraft.network.play.server.S07PacketRespawn -net.minecraft.network.play.server.SPacketSpawnPlayer net.minecraft.network.play.server.S0CPacketSpawnPlayer -net.minecraft.network.play.server.SPacketSpawnObject net.minecraft.network.play.server.S0EPacketSpawnObject -net.minecraft.network.play.server.SPacketSpawnMob net.minecraft.network.play.server.S0FPacketSpawnMob -net.minecraft.network.play.server.SPacketSpawnGlobalEntity net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity -net.minecraft.network.play.server.SPacketSpawnPainting net.minecraft.network.play.server.S10PacketSpawnPainting -net.minecraft.network.play.server.SPacketSpawnExperienceOrb net.minecraft.network.play.server.S11PacketSpawnExperienceOrb -net.minecraft.network.play.server.SPacketDestroyEntities net.minecraft.network.play.server.S13PacketDestroyEntities -net.minecraft.network.play.server.SPacketEntity net.minecraft.network.play.server.S14PacketEntity -net.minecraft.network.play.server.SPacketEntityTeleport net.minecraft.network.play.server.S18PacketEntityTeleport -net.minecraft.network.play.server.SPacketEntityHeadLook net.minecraft.network.play.server.S19PacketEntityHeadLook -net.minecraft.network.play.server.SPacketEntityVelocity net.minecraft.network.play.server.S12PacketEntityVelocity -net.minecraft.network.play.server.SPacketEntityAttach net.minecraft.network.play.server.S1BPacketEntityAttach -net.minecraft.network.play.server.SPacketAnimation net.minecraft.network.play.server.S0BPacketAnimation -net.minecraft.network.play.server.SPacketCollectItem net.minecraft.network.play.server.S0DPacketCollectItem -net.minecraft.network.play.server.SPacketBlockBreakAnim net.minecraft.network.play.server.S25PacketBlockBreakAnim -net.minecraft.network.play.client.CPacketResourcePackStatus net.minecraft.network.play.client.C19PacketResourcePackStatus -net.minecraft.network.play.client.CPacketResourcePackStatus.Action net.minecraft.network.play.client.C19PacketResourcePackStatus.Action -net.minecraft.network.play.server.SPacketResourcePackSend net.minecraft.network.play.server.S48PacketResourcePackSend -net.minecraft.network.play.server.SPacketCustomPayload net.minecraft.network.play.server.S3FPacketCustomPayload -net.minecraft.network.play.server.SPacketDisconnect net.minecraft.network.play.server.S40PacketDisconnect -net.minecraft.network.play.server.SPacketUpdateHealth net.minecraft.network.play.server.S06PacketUpdateHealth -net.minecraft.network.play.server.SPacketSetSlot net.minecraft.network.play.server.S2FPacketSetSlot -net.minecraft.network.play.server.SPacketSignEditorOpen net.minecraft.network.play.server.S36PacketSignEditorOpen -net.minecraft.network.play.server.SPacketSetExperience net.minecraft.network.play.server.S1FPacketSetExperience -net.minecraft.network.play.server.SPacketCamera net.minecraft.network.play.server.S43PacketCamera -net.minecraft.network.play.server.SPacketTitle net.minecraft.network.play.server.S45PacketTitle -net.minecraft.network.play.server.SPacketOpenWindow net.minecraft.network.play.server.S2DPacketOpenWindow -net.minecraft.network.play.server.SPacketCloseWindow net.minecraft.network.play.server.S2EPacketCloseWindow -net.minecraft.network.play.server.SPacketWindowItems net.minecraft.network.play.server.S30PacketWindowItems -net.minecraft.network.play.server.SPacketStatistics net.minecraft.network.play.server.S37PacketStatistics -net.minecraft.network.play.server.SPacketPlayerAbilities net.minecraft.network.play.server.S39PacketPlayerAbilities -net.minecraft.network.play.server.SPacketEntityEquipment net.minecraft.network.play.server.S04PacketEntityEquipment -net.minecraft.network.play.server.SPacketUseBed net.minecraft.network.play.server.S0APacketUseBed -net.minecraft.network.login.server.SPacketEnableCompression net.minecraft.network.login.server.S03PacketEnableCompression -net.minecraft.network.login.server.SPacketLoginSuccess net.minecraft.network.login.server.S02PacketLoginSuccess From a0c5f25e61aac8ee6c89281f80d147936fdcb371 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 9 Sep 2024 13:16:01 +0200 Subject: [PATCH 3/3] Update ReplayStudio --- libs/ReplayStudio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ReplayStudio b/libs/ReplayStudio index 1e96fda6..696ce89e 160000 --- a/libs/ReplayStudio +++ b/libs/ReplayStudio @@ -1 +1 @@ -Subproject commit 1e96fda6052562477a54a7ced778f25a547f40ae +Subproject commit 696ce89ee3e12cff4eb43e77be81e1dc47481173