Skip to content

Commit a51e182

Browse files
kappa-maintainerkappa-maintainer
committed
Update VineFlower
1 parent da0e33d commit a51e182

File tree

334 files changed

+12433
-2485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+12433
-2485
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ last_forge_version = 14.23.5.2860
77
mapping_channel = stable
88
mapping_version = 39-1.12
99
minecraft_version = 1.12.2
10-
mcp_version = 20240102.171137
10+
mcp_version = 20241219.222132
1111

1212
# Related Tooling
1313
special_source = net.md-5:SpecialSource:1.9.0

‎patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,21 @@
129129
}
130130

131131
public static class Deserializer implements JsonDeserializer<AdvancementRewards>
132+
@@ -187,7 +153,7 @@
133+
JsonArray jsonarray = JsonUtils.func_151213_a(jsonobject, "loot", new JsonArray());
134+
ResourceLocation[] aresourcelocation = new ResourceLocation[jsonarray.size()];
135+
136+
- for (int j = 0; j < aresourcelocation.length; j++)
137+
+ for (int j = 0; j < aresourcelocation.length; ++j)
138+
{
139+
aresourcelocation[j] = new ResourceLocation(JsonUtils.func_151206_a(jsonarray.get(j), "loot[" + j + "]"));
140+
}
141+
@@ -195,7 +161,7 @@
142+
JsonArray jsonarray1 = JsonUtils.func_151213_a(jsonobject, "recipes", new JsonArray());
143+
ResourceLocation[] aresourcelocation1 = new ResourceLocation[jsonarray1.size()];
144+
145+
- for (int k = 0; k < aresourcelocation1.length; k++)
146+
+ for (int k = 0; k < aresourcelocation1.length; ++k)
147+
{
148+
aresourcelocation1[k] = new ResourceLocation(JsonUtils.func_151206_a(jsonarray1.get(k), "recipes[" + k + "]"));
149+
IRecipe irecipe = CraftingManager.func_193373_a(aresourcelocation1[k]);

‎patches/minecraft/net/minecraft/advancements/PlayerAdvancements.java.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,12 @@
172172
}
173173
}
174174

175+
@@ -424,7 +414,7 @@
176+
177+
private boolean func_192738_c(Advancement p_192738_1_)
178+
{
179+
- for (int i = 0; p_192738_1_ != null && i <= 2; i++)
180+
+ for (int i = 0; p_192738_1_ != null && i <= 2; ++i)
181+
{
182+
if (i == 0 && this.func_192746_d(p_192738_1_))
183+
{

‎patches/minecraft/net/minecraft/advancements/critereon/ItemPredicate.java.patch‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
--- before/net/minecraft/advancements/critereon/ItemPredicate.java
22
+++ after/net/minecraft/advancements/critereon/ItemPredicate.java
3+
@@ -86,7 +86,7 @@
4+
{
5+
Map<Enchantment, Integer> map = EnchantmentHelper.func_82781_a(p_192493_1_);
6+
7+
- for (int i = 0; i < this.field_192499_e.length; i++)
8+
+ for (int i = 0; i < this.field_192499_e.length; ++i)
9+
{
10+
if (!this.field_192499_e[i].func_192463_a(map))
11+
{
312
@@ -104,6 +104,13 @@
413
if (p_192492_0_ != null && !p_192492_0_.isJsonNull())
514
{
@@ -14,3 +23,12 @@
1423
MinMaxBounds minmaxbounds = MinMaxBounds.func_192515_a(jsonobject.get("count"));
1524
MinMaxBounds minmaxbounds1 = MinMaxBounds.func_192515_a(jsonobject.get("durability"));
1625
Integer integer = jsonobject.has("data") ? JsonUtils.func_151203_m(jsonobject, "data") : null;
26+
@@ -151,7 +158,7 @@
27+
JsonArray jsonarray = JsonUtils.func_151207_m(p_192494_0_, "items");
28+
ItemPredicate[] aitempredicate = new ItemPredicate[jsonarray.size()];
29+
30+
- for (int i = 0; i < aitempredicate.length; i++)
31+
+ for (int i = 0; i < aitempredicate.length; ++i)
32+
{
33+
aitempredicate[i] = func_192492_a(jsonarray.get(i));
34+
}

‎patches/minecraft/net/minecraft/block/Block.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
+ List<ItemStack> drops = getDrops(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_); // use the old method until it gets removed, for backward compatibility
250250
+ p_180653_4_ = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(drops, p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_, p_180653_4_, false, harvesters.get());
251251

252-
- for (int j = 0; j < i; ++j)
252+
- for (int j = 0; j < i; j++)
253253
+ for (ItemStack drop : drops)
254254
{
255255
- if (!(p_180653_1_.field_73012_v.nextFloat() > p_180653_4_))
@@ -3036,7 +3036,7 @@
30363036
- {
30373037
- if (set.contains(block16))
30383038
- {
3039-
- for (int i = 0; i < 15; ++i)
3039+
- for (int i = 0; i < 15; i++)
30403040
- {
30413041
- int j = field_149771_c.func_148757_b(block16) << 4 | i;
30423042
- field_176229_d.func_148746_a(block16.func_176203_a(i), j);

‎patches/minecraft/net/minecraft/block/BlockBed.java.patch‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
public boolean func_190946_v(IBlockState p_190946_1_)
211211
{
212212
return true;
213-
@@ -256,7 +231,7 @@
213+
@@ -256,21 +231,21 @@
214214
@Nullable
215215
public static BlockPos func_176468_a(World p_176468_0_, BlockPos p_176468_1_, int p_176468_2_)
216216
{
@@ -219,6 +219,32 @@
219219
int i = p_176468_1_.func_177958_n();
220220
int j = p_176468_1_.func_177956_o();
221221
int k = p_176468_1_.func_177952_p();
222+
223+
- for (int l = 0; l <= 1; l++)
224+
+ for (int l = 0; l <= 1; ++l)
225+
{
226+
int i1 = i - enumfacing.func_82601_c() * l - 1;
227+
int j1 = k - enumfacing.func_82599_e() * l - 1;
228+
int k1 = i1 + 2;
229+
int l1 = j1 + 2;
230+
231+
- for (int i2 = i1; i2 <= k1; i2++)
232+
+ for (int i2 = i1; i2 <= k1; ++i2)
233+
{
234+
- for (int j2 = j1; j2 <= l1; j2++)
235+
+ for (int j2 = j1; j2 <= l1; ++j2)
236+
{
237+
BlockPos blockpos = new BlockPos(i2, j, j2);
238+
239+
@@ -281,7 +256,7 @@
240+
return blockpos;
241+
}
242+
243+
- p_176468_2_--;
244+
+ --p_176468_2_;
245+
}
246+
}
247+
}
222248
@@ -292,12 +267,9 @@
223249

224250
protected static boolean func_176469_d(World p_176469_0_, BlockPos p_176469_1_)

‎patches/minecraft/net/minecraft/block/BlockButton.java.patch‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,20 @@
8383
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
8484
{
8585
for (EnumFacing enumfacing : EnumFacing.values())
86-
@@ -103,7 +98,7 @@
87-
88-
if (p_181088_2_ == EnumFacing.UP)
89-
{
90-
- return block == Blocks.field_150438_bZ || !func_193384_b(block) && flag;
86+
@@ -100,30 +95,25 @@
87+
IBlockState iblockstate = p_181088_0_.func_180495_p(blockpos);
88+
boolean flag = iblockstate.func_193401_d(p_181088_0_, blockpos, p_181088_2_) == BlockFaceShape.SOLID;
89+
Block block = iblockstate.func_177230_c();
90+
- return p_181088_2_ == EnumFacing.UP ? block == Blocks.field_150438_bZ || !func_193384_b(block) && flag : !func_193382_c(block) && flag;
91+
+
92+
+ if (p_181088_2_ == EnumFacing.UP)
93+
+ {
9194
+ return iblockstate.func_185896_q() || !func_193384_b(block) && flag;
92-
}
93-
else
94-
{
95-
@@ -111,27 +106,14 @@
96-
}
95+
+ }
96+
+ else
97+
+ {
98+
+ return !func_193382_c(block) && flag;
99+
+ }
97100
}
98101

99102
- @Override
@@ -123,7 +126,7 @@
123126
{
124127
this.func_176226_b(p_189540_2_, p_189540_3_, p_189540_1_, 0);
125128
p_189540_2_.func_175698_g(p_189540_3_);
126-
@@ -152,11 +134,10 @@
129+
@@ -144,11 +134,10 @@
127130
}
128131
}
129132

@@ -137,7 +140,7 @@
137140

138141
switch (enumfacing)
139142
{
140-
@@ -176,29 +157,18 @@
143+
@@ -168,29 +157,18 @@
141144
}
142145
}
143146

@@ -171,7 +174,7 @@
171174
p_180639_1_.func_175684_a(p_180639_2_, this, this.func_149738_a(p_180639_1_));
172175
return true;
173176
}
174-
@@ -208,27 +178,24 @@
177+
@@ -200,27 +178,24 @@
175178

176179
protected abstract void func_185617_b(World p_185617_1_, BlockPos p_185617_2_);
177180

@@ -203,7 +206,7 @@
203206
{
204207
return 0;
205208
}
206-
@@ -238,23 +205,20 @@
209+
@@ -230,23 +205,20 @@
207210
}
208211
}
209212

@@ -228,7 +231,7 @@
228231
{
229232
if (this.field_150047_a)
230233
{
231-
@@ -262,8 +226,8 @@
234+
@@ -254,8 +226,8 @@
232235
}
233236
else
234237
{
@@ -239,7 +242,7 @@
239242
this.func_185617_b(p_180650_1_, p_180650_2_);
240243
p_180650_1_.func_175704_b(p_180650_2_, p_180650_2_);
241244
}
242-
@@ -271,14 +235,13 @@
245+
@@ -263,14 +235,13 @@
243246
}
244247
}
245248

@@ -255,7 +258,7 @@
255258
{
256259
this.func_185616_e(p_180634_3_, p_180634_1_, p_180634_2_);
257260
}
258-
@@ -288,22 +251,22 @@
261+
@@ -280,22 +251,22 @@
259262

260263
private void func_185616_e(IBlockState p_185616_1_, World p_185616_2_, BlockPos p_185616_3_)
261264
{
@@ -285,15 +288,15 @@
285288
p_185616_2_.func_175704_b(p_185616_3_, p_185616_3_);
286289
this.func_185617_b(p_185616_2_, p_185616_3_);
287290
}
288-
@@ -320,7 +283,6 @@
291+
@@ -312,7 +283,6 @@
289292
p_176582_1_.func_175685_c(p_176582_2_.func_177972_a(p_176582_3_.func_176734_d()), this, false);
290293
}
291294

292295
- @Override
293296
public IBlockState func_176203_a(int p_176203_1_)
294297
{
295298
EnumFacing enumfacing;
296-
@@ -347,10 +309,9 @@
299+
@@ -339,10 +309,9 @@
297300
enumfacing = EnumFacing.UP;
298301
}
299302

@@ -305,7 +308,7 @@
305308
public int func_176201_c(IBlockState p_176201_1_)
306309
{
307310
int i;
308-
@@ -377,7 +338,7 @@
311+
@@ -369,7 +338,7 @@
309312
i = 0;
310313
}
311314

@@ -314,7 +317,7 @@
314317
{
315318
i |= 8;
316319
}
317-
@@ -385,25 +346,21 @@
320+
@@ -377,25 +346,21 @@
318321
return i;
319322
}
320323

‎patches/minecraft/net/minecraft/block/BlockCactus.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
- while (p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(i)).func_177230_c() == this)
4545
+ for (i = 1; p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(i)).func_177230_c() == this; ++i)
4646
{
47-
- ++i;
47+
- i++;
4848
+ ;
4949
}
5050

‎patches/minecraft/net/minecraft/block/BlockChest.java.patch‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,42 @@
148148
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
149149
{
150150
int i = 0;
151+
@@ -347,7 +330,7 @@
152+
return false;
153+
}
154+
155+
- i++;
156+
+ ++i;
157+
}
158+
159+
if (p_176196_1_.func_180495_p(blockpos1).func_177230_c() == this)
160+
@@ -357,7 +340,7 @@
161+
return false;
162+
}
163+
164+
- i++;
165+
+ ++i;
166+
}
167+
168+
if (p_176196_1_.func_180495_p(blockpos2).func_177230_c() == this)
169+
@@ -367,7 +350,7 @@
170+
return false;
171+
}
172+
173+
- i++;
174+
+ ++i;
175+
}
176+
177+
if (p_176196_1_.func_180495_p(blockpos3).func_177230_c() == this)
178+
@@ -377,7 +360,7 @@
179+
return false;
180+
}
181+
182+
- i++;
183+
+ ++i;
184+
}
185+
186+
return i <= 1;
151187
@@ -403,7 +386,6 @@
152188
}
153189
}

0 commit comments

Comments
 (0)