Skip to content

Commit 7b97c18

Browse files
LexManosLexManos
committed
1.19.2
1 parent c42b084 commit 7b97c18

File tree

7 files changed

+72
-78
lines changed

7 files changed

+72
-78
lines changed

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ ext {
3636
]
3737
}
3838
MAPPING_CHANNEL = 'official'
39-
MAPPING_VERSION = '1.19.1'
40-
MC_VERSION = '1.19.1'
39+
MAPPING_VERSION = '1.19.2'
40+
MC_VERSION = '1.19.2'
4141
MC_NEXT_VERSION = '1.20'
42-
MCP_VERSION = '20220727.212338'
42+
MCP_VERSION = '20220805.130853'
4343
SPI_VERSION = '6.0.0'
4444
ACCESSTRANSFORMERS_VERSION = '8.0.4'
4545
COREMODS_VERSION = '5.0.1'

‎docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
MinecraftForge
44
=============
55
[![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)
6-
[![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=
6+
[![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=
77
)](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)
88

99
Forge is a free, open-source modding API all of your favourite mods use!

‎patches/minecraft/net/minecraft/client/Minecraft.java.patch‎

Lines changed: 51 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/client/Minecraft.java
22
+++ b/net/minecraft/client/Minecraft.java
3-
@@ -243,7 +_,7 @@
3+
@@ -244,7 +_,7 @@
44
import org.slf4j.Logger;
55

66
@OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
99
static Minecraft f_90981_;
1010
private static final Logger f_90982_ = LogUtils.getLogger();
1111
public static final boolean f_91002_ = Util.m_137581_() == Util.OS.OSX;
12-
@@ -397,7 +_,7 @@
12+
@@ -398,7 +_,7 @@
1313
this.f_91029_ = p_91084_.f_101908_.f_101928_;
1414
this.f_90986_ = p_91084_.f_101905_.f_101944_;
1515
this.f_91037_ = new ClientPackSource(new File(this.f_91069_, "server-resource-packs"), p_91084_.f_101907_.m_101925_());
@@ -18,15 +18,15 @@
1818
this.f_91030_ = p_91084_.f_101905_.f_101945_;
1919
this.f_231338_ = new YggdrasilAuthenticationService(this.f_91030_);
2020
this.f_91048_ = this.f_231338_.createMinecraftSessionService();
21-
@@ -405,7 +_,6 @@
21+
@@ -406,7 +_,6 @@
2222
this.f_231339_ = SignatureValidator.m_216358_(this.f_231338_.getServicesKey());
2323
this.f_90998_ = p_91084_.f_101905_.f_101942_;
2424
f_90982_.info("Setting user: {}", (Object)this.f_90998_.m_92546_());
2525
- f_90982_.debug("(Session ID is {})", (Object)this.f_90998_.m_92544_());
2626
this.f_91033_ = p_91084_.f_101908_.f_101926_;
2727
this.f_91034_ = !p_91084_.f_101908_.f_101929_;
2828
this.f_91035_ = !p_91084_.f_101908_.f_101930_;
29-
@@ -457,7 +_,7 @@
29+
@@ -458,7 +_,7 @@
3030

3131
this.f_90990_.m_85380_(this.f_91066_.m_232035_().m_231551_());
3232
this.f_91067_ = new MouseHandler(this);
@@ -35,15 +35,15 @@
3535
this.f_91068_ = new KeyboardHandler(this);
3636
this.f_91068_.m_90887_(this.f_90990_.m_85439_());
3737
RenderSystem.m_69580_(this.f_91066_.f_92035_, false);
38-
@@ -465,6 +_,7 @@
38+
@@ -466,6 +_,7 @@
3939
this.f_91042_.m_83931_(0.0F, 0.0F, 0.0F, 0.0F);
4040
this.f_91042_.m_83954_(f_91002_);
4141
this.f_91036_ = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
4242
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.f_91038_, this.f_91036_, this.f_91037_);
4343
this.f_91038_.m_10506_();
4444
this.f_91066_.m_92145_(this.f_91038_);
4545
this.f_91039_ = new LanguageManager(this.f_91066_.f_92075_);
46-
@@ -509,10 +_,12 @@
46+
@@ -510,10 +_,12 @@
4747
this.f_91063_ = new GameRenderer(this, this.f_90994_.m_234586_(), this.f_91036_, this.f_90993_);
4848
this.f_91036_.m_7217_(this.f_91063_);
4949
this.f_91060_ = new LevelRenderer(this, this.f_90994_, this.f_167845_, this.f_90993_);
@@ -56,7 +56,7 @@
5656
this.f_91036_.m_7217_(this.f_91061_);
5757
this.f_91053_ = new PaintingTextureManager(this.f_90987_);
5858
this.f_91036_.m_7217_(this.f_91053_);
59-
@@ -521,7 +_,9 @@
59+
@@ -522,7 +_,9 @@
6060
this.f_91047_ = new GpuWarnlistManager();
6161
this.f_91036_.m_7217_(this.f_91047_);
6262
this.f_91036_.m_7217_(this.f_205120_);
@@ -67,7 +67,7 @@
6767
this.f_91064_ = new DebugRenderer(this);
6868
this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this));
6969
RenderSystem.m_69900_(this::m_91113_);
70-
@@ -540,6 +_,19 @@
70+
@@ -541,6 +_,19 @@
7171
TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
7272
}
7373

@@ -87,7 +87,7 @@
8787
this.f_90990_.m_85409_(this.f_91066_.m_231817_().m_231551_());
8888
this.f_90990_.m_85424_(this.f_91066_.m_232123_().m_231551_());
8989
this.f_90990_.m_85426_();
90-
@@ -562,23 +_,23 @@
90+
@@ -563,23 +_,23 @@
9191
}
9292

9393
this.f_167847_.m_168556_();
@@ -126,7 +126,7 @@
126126

127127
}
128128

129-
@@ -621,6 +_,8 @@
129+
@@ -622,6 +_,8 @@
130130

131131
private UserApiService m_193585_(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
132132
try {
@@ -135,7 +135,7 @@
135135
return p_193586_.createUserApiService(p_193587_.f_101905_.f_101942_.m_92547_());
136136
} catch (AuthenticationException authenticationexception) {
137137
f_90982_.error("Failed to verify authentication", (Throwable)authenticationexception);
138-
@@ -633,7 +_,7 @@
138+
@@ -634,7 +_,7 @@
139139
}
140140

141141
private void m_91239_(Throwable p_91240_) {
@@ -144,7 +144,7 @@
144144
this.m_91241_(p_91240_, (Component)null);
145145
} else {
146146
Util.m_137559_(p_91240_);
147-
@@ -791,13 +_,13 @@
147+
@@ -792,13 +_,13 @@
148148
Bootstrap.m_135875_(p_91333_.m_127526_());
149149
if (p_91333_.m_127527_() != null) {
150150
Bootstrap.m_135875_("#@!@# Game crashed! Crash report saved to: #@!@# " + p_91333_.m_127527_());
@@ -161,7 +161,7 @@
161161
}
162162

163163
}
164-
@@ -921,10 +_,6 @@
164+
@@ -922,10 +_,6 @@
165165
f_90982_.error("setScreen called from non-game thread");
166166
}
167167

@@ -172,7 +172,7 @@
172172
if (p_91153_ == null && this.f_91073_ == null) {
173173
p_91153_ = new TitleScreen();
174174
} else if (p_91153_ == null && this.f_91074_.m_21224_()) {
175-
@@ -935,6 +_,19 @@
175+
@@ -936,6 +_,19 @@
176176
}
177177
}
178178

@@ -192,7 +192,7 @@
192192
this.f_91080_ = p_91153_;
193193
BufferUploader.m_166835_();
194194
if (p_91153_ != null) {
195-
@@ -1078,11 +_,14 @@
195+
@@ -1079,11 +_,14 @@
196196
RenderSystem.m_69481_();
197197
this.f_91026_.m_7238_();
198198
if (!this.f_91079_) {
@@ -207,7 +207,7 @@
207207
}
208208

209209
if (this.f_91056_ != null) {
210-
@@ -1209,10 +_,12 @@
210+
@@ -1210,10 +_,12 @@
211211
this.f_90990_.m_85378_((double)i);
212212
if (this.f_91080_ != null) {
213213
this.f_91080_.m_6574_(this, this.f_90990_.m_85445_(), this.f_90990_.m_85446_());
@@ -220,15 +220,15 @@
220220
this.f_91063_.m_109097_(this.f_90990_.m_85441_(), this.f_90990_.m_85442_());
221221
this.f_91067_.m_91599_();
222222
}
223-
@@ -1490,6 +_,7 @@
223+
@@ -1491,6 +_,7 @@
224224
}
225225

226226
public void m_91395_() {
227227
+ if (this.m_91396_()) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.GameShuttingDownEvent());
228228
this.f_91019_ = false;
229229
}
230230

231-
@@ -1519,10 +_,18 @@
231+
@@ -1520,10 +_,18 @@
232232
if (p_91387_ && this.f_91077_ != null && this.f_91077_.m_6662_() == HitResult.Type.BLOCK) {
233233
BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
234234
BlockPos blockpos = blockhitresult.m_82425_();
@@ -250,7 +250,7 @@
250250
this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
251251
}
252252
}
253-
@@ -1547,14 +_,20 @@
253+
@@ -1548,14 +_,20 @@
254254
return false;
255255
} else {
256256
boolean flag = false;
@@ -269,22 +269,22 @@
269269
BlockHitResult blockhitresult = (BlockHitResult)this.f_91077_;
270270
BlockPos blockpos = blockhitresult.m_82425_();
271271
- if (!this.f_91073_.m_8055_(blockpos).m_60795_()) {
272-
+ if (!this.f_91073_.m_46859_(blockpos)) {
272+
+ if (!this.f_91073_.m_46859_(blockpos)) {
273273
this.f_91072_.m_105269_(blockpos, blockhitresult.m_82434_());
274274
if (this.f_91073_.m_8055_(blockpos).m_60795_()) {
275275
flag = true;
276-
@@ -1567,8 +_,10 @@
276+
@@ -1568,8 +_,10 @@
277277
}
278278

279279
this.f_91074_.m_36334_();
280-
+ net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
280+
+ net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.f_91074_);
281281
}
282282

283283
+ if (inputEvent.shouldSwingHand())
284284
this.f_91074_.m_6674_(InteractionHand.MAIN_HAND);
285285
return flag;
286286
}
287-
@@ -1583,6 +_,11 @@
287+
@@ -1584,6 +_,11 @@
288288
}
289289

290290
for(InteractionHand interactionhand : InteractionHand.values()) {
@@ -296,31 +296,32 @@
296296
ItemStack itemstack = this.f_91074_.m_21120_(interactionhand);
297297
if (this.f_91077_ != null) {
298298
switch (this.f_91077_.m_6662_()) {
299-
@@ -1593,6 +_,7 @@
299+
@@ -1594,13 +_,14 @@
300300
return;
301301
}
302302

303-
+ 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.
303+
+ 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.
304304
InteractionResult interactionresult = this.f_91072_.m_105230_(this.f_91074_, entity, entityhitresult, interactionhand);
305305
if (!interactionresult.m_19077_()) {
306306
interactionresult = this.f_91072_.m_105226_(this.f_91074_, entity, interactionhand);
307-
@@ -1600,6 +_,7 @@
307+
}
308308

309309
if (interactionresult.m_19077_()) {
310-
if (interactionresult.m_19080_()) {
311-
+ if (inputEvent.shouldSwingHand())
310+
- if (interactionresult.m_19080_()) {
311+
+ if (interactionresult.m_19080_() && inputEvent.shouldSwingHand()) {
312312
this.f_91074_.m_6674_(interactionhand);
313313
}
314314

315-
@@ -1612,6 +_,7 @@
315+
@@ -1612,7 +_,7 @@
316+
int i = itemstack.m_41613_();
316317
InteractionResult interactionresult1 = this.f_91072_.m_233732_(this.f_91074_, interactionhand, blockhitresult);
317318
if (interactionresult1.m_19077_()) {
318-
if (interactionresult1.m_19080_()) {
319-
+ if (inputEvent.shouldSwingHand())
319+
- if (interactionresult1.m_19080_()) {
320+
+ if (interactionresult1.m_19080_() && inputEvent.shouldSwingHand()) {
320321
this.f_91074_.m_6674_(interactionhand);
321322
if (!itemstack.m_41619_() && (itemstack.m_41613_() != i || this.f_91072_.m_105290_())) {
322323
this.f_91063_.f_109055_.m_109320_(interactionhand);
323-
@@ -1627,6 +_,9 @@
324+
@@ -1628,6 +_,9 @@
324325
}
325326
}
326327

@@ -330,7 +331,7 @@
330331
if (!itemstack.m_41619_()) {
331332
InteractionResult interactionresult2 = this.f_91072_.m_233721_(this.f_91074_, interactionhand);
332333
if (interactionresult2.m_19077_()) {
333-
@@ -1653,6 +_,8 @@
334+
@@ -1654,6 +_,8 @@
334335
--this.f_91011_;
335336
}
336337

@@ -339,7 +340,7 @@
339340
this.f_91026_.m_6180_("gui");
340341
this.f_240378_.m_240688_();
341342
this.f_91065_.m_193832_(this.f_91012_);
342-
@@ -1782,6 +_,8 @@
343+
@@ -1783,6 +_,8 @@
343344
this.f_91026_.m_6182_("keyboard");
344345
this.f_91068_.m_90931_();
345346
this.f_91026_.m_7238_();
@@ -348,15 +349,15 @@
348349
}
349350

350351
private boolean m_91278_() {
351-
@@ -1976,6 +_,7 @@
352+
@@ -1978,6 +_,7 @@
352353
}
353354

354355
public void m_91156_(ClientLevel p_91157_) {
355356
+ if (f_91073_ != null) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.LevelEvent.Unload(f_91073_));
356357
ProgressScreen progressscreen = new ProgressScreen(true);
357358
progressscreen.m_6309_(Component.m_237115_("connect.joining"));
358359
this.m_91362_(progressscreen);
359-
@@ -2009,10 +_,12 @@
360+
@@ -2011,10 +_,12 @@
360361
IntegratedServer integratedserver = this.f_91007_;
361362
this.f_91007_ = null;
362363
this.f_91063_.m_109150_();
@@ -369,23 +370,23 @@
369370
if (integratedserver != null) {
370371
this.f_91026_.m_6180_("waitForServer");
371372

372-
@@ -2027,6 +_,7 @@
373+
@@ -2029,6 +_,7 @@
373374
this.f_91065_.m_93089_();
374375
this.f_91008_ = null;
375376
this.f_91010_ = false;
376377
+ net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(f_91073_);
377378
this.f_91004_.m_90740_();
378379
}
379380

380-
@@ -2122,6 +_,7 @@
381+
@@ -2124,6 +_,7 @@
381382

382383
private void m_91280_() {
383384
if (this.f_91077_ != null && this.f_91077_.m_6662_() != HitResult.Type.MISS) {
384385
+ if (net.minecraftforge.client.ForgeHooksClient.onClickInput(2, this.f_91066_.f_92097_, InteractionHand.MAIN_HAND).isCanceled()) return;
385386
boolean flag = this.f_91074_.m_150110_().f_35937_;
386387
BlockEntity blockentity = null;
387388
HitResult.Type hitresult$type = this.f_91077_.m_6662_();
388-
@@ -2134,10 +_,7 @@
389+
@@ -2136,10 +_,7 @@
389390
}
390391

391392
Block block = blockstate.m_60734_();
@@ -397,7 +398,7 @@
397398

398399
if (flag && Screen.m_96637_() && blockstate.m_155947_()) {
399400
blockentity = this.f_91073_.m_7702_(blockpos);
400-
@@ -2148,7 +_,7 @@
401+
@@ -2150,7 +_,7 @@
401402
}
402403

403404
Entity entity = ((EntityHitResult)this.f_91077_).m_82443_();
@@ -406,7 +407,7 @@
406407
if (itemstack == null) {
407408
return;
408409
}
409-
@@ -2686,8 +_,8 @@
410+
@@ -2688,8 +_,8 @@
410411
return this.f_90993_;
411412
}
412413

@@ -417,7 +418,7 @@
417418
Supplier<PackResources> supplier = p_167937_;
418419
if (i <= 3) {
419420
supplier = m_91330_(p_167937_);
420-
@@ -2697,7 +_,7 @@
421+
@@ -2699,7 +_,7 @@
421422
supplier = m_91352_(supplier);
422423
}
423424

@@ -426,10 +427,12 @@
426427
}
427428

428429
private static Supplier<PackResources> m_91330_(Supplier<PackResources> p_91331_) {
429-
@@ -2716,6 +_,14 @@
430-
this.f_91051_.m_119410_(p_91313_);
431-
}
430+
@@ -2716,6 +_,19 @@
432431

432+
public void m_91312_(int p_91313_) {
433+
this.f_91051_.m_119410_(p_91313_);
434+
+ }
435+
+
433436
+ public ItemColors getItemColors() {
434437
+ return this.f_91041_;
435438
+ }
@@ -438,18 +441,9 @@
438441
+ return this.f_90997_;
439442
+ }
440443
+
441-
public EntityModelSet m_167973_() {
442-
return this.f_167844_;
443-
}
444-
@@ -2789,4 +_,11 @@
445-
446-
public abstract boolean m_142594_(boolean p_168035_);
447-
}
448-
+
449-
+ // FORGE START
450444
+ private float realPartialTick;
451445
+ public float getPartialTick() {
452446
+ return realPartialTick;
453-
+ }
454-
+ // FORGE END
455-
}
447+
}
448+
449+
public EntityModelSet m_167973_() {

‎patches/minecraft/net/minecraft/client/multiplayer/PlayerInfo.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/client/multiplayer/PlayerInfo.java
22
+++ b/net/minecraft/client/multiplayer/PlayerInfo.java
3-
@@ -84,6 +_,7 @@
3+
@@ -82,6 +_,7 @@
44
}
55

66
protected void m_105317_(GameType p_105318_) {

0 commit comments

Comments
 (0)