diff --git a/build.gradle b/build.gradle index 9892a51713..b34e1ae567 100644 --- a/build.gradle +++ b/build.gradle @@ -36,10 +36,10 @@ ext { ] } MAPPING_CHANNEL = 'official' - MAPPING_VERSION = '1.19.1' - MC_VERSION = '1.19.1' + MAPPING_VERSION = '1.19.2' + MC_VERSION = '1.19.2' MC_NEXT_VERSION = '1.20' - MCP_VERSION = '20220727.212338' + MCP_VERSION = '20220805.130853' SPI_VERSION = '6.0.0' ACCESSTRANSFORMERS_VERSION = '8.0.4' COREMODS_VERSION = '5.0.1' diff --git a/docs/README.md b/docs/README.md index e2bdb458c3..746dc1da28 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,7 +3,7 @@ MinecraftForge ============= [![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19-&query=$.promos["1.19-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net) -[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19-&query=$.promos["1.19-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo= +[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.2-&query=$.promos["1.19.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo= )](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)](https://discord.gg/UvedJ9m) [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos) Forge is a free, open-source modding API all of your favourite mods use! diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index ceead3239b..211be79363 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java -@@ -243,7 +_,7 @@ +@@ -244,7 +_,7 @@ import org.slf4j.Logger; @OnlyIn(Dist.CLIENT) @@ -9,7 +9,7 @@ static Minecraft f_90981_; private static final Logger f_90982_ = LogUtils.getLogger(); public static final boolean f_91002_ = Util.m_137581_() == Util.OS.OSX; -@@ -397,7 +_,7 @@ +@@ -398,7 +_,7 @@ this.f_91029_ = p_91084_.f_101908_.f_101928_; this.f_90986_ = p_91084_.f_101905_.f_101944_; this.f_91037_ = new ClientPackSource(new File(this.f_91069_, "server-resource-packs"), p_91084_.f_101907_.m_101925_()); @@ -18,7 +18,7 @@ this.f_91030_ = p_91084_.f_101905_.f_101945_; this.f_231338_ = new YggdrasilAuthenticationService(this.f_91030_); this.f_91048_ = this.f_231338_.createMinecraftSessionService(); -@@ -405,7 +_,6 @@ +@@ -406,7 +_,6 @@ this.f_231339_ = SignatureValidator.m_216358_(this.f_231338_.getServicesKey()); this.f_90998_ = p_91084_.f_101905_.f_101942_; f_90982_.info("Setting user: {}", (Object)this.f_90998_.m_92546_()); @@ -26,7 +26,7 @@ this.f_91033_ = p_91084_.f_101908_.f_101926_; this.f_91034_ = !p_91084_.f_101908_.f_101929_; this.f_91035_ = !p_91084_.f_101908_.f_101930_; -@@ -457,7 +_,7 @@ +@@ -458,7 +_,7 @@ this.f_90990_.m_85380_(this.f_91066_.m_232035_().m_231551_()); this.f_91067_ = new MouseHandler(this); @@ -35,7 +35,7 @@ this.f_91068_ = new KeyboardHandler(this); this.f_91068_.m_90887_(this.f_90990_.m_85439_()); RenderSystem.m_69580_(this.f_91066_.f_92035_, false); -@@ -465,6 +_,7 @@ +@@ -466,6 +_,7 @@ this.f_91042_.m_83931_(0.0F, 0.0F, 0.0F, 0.0F); this.f_91042_.m_83954_(f_91002_); this.f_91036_ = new ReloadableResourceManager(PackType.CLIENT_RESOURCES); @@ -43,7 +43,7 @@ this.f_91038_.m_10506_(); this.f_91066_.m_92145_(this.f_91038_); this.f_91039_ = new LanguageManager(this.f_91066_.f_92075_); -@@ -509,10 +_,12 @@ +@@ -510,10 +_,12 @@ this.f_91063_ = new GameRenderer(this, this.f_90994_.m_234586_(), this.f_91036_, this.f_90993_); this.f_91036_.m_7217_(this.f_91063_); this.f_91060_ = new LevelRenderer(this, this.f_90994_, this.f_167845_, this.f_90993_); @@ -56,7 +56,7 @@ this.f_91036_.m_7217_(this.f_91061_); this.f_91053_ = new PaintingTextureManager(this.f_90987_); this.f_91036_.m_7217_(this.f_91053_); -@@ -521,7 +_,9 @@ +@@ -522,7 +_,9 @@ this.f_91047_ = new GpuWarnlistManager(); this.f_91036_.m_7217_(this.f_91047_); this.f_91036_.m_7217_(this.f_205120_); @@ -67,7 +67,7 @@ this.f_91064_ = new DebugRenderer(this); this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this)); RenderSystem.m_69900_(this::m_91113_); -@@ -540,6 +_,19 @@ +@@ -541,6 +_,19 @@ TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false); } @@ -87,7 +87,7 @@ this.f_90990_.m_85409_(this.f_91066_.m_231817_().m_231551_()); this.f_90990_.m_85424_(this.f_91066_.m_232123_().m_231551_()); this.f_90990_.m_85426_(); -@@ -562,23 +_,23 @@ +@@ -563,23 +_,23 @@ } this.f_167847_.m_168556_(); @@ -126,7 +126,7 @@ } -@@ -621,6 +_,8 @@ +@@ -622,6 +_,8 @@ private UserApiService m_193585_(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) { try { @@ -135,7 +135,7 @@ return p_193586_.createUserApiService(p_193587_.f_101905_.f_101942_.m_92547_()); } catch (AuthenticationException authenticationexception) { f_90982_.error("Failed to verify authentication", (Throwable)authenticationexception); -@@ -633,7 +_,7 @@ +@@ -634,7 +_,7 @@ } private void m_91239_(Throwable p_91240_) { @@ -144,7 +144,7 @@ this.m_91241_(p_91240_, (Component)null); } else { Util.m_137559_(p_91240_); -@@ -791,13 +_,13 @@ +@@ -792,13 +_,13 @@ Bootstrap.m_135875_(p_91333_.m_127526_()); if (p_91333_.m_127527_() != null) { Bootstrap.m_135875_("#@!@# Game crashed! Crash report saved to: #@!@# " + p_91333_.m_127527_()); @@ -161,7 +161,7 @@ } } -@@ -921,10 +_,6 @@ +@@ -922,10 +_,6 @@ f_90982_.error("setScreen called from non-game thread"); } @@ -172,7 +172,7 @@ if (p_91153_ == null && this.f_91073_ == null) { p_91153_ = new TitleScreen(); } else if (p_91153_ == null && this.f_91074_.m_21224_()) { -@@ -935,6 +_,19 @@ +@@ -936,6 +_,19 @@ } } @@ -192,7 +192,7 @@ this.f_91080_ = p_91153_; BufferUploader.m_166835_(); if (p_91153_ != null) { -@@ -1078,11 +_,14 @@ +@@ -1079,11 +_,14 @@ RenderSystem.m_69481_(); this.f_91026_.m_7238_(); if (!this.f_91079_) { @@ -207,7 +207,7 @@ } if (this.f_91056_ != null) { -@@ -1209,10 +_,12 @@ +@@ -1210,10 +_,12 @@ this.f_90990_.m_85378_((double)i); if (this.f_91080_ != null) { this.f_91080_.m_6574_(this, this.f_90990_.m_85445_(), this.f_90990_.m_85446_()); @@ -220,7 +220,7 @@ this.f_91063_.m_109097_(this.f_90990_.m_85441_(), this.f_90990_.m_85442_()); this.f_91067_.m_91599_(); } -@@ -1490,6 +_,7 @@ +@@ -1491,6 +_,7 @@ } public void m_91395_() { @@ -228,7 +228,7 @@ this.f_91019_ = false; } -@@ -1519,10 +_,18 @@ +@@ -1520,10 +_,18 @@ if (p_91387_ && this.f_91077_ != null && this.f_91077_.m_6662_() == HitResult.Type.BLOCK) { BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_; BlockPos blockpos = blockhitresult.m_82425_(); @@ -250,7 +250,7 @@ this.f_91074_.m_6674_(InteractionHand.MAIN_HAND); } } -@@ -1547,14 +_,20 @@ +@@ -1548,14 +_,20 @@ return false; } else { boolean flag = false; @@ -269,22 +269,22 @@ BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_; BlockPos blockpos = blockhitresult.m_82425_(); - if (!this.f_91073_.m_8055_(blockpos).m_60795_()) { -+ if (!this.f_91073_.m_46859_(blockpos)) { ++ if (!this.f_91073_.m_46859_(blockpos)) { this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_()); if (this.f_91073_.m_8055_(blockpos).m_60795_()) { flag = true; -@@ -1567,8 +_,10 @@ +@@ -1568,8 +_,10 @@ } this.f_91074_.m_36334_(); -+ net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_); ++ net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_); } + if (inputEvent.shouldSwingHand()) this.f_91074_.m_6674_(InteractionHand.MAIN_HAND); return flag; } -@@ -1583,6 +_,11 @@ +@@ -1584,6 +_,11 @@ } for(InteractionHand interactionhand : InteractionHand.values()) { @@ -296,31 +296,32 @@ ItemStack itemstack = this.f_91074_.m_21120_(interactionhand); if (this.f_91077_ != null) { switch (this.f_91077_.m_6662_()) { -@@ -1593,6 +_,7 @@ +@@ -1594,13 +_,14 @@ return; } -+ if(!this.f_91074_.canInteractWith(entityhitresult.m_82443_(), 0)) return; //Forge: Entity may be traced via attack range, but the player may not have sufficient reach. No padding in client code. ++ if(!this.f_91074_.canInteractWith(entityhitresult.m_82443_(), 0)) return; //Forge: Entity may be traced via attack range, but the player may not have sufficient reach. No padding in client code. InteractionResult interactionresult = this.f_91072_.m_105230_(this.f_91074_, entity, entityhitresult, interactionhand); if (!interactionresult.m_19077_()) { interactionresult = this.f_91072_.m_105226_(this.f_91074_, entity, interactionhand); -@@ -1600,6 +_,7 @@ + } if (interactionresult.m_19077_()) { - if (interactionresult.m_19080_()) { -+ if (inputEvent.shouldSwingHand()) +- if (interactionresult.m_19080_()) { ++ if (interactionresult.m_19080_() && inputEvent.shouldSwingHand()) { this.f_91074_.m_6674_(interactionhand); } -@@ -1612,6 +_,7 @@ +@@ -1612,7 +_,7 @@ + int i = itemstack.m_41613_(); InteractionResult interactionresult1 = this.f_91072_.m_233732_(this.f_91074_, interactionhand, blockhitresult); if (interactionresult1.m_19077_()) { - if (interactionresult1.m_19080_()) { -+ if (inputEvent.shouldSwingHand()) +- if (interactionresult1.m_19080_()) { ++ if (interactionresult1.m_19080_() && inputEvent.shouldSwingHand()) { this.f_91074_.m_6674_(interactionhand); if (!itemstack.m_41619_() && (itemstack.m_41613_() != i || this.f_91072_.m_105290_())) { this.f_91063_.f_109055_.m_109320_(interactionhand); -@@ -1627,6 +_,9 @@ +@@ -1628,6 +_,9 @@ } } @@ -330,7 +331,7 @@ if (!itemstack.m_41619_()) { InteractionResult interactionresult2 = this.f_91072_.m_233721_(this.f_91074_, interactionhand); if (interactionresult2.m_19077_()) { -@@ -1653,6 +_,8 @@ +@@ -1654,6 +_,8 @@ --this.f_91011_; } @@ -339,7 +340,7 @@ this.f_91026_.m_6180_("gui"); this.f_240378_.m_240688_(); this.f_91065_.m_193832_(this.f_91012_); -@@ -1782,6 +_,8 @@ +@@ -1783,6 +_,8 @@ this.f_91026_.m_6182_("keyboard"); this.f_91068_.m_90931_(); this.f_91026_.m_7238_(); @@ -348,7 +349,7 @@ } private boolean m_91278_() { -@@ -1976,6 +_,7 @@ +@@ -1978,6 +_,7 @@ } public void m_91156_(ClientLevel p_91157_) { @@ -356,7 +357,7 @@ ProgressScreen progressscreen = new ProgressScreen(true); progressscreen.m_6309_(Component.m_237115_("connect.joining")); this.m_91362_(progressscreen); -@@ -2009,10 +_,12 @@ +@@ -2011,10 +_,12 @@ IntegratedServer integratedserver = this.f_91007_; this.f_91007_ = null; this.f_91063_.m_109150_(); @@ -369,7 +370,7 @@ if (integratedserver != null) { this.f_91026_.m_6180_("waitForServer"); -@@ -2027,6 +_,7 @@ +@@ -2029,6 +_,7 @@ this.f_91065_.m_93089_(); this.f_91008_ = null; this.f_91010_ = false; @@ -377,7 +378,7 @@ this.f_91004_.m_90740_(); } -@@ -2122,6 +_,7 @@ +@@ -2124,6 +_,7 @@ private void m_91280_() { if (this.f_91077_ != null && this.f_91077_.m_6662_() != HitResult.Type.MISS) { @@ -385,7 +386,7 @@ boolean flag = this.f_91074_.m_150110_().f_35937_; BlockEntity blockentity = null; HitResult.Type hitresult$type = this.f_91077_.m_6662_(); -@@ -2134,10 +_,7 @@ +@@ -2136,10 +_,7 @@ } Block block = blockstate.m_60734_(); @@ -397,7 +398,7 @@ if (flag && Screen.m_96637_() && blockstate.m_155947_()) { blockentity = this.f_91073_.m_7702_(blockpos); -@@ -2148,7 +_,7 @@ +@@ -2150,7 +_,7 @@ } Entity entity = ((EntityHitResult)this.f_91077_).m_82443_(); @@ -406,7 +407,7 @@ if (itemstack == null) { return; } -@@ -2686,8 +_,8 @@ +@@ -2688,8 +_,8 @@ return this.f_90993_; } @@ -417,7 +418,7 @@ Supplier supplier = p_167937_; if (i <= 3) { supplier = m_91330_(p_167937_); -@@ -2697,7 +_,7 @@ +@@ -2699,7 +_,7 @@ supplier = m_91352_(supplier); } @@ -426,10 +427,12 @@ } private static Supplier m_91330_(Supplier p_91331_) { -@@ -2716,6 +_,14 @@ - this.f_91051_.m_119410_(p_91313_); - } +@@ -2716,6 +_,19 @@ + public void m_91312_(int p_91313_) { + this.f_91051_.m_119410_(p_91313_); ++ } ++ + public ItemColors getItemColors() { + return this.f_91041_; + } @@ -438,18 +441,9 @@ + return this.f_90997_; + } + - public EntityModelSet m_167973_() { - return this.f_167844_; - } -@@ -2789,4 +_,11 @@ - - public abstract boolean m_142594_(boolean p_168035_); - } -+ -+ // FORGE START + private float realPartialTick; + public float getPartialTick() { + return realPartialTick; -+ } -+ // FORGE END - } + } + + public EntityModelSet m_167973_() { diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerInfo.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/PlayerInfo.java.patch index 927b68db21..2109113cd5 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerInfo.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerInfo.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/multiplayer/PlayerInfo.java +++ b/net/minecraft/client/multiplayer/PlayerInfo.java -@@ -84,6 +_,7 @@ +@@ -82,6 +_,7 @@ } protected void m_105317_(GameType p_105318_) { diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ProfileKeyPairManager.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/ProfileKeyPairManager.java.patch index 03e2b6dc5d..ecb09b9e26 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/ProfileKeyPairManager.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/ProfileKeyPairManager.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/client/multiplayer/ProfileKeyPairManager.java +++ b/net/minecraft/client/multiplayer/ProfileKeyPairManager.java -@@ -70,6 +_,8 @@ +@@ -76,6 +_,8 @@ this.m_233776_(profilekeypair); return Optional.of(profilekeypair); } catch (CryptException | MinecraftClientException | IOException ioexception) { + // Forge: The offline user api service always returns a null profile key pair, so let's hide this useless exception if in dev -+ if (net.minecraftforge.fml.loading.FMLLoader.isProduction() || p_233781_ != UserApiService.OFFLINE) ++ if (net.minecraftforge.fml.loading.FMLLoader.isProduction() || this.f_243348_ != UserApiService.OFFLINE) f_233765_.error("Failed to retrieve profile key pair", (Throwable)ioexception); this.m_233776_((ProfileKeyPair)null); - return optional; + return p_243401_; diff --git a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index c7a9393161..4576d1cea5 100644 --- a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -67,7 +67,7 @@ this.m_243086_(playerchatmessage1); }, this.f_9745_); }); -@@ -1375,7 +_,7 @@ +@@ -1383,7 +_,7 @@ private CompletableFuture m_215246_(String p_215247_) { Component component = Component.m_237113_(p_215247_); @@ -76,7 +76,7 @@ return !component.equals(p_238202_) ? p_238202_ : null; }); completablefuture.thenAcceptAsync((p_242747_) -> { -@@ -1524,11 +_,13 @@ +@@ -1532,11 +_,13 @@ return; } @@ -91,16 +91,16 @@ if (interactionresult.m_19077_()) { CriteriaTriggers.f_10565_.m_61494_(ServerGamePacketListenerImpl.this.f_9743_, itemstack, entity); if (interactionresult.m_19080_()) { -@@ -1550,7 +_,7 @@ +@@ -1558,6 +_,8 @@ public void m_141994_() { if (!(entity instanceof ItemEntity) && !(entity instanceof ExperienceOrb) && !(entity instanceof AbstractArrow) && entity != ServerGamePacketListenerImpl.this.f_9743_) { -- ServerGamePacketListenerImpl.this.f_9743_.m_5706_(entity); -+ if(ServerGamePacketListenerImpl.this.f_9743_.canHit(entity, 3)) ServerGamePacketListenerImpl.this.f_9743_.m_5706_(entity); //Forge: Perform attack range check. Original check was dist < 6, range is 3, so vanilla used padding=3 ++ //Forge: Perform attack range check. Original check was dist < 6, range is 3, so vanilla used padding=3 ++ if(ServerGamePacketListenerImpl.this.f_9743_.canHit(entity, 3)) + ServerGamePacketListenerImpl.this.f_9743_.m_5706_(entity); } else { ServerGamePacketListenerImpl.this.m_9942_(Component.m_237115_("multiplayer.disconnect.invalid_entity_attacked")); - ServerGamePacketListenerImpl.f_9744_.warn("Player {} tried to attack an invalid entity", (Object)ServerGamePacketListenerImpl.this.f_9743_.m_7755_().getString()); -@@ -1749,6 +_,7 @@ +@@ -1757,6 +_,7 @@ } public void m_7423_(ServerboundCustomPayloadPacket p_9860_) { diff --git a/patches/minecraft/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch b/patches/minecraft/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch index e68e7309eb..09a0a2b4e6 100644 --- a/patches/minecraft/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch +++ b/patches/minecraft/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -69,7 +_,13 @@ +@@ -65,7 +_,13 @@ } public void m_9933_() { @@ -15,7 +15,7 @@ this.m_10055_(); } else if (this.f_10019_ == ServerLoginPacketListenerImpl.State.DELAY_ACCEPT) { ServerPlayer serverplayer = this.f_10018_.m_6846_().m_11259_(this.f_10021_.getId()); -@@ -194,14 +_,14 @@ +@@ -178,14 +_,14 @@ GameProfile gameprofile = this.f_10018_.m_236731_(); if (gameprofile != null && p_10047_.f_238040_().equalsIgnoreCase(gameprofile.getName())) { this.f_10021_ = gameprofile; @@ -32,7 +32,7 @@ } } -@@ -238,7 +_,7 @@ +@@ -222,7 +_,7 @@ throw new IllegalStateException("Protocol error", cryptexception); } @@ -41,7 +41,7 @@ public void run() { GameProfile gameprofile = ServerLoginPacketListenerImpl.this.f_10021_; -@@ -246,11 +_,11 @@ +@@ -230,11 +_,11 @@ ServerLoginPacketListenerImpl.this.f_10021_ = ServerLoginPacketListenerImpl.this.f_10018_.m_129925_().hasJoinedServer(new GameProfile((UUID)null, gameprofile.getName()), s, this.m_10064_()); if (ServerLoginPacketListenerImpl.this.f_10021_ != null) { ServerLoginPacketListenerImpl.f_10015_.info("UUID of player {} is {}", ServerLoginPacketListenerImpl.this.f_10021_.getName(), ServerLoginPacketListenerImpl.this.f_10021_.getId()); @@ -55,7 +55,7 @@ } else { ServerLoginPacketListenerImpl.this.m_10053_(Component.m_237115_("multiplayer.disconnect.unverified_username")); ServerLoginPacketListenerImpl.f_10015_.error("Username '{}' tried to join with an invalid session", (Object)gameprofile.getName()); -@@ -259,7 +_,7 @@ +@@ -243,7 +_,7 @@ if (ServerLoginPacketListenerImpl.this.f_10018_.m_129792_()) { ServerLoginPacketListenerImpl.f_10015_.warn("Authentication servers are down but will let them in anyway!"); ServerLoginPacketListenerImpl.this.f_10021_ = gameprofile; @@ -64,7 +64,7 @@ } else { ServerLoginPacketListenerImpl.this.m_10053_(Component.m_237115_("multiplayer.disconnect.authservers_down")); ServerLoginPacketListenerImpl.f_10015_.error("Couldn't verify username because servers are unavailable"); -@@ -279,6 +_,7 @@ +@@ -263,6 +_,7 @@ } public void m_7223_(ServerboundCustomQueryPacket p_10045_) {