Skip to content

Commit aaee610

Browse files
IThundxrIThundxr
committed
Assorted Fixes
- Fix blocks failing to render when they do not have an associated block entity in the wrench rotation menu #9608 - Fix shapeless recipes not having conditions added to the generated recipe #9613 - Fix drills not dropping xp when breaking xp dropping blocks #9292
1 parent 174671d commit aaee610

File tree

9 files changed

+76
-43
lines changed

9 files changed

+76
-43
lines changed

‎src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-11-02T10:48:42.643836944 Create's Standard Recipes
1+
// 1.21.1 2025-12-13T13:03:10.670718499 Create's Standard Recipes
22
489f0a3e3d8571c4897f49eada95a23290a472dc data/create/advancement/recipes/combat/crafting/appliances/netherite_backtank.json
33
b024ae44179c47b9be8fa35acc763c22b7b01b2e data/create/advancement/recipes/combat/crafting/appliances/netherite_backtank_from_netherite.json
44
41d2909fcf45f9098c0ee306810c16168d4e8ae4 data/create/advancement/recipes/combat/crafting/appliances/netherite_diving_boots.json
@@ -238,7 +238,7 @@ a5d4a6d5b25d1cfff096121d08ced42fc14dbe2d data/create/advancement/recipes/misc/cr
238238
1fd9ac6c86981f37bcb2a83c1e41dee711326b89 data/create/advancement/recipes/misc/crafting/schematics/schematic_and_quill.json
239239
f12b0b50c9eedb5fe586162f4b95b408e959ffac data/create/advancement/recipes/misc/crafting/schematics/schematic_table.json
240240
a6083a8cb62bb89189ae6b24e296f86db41c7699 data/create/advancement/recipes/misc/crafting/schematics/schematicannon.json
241-
c21f08d80359a242004a484b4313ddbbb76e5c2d data/create/advancement/recipes/misc/crafting/tree_fertilizer.json
241+
488d0e09292b906115ec62620f8e96822241ac38 data/create/advancement/recipes/misc/crafting/tree_fertilizer.json
242242
c9c291c510c616cbc1c2ab291b174d8ff0d2d463 data/create/advancement/recipes/misc/smelting/bread.json
243243
9ca18682184387126e715d6f321fcee3120bc61f data/create/advancement/recipes/misc/smelting/copper_ingot_from_crushed.json
244244
76dbadbc1077f2ee6b977ee3ba8775c6e8661af6 data/create/advancement/recipes/misc/smelting/glass_from_framed_glass.json
@@ -488,7 +488,7 @@ a5c159b421d293d78c3eff019a0c4679ee7b27f6 data/create/recipe/crafting/logistics/s
488488
1fb9b09ffee15f90f7c5f40ca0bd091bb478111e data/create/recipe/crafting/materials/andesite_alloy_block.json
489489
156eb4e2b4751735a4fde6c19909c2c1a176b100 data/create/recipe/crafting/materials/andesite_alloy_from_block.json
490490
e2dc9c6465a56670f7faa24863f278e8acbfbdd1 data/create/recipe/crafting/materials/andesite_alloy_from_zinc.json
491-
72d826d64a65796e2d4806f756bd7a1f7513164e data/create/recipe/crafting/materials/bound_cardboard_block.json
491+
20f9ea9b3eea2ad83b946548d9643525a9f9505c data/create/recipe/crafting/materials/bound_cardboard_block.json
492492
f90e384c97e6de444d7b77bc1742fdc5297b09b1 data/create/recipe/crafting/materials/brass_block_from_compacting.json
493493
9791c35874f96fdb3d96be6c2c9d03bdba7871a8 data/create/recipe/crafting/materials/brass_ingot_from_compacting.json
494494
319647782ae788242af731daa11d550ad73f0660 data/create/recipe/crafting/materials/brass_ingot_from_decompacting.json
@@ -518,7 +518,7 @@ e73a660925d6cf80e1b8d81d35f53d56b28b7af2 data/create/recipe/crafting/schematics/
518518
ee1bf4fe136d0d10ab786b3a7b4a759fb6ef60ea data/create/recipe/crafting/schematics/schematic_and_quill.json
519519
a6dac63c7b0c818c0ab461310a352092a4b61083 data/create/recipe/crafting/schematics/schematic_table.json
520520
8b4fd3bc6a3be08b9eb9de3dc3d346bda4701050 data/create/recipe/crafting/schematics/schematicannon.json
521-
11ead95f608e6027cf43434423658e9955fb01d7 data/create/recipe/crafting/tree_fertilizer.json
521+
df12fba0450d64ed82637777fb77ce5f2ccde5b7 data/create/recipe/crafting/tree_fertilizer.json
522522
be41a76d909d0d6fe0ae73482a3f4ad4cd7aac85 data/create/recipe/smelting/bread.json
523523
19c396a20a7b784a739e4b532ed1852186c50923 data/create/recipe/smelting/copper_ingot_from_crushed.json
524524
e6fe59961d4e33bfd702ca62e0d71059f410429d data/create/recipe/smelting/glass_from_framed_glass.json

‎src/generated/resources/.cache/af1b4964b4b67530aeb67585e9573385e8cab38a‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-11-02T10:48:42.585872441 Registrate Provider for create [Registries, Data Maps, Recipes, Advancements, Loot Tables, Tags (blocks), Tags (enchantments), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
1+
// 1.21.1 2025-12-13T13:03:10.647007878 Registrate Provider for create [Registries, Data Maps, Recipes, Advancements, Loot Tables, Tags (blocks), Tags (enchantments), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
22
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
33
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
44
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@@ -642,8 +642,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo
642642
fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json
643643
e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json
644644
64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json
645-
e85afc331e107708fe1399caa86ce3bc11294f92 assets/create/lang/en_ud.json
646-
ebc804b30d90de9ae5a5d292e32e3660f00b039f assets/create/lang/en_us.json
645+
03dc20b6bbecdf7c966c7ac8e8ee5404521c1256 assets/create/lang/en_ud.json
646+
b08881fb5bda3591596edce7c69d8d0517fc14e3 assets/create/lang/en_us.json
647647
a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json
648648
103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json
649649
fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json

‎src/generated/resources/assets/create/lang/en_ud.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,7 @@
16761676
"create.ponder.cart_assembler.text_2": "sʞɔoןq oʇuı ʞɔɐq suoıʇdɐɹʇuoɔ ʇɹɐɔ buıssɐd sǝןqɯǝssɐsıp ʇı 'ןɐubıs ǝuoʇspǝɹ ɐ ʇnoɥʇıM",
16771677
"create.ponder.cart_assembler.text_3": "ǝɹǝɥʍǝsןǝ uoıʇdɐɹʇuoƆ ǝɥʇ ʎɹɹɐɔ noʎ ʇǝן ןןıʍ ʇɹɐɔǝuıW ǝɥʇ uo ɥɔuǝɹM ɐ buıs∩",
16781678
"create.ponder.cart_assembler_dual.header": "suoıʇdɐɹʇuoƆ ǝbɐıɹɹɐƆ buıןqɯǝssⱯ",
1679-
"create.ponder.cart_assembler_dual.text_1": "˙˙˙ǝɹnʇɔnɹʇs pǝɥɔɐʇʇɐ uɐ ǝɹɐɥs sɹǝqɯǝssⱯ ʇɹɐƆ oʍʇ ɹǝʌǝuǝɥM",
1679+
"create.ponder.cart_assembler_dual.text_1": "˙˙˙ǝɹnʇɔnɹʇs pǝɥɔɐʇʇɐ uɐ ǝɹɐɥs sɹǝןqɯǝssⱯ ʇɹɐƆ oʍʇ ɹǝʌǝuǝɥM",
16801680
"create.ponder.cart_assembler_dual.text_2": "uoıʇdɐɹʇuoƆ ǝbɐıɹɹɐƆ ɐ ǝʇɐǝɹɔ ןןıʍ ɯǝɥʇ ɟo ɹǝɥʇıǝ buıɹǝʍoԀ",
16811681
"create.ponder.cart_assembler_dual.text_3": "buıןdnoƆ ʇɹɐɔǝuıW ɐıʌ pǝʇɔǝuuoɔ ǝsoɥʇ ǝʞıן ǝʌɐɥǝq ןןıʍ sʇɹɐɔ ǝɥ⟘",
16821682
"create.ponder.cart_assembler_modes.header": "suoıʇdɐɹʇuoƆ ʇɹɐɔǝuıW ɹoɟ sbuıʇʇǝS uoıʇɐʇuǝıɹO",
@@ -2379,7 +2379,7 @@
23792379
"create.ponder.speedometer.header": "ɹǝʇǝɯopǝǝdS ǝɥʇ buısn uoıʇɐɯɹoɟuı ɔıʇǝuıʞ buıɹoʇıuoW",
23802380
"create.ponder.speedometer.text_1": "sʇuǝuodɯoɔ pǝɥɔɐʇʇɐ ɟo pǝǝdS ʇuǝɹɹnɔ ǝɥʇ sʎɐןdsıp ɹǝʇǝɯopǝǝdS ǝɥ⟘",
23812381
"create.ponder.speedometer.text_2": "ǝbnɐ⅁ ǝɥʇ ɯoɹɟ uoıʇɐɯɹoɟuı pǝןıɐʇǝp ǝɹoɯ ʇǝb uɐɔ ɹǝʎɐןd ǝɥʇ 'sǝןbbo⅁ ,sɹǝǝuıbuƎ buıɹɐǝʍ uǝɥM",
2382-
"create.ponder.speedometer.text_3": "sʇuǝɯǝɹnsɐǝɯ s,ɹǝʇǝɯopǝǝdS ǝɥʇ oʇ ǝʌıʇɐןǝɹ sןɐubıS ǝuoʇsǝᴚ boןɐuɐ ʇıɯǝ uɐɔ sɹoʇɐɹɐdɯoƆ",
2382+
"create.ponder.speedometer.text_3": "sʇuǝɯǝɹnsɐǝɯ s,ɹǝʇǝɯopǝǝdS ǝɥʇ oʇ ǝʌıʇɐןǝɹ sןɐubıS ǝuoʇspǝᴚ boןɐuɐ ʇıɯǝ uɐɔ sɹoʇɐɹɐdɯoƆ",
23832383
"create.ponder.spout_filling.header": "ʇnodS ɐ buısn sɯǝʇI buıןןıℲ",
23842384
"create.ponder.spout_filling.text_1": "ʇı ɥʇɐǝuǝq pǝpıʌoɹd sɯǝʇı buıpןoɥ pınןɟ ןןıɟ uɐɔ ʇnodS ǝɥ⟘",
23852385
"create.ponder.spout_filling.text_2": "ʎןןɐnuɐɯ pǝssǝɔɔɐ ǝq ʇouuɐɔ ʇnodS ɐ ɟo ʇuǝʇuoɔ ǝɥ⟘",
@@ -2454,7 +2454,7 @@
24542454
"create.ponder.stressometer.header": "ɹǝʇǝɯossǝɹʇS ǝɥʇ buısn uoıʇɐɯɹoɟuı ɔıʇǝuıʞ buıɹoʇıuoW",
24552455
"create.ponder.stressometer.text_1": "ʞɹoʍʇǝu ɔıʇǝuıʞ pǝɥɔɐʇʇɐ ǝɥʇ ɟo ʎʇıɔɐdɐƆ ssǝɹʇS ʇuǝɹɹnɔ ǝɥʇ sʎɐןdsıp ɹǝʇǝɯossǝɹʇS ǝɥ⟘",
24562456
"create.ponder.stressometer.text_2": "ǝbnɐ⅁ ǝɥʇ ɯoɹɟ uoıʇɐɯɹoɟuı pǝןıɐʇǝp ǝɹoɯ ʇǝb uɐɔ ɹǝʎɐןd ǝɥʇ 'sǝןbbo⅁ ,sɹǝǝuıbuƎ buıɹɐǝʍ uǝɥM",
2457-
"create.ponder.stressometer.text_3": "sʇuǝɯǝɹnsɐǝɯ s,ɹǝʇǝɯossǝɹʇS ǝɥʇ oʇ ǝʌıʇɐןǝɹ sןɐubıS ǝuoʇsǝᴚ boןɐuɐ ʇıɯǝ uɐɔ sɹoʇɐɹɐdɯoƆ",
2457+
"create.ponder.stressometer.text_3": "sʇuǝɯǝɹnsɐǝɯ s,ɹǝʇǝɯossǝɹʇS ǝɥʇ oʇ ǝʌıʇɐןǝɹ sןɐubıS ǝuoʇspǝᴚ boןɐuɐ ʇıɯǝ uɐɔ sɹoʇɐɹɐdɯoƆ",
24582458
"create.ponder.super_glue.header": "ǝnן⅁ ɹǝdnS buısn sʞɔoןq buıɥɔɐʇʇⱯ",
24592459
"create.ponder.super_glue.text_1": "suoıʇdɐɹʇuoɔ buıʌoɯ oʇuı ɹǝɥʇǝboʇ sʞɔoןq sdnoɹb ǝnן⅁ ɹǝdnS",
24602460
"create.ponder.super_glue.text_2": "ɐǝɹɐ ,pǝnןb, ʍǝu ɐ sǝʇɐǝɹɔ sʇuıodpuǝ oʍʇ buıʞɔıןƆ",
@@ -3611,7 +3611,7 @@
36113611
"tag.item.create.stone_types.diorite": "ǝʇıɹoıᗡ",
36123612
"tag.item.create.stone_types.dripstone": "ǝuoʇsdıɹᗡ",
36133613
"tag.item.create.stone_types.galosphere.allurite": "ǝʇıɹnןןⱯ",
3614-
"tag.item.create.stone_types.galosphere.amethyst": "ʇsnɥʇǝɯⱯ",
3614+
"tag.item.create.stone_types.galosphere.amethyst": "ʇsʎɥʇǝɯⱯ",
36153615
"tag.item.create.stone_types.galosphere.lumiere": "ǝɹǝıɯnꞀ",
36163616
"tag.item.create.stone_types.granite": "ǝʇıuɐɹ⅁",
36173617
"tag.item.create.stone_types.limestone": "ǝuoʇsǝɯıꞀ",

‎src/generated/resources/data/create/advancement/recipes/misc/crafting/tree_fertilizer.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:mod_loaded",
5+
"modid": "upgrade_aquatic"
6+
}
7+
],
28
"parent": "minecraft:recipes/root",
39
"criteria": {
410
"has_item": {

‎src/generated/resources/data/create/recipe/crafting/materials/bound_cardboard_block.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"item": "create:cardboard_block"
77
},
88
{
9-
"item": "minecraft:string"
9+
"tag": "c:strings"
1010
}
1111
],
1212
"result": {

‎src/generated/resources/data/create/recipe/crafting/tree_fertilizer.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:mod_loaded",
5+
"modid": "upgrade_aquatic"
6+
}
7+
],
28
"type": "minecraft:crafting_shapeless",
39
"category": "misc",
410
"ingredients": [

‎src/main/java/com/simibubi/create/content/contraptions/wrench/RadialWrenchMenu.java‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.Optional;
99
import java.util.Set;
1010

11+
import org.jetbrains.annotations.Nullable;
1112
import org.joml.Matrix4f;
1213

1314
import com.mojang.blaze3d.platform.InputConstants;
@@ -91,6 +92,7 @@ public static void registerBlacklistedBlock(ResourceLocation location) {
9192

9293
private final BlockState state;
9394
private final BlockPos pos;
95+
@Nullable
9496
private final BlockEntity blockEntity;
9597
private final Level level;
9698
private final NonVisualizationLevel nonVisualizationLevel;
@@ -274,14 +276,13 @@ private void renderRadialSectors(GuiGraphics graphics) {
274276
poseStack.translate(0, 0, 100);
275277

276278
try {
277-
Level previousLevel = blockEntity.getLevel();
278-
blockEntity.setLevel(nonVisualizationLevel);
279-
GuiGameElement.of(blockState, blockEntity)
280-
.rotateBlock(player.getXRot(), player.getYRot() + 180, 0f)
281-
.scale(24)
282-
.at(-12, 12)
283-
.render(graphics);
284-
blockEntity.setLevel(previousLevel);
279+
withLevel(blockEntity, nonVisualizationLevel,
280+
() -> GuiGameElement.of(blockState, blockEntity)
281+
.rotateBlock(player.getXRot(), player.getYRot() + 180, 0f)
282+
.scale(24)
283+
.at(-12, 12)
284+
.render(graphics)
285+
);
285286
} catch (Exception e) {
286287
Create.LOGGER.warn("Failed to render blockstate in RadialWrenchMenu", e);
287288
allStates.remove(i);
@@ -351,13 +352,32 @@ private void renderDirectionIndicator(GuiGraphics graphics, double theta) {
351352

352353
private void submitChange() {
353354
BlockState selectedState = allStates.get(selectedStateIndex);
354-
if (selectedState != state) {
355+
if (selectedState != state) {
355356
CatnipServices.NETWORK.sendToServer(new RadialWrenchMenuSubmitPacket(pos, selectedState));
356357
}
357358

358359
onClose();
359360
}
360361

362+
private void withLevel(@Nullable BlockEntity blockEntity, Level newLevel, Runnable action) {
363+
boolean hasBlockEntity = blockEntity != null;
364+
365+
Level originalLevel = null;
366+
if (hasBlockEntity) {
367+
originalLevel = blockEntity.getLevel();
368+
blockEntity.setLevel(newLevel);
369+
}
370+
371+
try {
372+
action.run();
373+
} finally {
374+
if (hasBlockEntity) {
375+
//noinspection DataFlowIssue
376+
blockEntity.setLevel(originalLevel);
377+
}
378+
}
379+
}
380+
361381
@Override
362382
public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
363383
Color color = BACKGROUND_COLOR

‎src/main/java/com/simibubi/create/foundation/data/recipe/CreateStandardRecipeGen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@ GeneratedRecipe viaShapeless(UnaryOperator<ShapelessRecipeBuilder> builder) {
16041604

16051605
RecipeOutput conditionalOutput = recipeOutput.withConditions(recipeConditions.toArray(new ICondition[0]));
16061606

1607-
b.save(recipeOutput, createLocation("crafting"));
1607+
b.save(conditionalOutput, createLocation("crafting"));
16081608
});
16091609
}
16101610

‎src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -209,56 +209,57 @@ public static void destroyBlock(Level world, BlockPos pos, float effectChance,
209209
destroyBlockAs(world, pos, null, ItemStack.EMPTY, effectChance, droppedItemCallback);
210210
}
211211

212-
public static void destroyBlockAs(Level world, BlockPos pos, @Nullable Player player, ItemStack usedTool,
212+
public static void destroyBlockAs(Level level, BlockPos pos, @Nullable Player player, ItemStack usedTool,
213213
float effectChance, Consumer<ItemStack> droppedItemCallback) {
214-
FluidState fluidState = world.getFluidState(pos);
215-
BlockState state = world.getBlockState(pos);
214+
FluidState fluidState = level.getFluidState(pos);
215+
BlockState state = level.getBlockState(pos);
216216

217-
if (world.random.nextFloat() < effectChance)
218-
world.levelEvent(LevelEvent.PARTICLES_DESTROY_BLOCK, pos, Block.getId(state));
219-
BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
217+
if (level.random.nextFloat() < effectChance)
218+
level.levelEvent(LevelEvent.PARTICLES_DESTROY_BLOCK, pos, Block.getId(state));
219+
BlockEntity blockEntity = state.hasBlockEntity() ? level.getBlockEntity(pos) : null;
220220

221221
if (player != null) {
222-
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, pos, state, player);
222+
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(level, pos, state, player);
223223
NeoForge.EVENT_BUS.post(event);
224224
if (event.isCanceled())
225225
return;
226226

227-
usedTool.mineBlock(world, state, pos, player);
227+
usedTool.mineBlock(level, state, pos, player);
228228
player.awardStat(Stats.BLOCK_MINED.get(state.getBlock()));
229229
}
230230

231-
if (world instanceof ServerLevel serverLevel && world.getGameRules()
232-
.getBoolean(GameRules.RULE_DOBLOCKDROPS) && !world.restoringBlockSnapshots
231+
if (level instanceof ServerLevel serverLevel && level.getGameRules()
232+
.getBoolean(GameRules.RULE_DOBLOCKDROPS) && !level.restoringBlockSnapshots
233233
&& (player == null || !player.isCreative())) {
234234
List<ItemStack> drops = Block.getDrops(state, serverLevel, pos, blockEntity, player, usedTool);
235-
if (player != null) {
236-
BlockDropsEvent event = new BlockDropsEvent(serverLevel, pos, state, blockEntity, List.of(), player, usedTool);
237-
NeoForge.EVENT_BUS.post(event);
238-
if (!event.isCanceled()) {
239-
if ( event.getDroppedExperience() > 0)
240-
state.getBlock().popExperience(serverLevel, pos, event.getDroppedExperience());
235+
236+
BlockDropsEvent event = new BlockDropsEvent(serverLevel, pos, state, blockEntity, List.of(), player, usedTool);
237+
NeoForge.EVENT_BUS.post(event);
238+
if (!event.isCanceled()) {
239+
if (event.getDroppedExperience() > 0) {
240+
state.getBlock().popExperience(serverLevel, pos, event.getDroppedExperience());
241241
}
242242
}
243+
243244
for (ItemStack itemStack : drops)
244245
droppedItemCallback.accept(itemStack);
245246

246247
// Simulating IceBlock#playerDestroy. Not calling method directly as it would drop item
247248
// entities as a side-effect
248-
Registry<Enchantment> enchantmentRegistry = world.registryAccess().registryOrThrow(Registries.ENCHANTMENT);
249+
Registry<Enchantment> enchantmentRegistry = level.registryAccess().registryOrThrow(Registries.ENCHANTMENT);
249250
if (state.getBlock() instanceof IceBlock && usedTool.getEnchantmentLevel(enchantmentRegistry.getHolderOrThrow(Enchantments.SILK_TOUCH)) == 0) {
250-
if (!world.dimensionType().ultraWarm()) {
251-
BlockState below = world.getBlockState(pos.below());
251+
if (!level.dimensionType().ultraWarm()) {
252+
BlockState below = level.getBlockState(pos.below());
252253
if (below.blocksMotion() || below.liquid()) {
253254
fluidState = IceBlock.meltsInto().getFluidState();
254255
}
255256
}
256257
}
257258

258-
state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
259+
state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, false);
259260
}
260261

261-
world.setBlockAndUpdate(pos, fluidState.createLegacyBlock());
262+
level.setBlockAndUpdate(pos, fluidState.createLegacyBlock());
262263
}
263264

264265
public static boolean isSolidWall(BlockGetter reader, BlockPos fromPos, Direction toDirection) {

0 commit comments

Comments
 (0)