From 41f72f33d3cb7c2357dc0d884c1c66172cd76149 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Sat, 13 Apr 2024 07:49:04 -0700 Subject: [PATCH 1/4] v1.5.23 for mc116 tag and release --- gradle.properties | 2 +- update.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b8d718125..b11676cd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false curse_id=239286 -mod_version=1.5.23-SNAPSHOT +mod_version=1.5.23 mc_version=1.16.5 forge_version=36.2.34 diff --git a/update.json b/update.json index d469244b8..b480da649 100644 --- a/update.json +++ b/update.json @@ -79,6 +79,6 @@ ,"1.5.20":"#2102 wooden and golden hopper deposit logic fixed, now matches 1.18.2+ versions. #2085 Hopper reach area & pickup logic now uses vanilla-hopper area size. JEED compatibility added for some potion effects. Port Fishing Net and Mending Fishingrods compatibility from 1.12.2 #2067. Ender Apple now sends a message if nothing is found (void/flatworlds/etc). Growth enchant now skips IGrowable blocks that return false for 'canGrow();'. Many new config options added for: growth enchant, beheading enchant, battery, sprinkler, experience_pylon, fisher, scythes, and others in cyclic.toml" ,"1.5.21":"#1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node " ,"1.5.22":"Fix #2351 advanced crafting stick not opening. " - ,"1.5.23":"Growth enchantment now uses the same logic as Sprinkler & Terra Soil (only minecraft:crops or minecraft::saplings can grow, respect IGrowable::canUseBonemeal). New gloomIgnored config Gloom enchant (cyclic:curse) to ignore and not use these effects #2217 #2325. New config 'Fix Soundproofing block not muting Mekanism sounds #2389 (for example Precision Sawmill and others - you may need four or more soundproofing blocks for the desired effect). Patch an edge-case where User might drop items on the ground. New config [cyclic.blocks.soundproofing] radius = 6 to control the area. Fix item cable routing #2245 #2230. New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions #1913. Balance recipe changes for #2372. Balance changes made for Excavate enchant it will no longer trigger if the tool is not 'mineable' effective for example axe on dirt. New feature for Excavate enchant #2116 it will not trigger on anything matching the block data-tag 'cyclic:ignored/excavate'. [Backported changes from mc1.20.1] zenscript support for generator_fluid and generator_item; #2182 candle model assets; Block Breaker no longer tries (and fails) to mine liquid source blocks; Block Randomizer use wireframe rendering only of non-air instead of solid shading; Glistering & Corrupted chorus only restores 1 food-unit down from 3; a few recipes tweaked/backported to match mc1.20.1+ " + ,"1.5.23":"Growth enchantment now uses the same logic as Sprinkler & Terra Soil (only minecraft:crops or minecraft::saplings can grow, respect IGrowable::canUseBonemeal). New gloomIgnored config Gloom enchant (cyclic:curse) to ignore and not use these effects #2217 #2325. Fix Soundproofing block not muting Mekanism sounds #2389 (for example Precision Sawmill and others - you may need four or more soundproofing blocks for the desired effect). Patch an edge-case where User might drop items on the ground. New config [cyclic.blocks.soundproofing] radius = 6 to control the area. Fix item cable routing #2245 #2230. New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions #1913. Balance recipe changes for #2372. Balance changes made for Excavate enchant it will no longer trigger if the tool is not 'mineable' effective for example axe on dirt. New feature for Excavate enchant #2116 it will not trigger on anything matching the block data-tag 'cyclic:ignored/excavate'. [Backported changes from mc1.20.1] #2182 candle model assets; Block Breaker no longer tries (and fails) to mine liquid source blocks; Block Randomizer use wireframe rendering only of non-air instead of solid shading; Glistering & Corrupted chorus only restores 1 food-unit down from 3; a few recipes tweaked/backported to match mc1.20.1+, ported crafttweaker zenscript support for generator_fluid and generator_item; backported item data tags for use in recipes for example forge:vines, forge:sandstone, forge:mushrooms " } } From 348e8976e758ecd831306060a93908ecd0912fb9 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Fri, 18 Oct 2024 13:54:37 -0700 Subject: [PATCH 2/4] Fixed bug in the item cyclic:offset_scepter #2427 --- gradle.properties | 2 +- src/main/java/com/lothrazar/cyclic/registry/ItemRegistry.java | 2 +- update.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b11676cd9..cccd2e796 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false curse_id=239286 -mod_version=1.5.23 +mod_version=1.5.24 mc_version=1.16.5 forge_version=36.2.34 diff --git a/src/main/java/com/lothrazar/cyclic/registry/ItemRegistry.java b/src/main/java/com/lothrazar/cyclic/registry/ItemRegistry.java index ad8946607..e2fbd3235 100644 --- a/src/main/java/com/lothrazar/cyclic/registry/ItemRegistry.java +++ b/src/main/java/com/lothrazar/cyclic/registry/ItemRegistry.java @@ -166,7 +166,7 @@ public class ItemRegistry { public static final RegistryObject WIRELESS_ITEM = ITEMS.register("wireless_item", () -> new BlockItem(BlockRegistry.WIRELESS_ITEM.get(), new Item.Properties().group(MaterialRegistry.BLOCK_GROUP))); public static final RegistryObject BUILD_SCEPTER = ITEMS.register("build_scepter", () -> new BuilderItem(new Item.Properties().group(MaterialRegistry.ITEM_GROUP), BuildStyle.NORMAL)); public static final RegistryObject REPLACE_SCEPTER = ITEMS.register("replace_scepter", () -> new BuilderItem(new Item.Properties().group(MaterialRegistry.ITEM_GROUP), BuildStyle.REPLACE)); - public static final RegistryObject OFFSET_SCEPTER = ITEMS.register("offset_scepter", () -> new BuilderItem(new Item.Properties().group(MaterialRegistry.ITEM_GROUP), BuildStyle.REPLACE)); + public static final RegistryObject OFFSET_SCEPTER = ITEMS.register("offset_scepter", () -> new BuilderItem(new Item.Properties().group(MaterialRegistry.ITEM_GROUP), BuildStyle.OFFSET)); public static final RegistryObject RANDOMIZE_SCEPTER = ITEMS.register("randomize_scepter", () -> new RandomizerItem(new Item.Properties().group(MaterialRegistry.ITEM_GROUP))); public static final RegistryObject SPAWNINSPECTOR = ITEMS.register("spawn_inspector", () -> new SpawnInspectorTool(new Item.Properties().maxDamage(256).group(MaterialRegistry.ITEM_GROUP))); public static final RegistryObject CHARM_WING = ITEMS.register("charm_wing", () -> new CharmWing(new Item.Properties().maxDamage(64).group(MaterialRegistry.ITEM_GROUP))); diff --git a/update.json b/update.json index b480da649..96dd872a1 100644 --- a/update.json +++ b/update.json @@ -1,7 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/cyclic", "promos": { - "1.16.5-latest": "1.5.22" + "1.16.5-latest": "1.5.24" }, "1.16.5": { "0.6.1": "Ported ", @@ -80,5 +80,6 @@ ,"1.5.21":"#1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node " ,"1.5.22":"Fix #2351 advanced crafting stick not opening. " ,"1.5.23":"Growth enchantment now uses the same logic as Sprinkler & Terra Soil (only minecraft:crops or minecraft::saplings can grow, respect IGrowable::canUseBonemeal). New gloomIgnored config Gloom enchant (cyclic:curse) to ignore and not use these effects #2217 #2325. Fix Soundproofing block not muting Mekanism sounds #2389 (for example Precision Sawmill and others - you may need four or more soundproofing blocks for the desired effect). Patch an edge-case where User might drop items on the ground. New config [cyclic.blocks.soundproofing] radius = 6 to control the area. Fix item cable routing #2245 #2230. New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions #1913. Balance recipe changes for #2372. Balance changes made for Excavate enchant it will no longer trigger if the tool is not 'mineable' effective for example axe on dirt. New feature for Excavate enchant #2116 it will not trigger on anything matching the block data-tag 'cyclic:ignored/excavate'. [Backported changes from mc1.20.1] #2182 candle model assets; Block Breaker no longer tries (and fails) to mine liquid source blocks; Block Randomizer use wireframe rendering only of non-air instead of solid shading; Glistering & Corrupted chorus only restores 1 food-unit down from 3; a few recipes tweaked/backported to match mc1.20.1+, ported crafttweaker zenscript support for generator_fluid and generator_item; backported item data tags for use in recipes for example forge:vines, forge:sandstone, forge:mushrooms " + ,"1.5.24":"Fixed bug in the item cyclic:offset_scepter #2427. " } } From e224acc03855ccfe47475a44004459ecacbae4ce Mon Sep 17 00:00:00 2001 From: lothrazar Date: Fri, 18 Oct 2024 13:55:15 -0700 Subject: [PATCH 3/4] Tweaked block model visuals of the Transfer Nodes --- .../assets/cyclic/models/parent/node_lit.json | 210 +----------------- update.json | 2 +- 2 files changed, 2 insertions(+), 210 deletions(-) diff --git a/src/main/resources/assets/cyclic/models/parent/node_lit.json b/src/main/resources/assets/cyclic/models/parent/node_lit.json index ec9b592a3..02694b74c 100644 --- a/src/main/resources/assets/cyclic/models/parent/node_lit.json +++ b/src/main/resources/assets/cyclic/models/parent/node_lit.json @@ -1,110 +1,7 @@ { "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", "elements": [ - { - "name": "CR", - "from": [0, 0, 0], - "to": [2, 2, 2], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [14, 0, 0], - "to": [16, 2, 2], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [0, 14, 0], - "to": [2, 16, 2], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [0, 0, 14], - "to": [2, 2, 16], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [0, 14, 14], - "to": [2, 16, 16], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [14, 0, 14], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [14, 14, 0], - "to": [16, 16, 2], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CR", - "from": [14, 14, 14], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, + { "name": "Core", "from": [4, 4, 4], @@ -195,111 +92,6 @@ "up": {"uv": [4, 4, 12, 12], "texture": "#plate_back"}, "down": {"uv": [4, 4, 12, 12], "texture": "#plate_front"} } - }, - - { - "name": "CI", - "from": [2, 2, 2], - "to": [4, 4, 4], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [12, 2, 2], - "to": [14, 4, 4], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [2, 12, 2], - "to": [4, 14, 4], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [2, 2, 12], - "to": [4, 4, 14], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [2, 12, 12], - "to": [4, 14, 14], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [12, 2, 12], - "to": [14, 4, 14], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [12, 12, 2], - "to": [14, 14, 4], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } - }, - { - "name": "CI", - "from": [12, 12, 12], - "to": [14, 14, 14], - "faces": { - "north": {"uv": [5, 5, 6, 6], "texture": "#main"}, - "east": {"uv": [5, 5, 6,6], "texture": "#main"}, - "south": {"uv": [5, 5, 6,6], "texture": "#main"}, - "west": {"uv": [5, 5, 6,6], "texture": "#main"}, - "up": {"uv": [5, 5, 6,6], "texture": "#main"}, - "down": {"uv": [5, 5, 6,6], "texture": "#main"} - } } ], "display": { diff --git a/update.json b/update.json index 96dd872a1..aa4ee7933 100644 --- a/update.json +++ b/update.json @@ -80,6 +80,6 @@ ,"1.5.21":"#1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node " ,"1.5.22":"Fix #2351 advanced crafting stick not opening. " ,"1.5.23":"Growth enchantment now uses the same logic as Sprinkler & Terra Soil (only minecraft:crops or minecraft::saplings can grow, respect IGrowable::canUseBonemeal). New gloomIgnored config Gloom enchant (cyclic:curse) to ignore and not use these effects #2217 #2325. Fix Soundproofing block not muting Mekanism sounds #2389 (for example Precision Sawmill and others - you may need four or more soundproofing blocks for the desired effect). Patch an edge-case where User might drop items on the ground. New config [cyclic.blocks.soundproofing] radius = 6 to control the area. Fix item cable routing #2245 #2230. New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions #1913. Balance recipe changes for #2372. Balance changes made for Excavate enchant it will no longer trigger if the tool is not 'mineable' effective for example axe on dirt. New feature for Excavate enchant #2116 it will not trigger on anything matching the block data-tag 'cyclic:ignored/excavate'. [Backported changes from mc1.20.1] #2182 candle model assets; Block Breaker no longer tries (and fails) to mine liquid source blocks; Block Randomizer use wireframe rendering only of non-air instead of solid shading; Glistering & Corrupted chorus only restores 1 food-unit down from 3; a few recipes tweaked/backported to match mc1.20.1+, ported crafttweaker zenscript support for generator_fluid and generator_item; backported item data tags for use in recipes for example forge:vines, forge:sandstone, forge:mushrooms " - ,"1.5.24":"Fixed bug in the item cyclic:offset_scepter #2427. " + ,"1.5.24":"Fixed bug in the item cyclic:offset_scepter #2427. Tweaked block model visuals of the Transfer Nodes" } } From db65e00052385a88b650c73590c949c7adff7c13 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Fri, 18 Oct 2024 14:49:47 -0700 Subject: [PATCH 4/4] Fix Mattock not saving contents of Shulker Boxes when mined #2411. --- .../cyclic/item/equipment/MattockItem.java | 15 ++++----------- update.json | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/lothrazar/cyclic/item/equipment/MattockItem.java b/src/main/java/com/lothrazar/cyclic/item/equipment/MattockItem.java index 0d211111a..c996880ea 100644 --- a/src/main/java/com/lothrazar/cyclic/item/equipment/MattockItem.java +++ b/src/main/java/com/lothrazar/cyclic/item/equipment/MattockItem.java @@ -12,7 +12,6 @@ import net.minecraft.item.Items; import net.minecraft.item.ToolItem; import net.minecraft.network.play.server.SChangeBlockPacket; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -70,20 +69,14 @@ else if (sideHit == Direction.EAST || sideHit == Direction.WEST) { Block blockCurrent = bsCurrent.getBlock(); if (world.isRemote) { world.playEvent(2001, posCurrent, Block.getStateId(bsCurrent)); - if (blockCurrent.removedByPlayer(bsCurrent, world, posCurrent, player, true, bsCurrent.getFluidState())) { - blockCurrent.onPlayerDestroy(world, posCurrent, bsCurrent); - } - // stack.onBlockDestroyed(world, bsCurrent, posCurrent, player);//update tool damage } else if (player instanceof ServerPlayerEntity) { //Server side, so this works ServerPlayerEntity mp = (ServerPlayerEntity) player; - int xpGivenOnDrop = ForgeHooks.onBlockBreakEvent(world, ((ServerPlayerEntity) player).interactionManager.getGameType(), (ServerPlayerEntity) player, posCurrent); + int xpGivenOnDrop = ForgeHooks.onBlockBreakEvent(world, ((ServerPlayerEntity) player).interactionManager.getGameType(), mp, posCurrent); if (xpGivenOnDrop >= 0) { - if (blockCurrent.removedByPlayer(bsCurrent, world, posCurrent, player, true, bsCurrent.getFluidState()) - && world instanceof ServerWorld) { - TileEntity tile = world.getTileEntity(posCurrent); - blockCurrent.onPlayerDestroy(world, posCurrent, bsCurrent); - blockCurrent.harvestBlock(world, player, posCurrent, bsCurrent, tile, stack); + // blockCurrent.onPlayerDestroy(world, posCurrent, bsCurrent); + blockCurrent.harvestBlock(world, player, posCurrent, bsCurrent, world.getTileEntity(posCurrent), stack); + if (blockCurrent.removedByPlayer(bsCurrent, world, posCurrent, player, true, bsCurrent.getFluidState()) && world instanceof ServerWorld) { blockCurrent.dropXpOnBlockBreak((ServerWorld) world, posCurrent, xpGivenOnDrop); } mp.connection.sendPacket(new SChangeBlockPacket(world, posCurrent)); diff --git a/update.json b/update.json index aa4ee7933..f88a386c9 100644 --- a/update.json +++ b/update.json @@ -80,6 +80,6 @@ ,"1.5.21":"#1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node " ,"1.5.22":"Fix #2351 advanced crafting stick not opening. " ,"1.5.23":"Growth enchantment now uses the same logic as Sprinkler & Terra Soil (only minecraft:crops or minecraft::saplings can grow, respect IGrowable::canUseBonemeal). New gloomIgnored config Gloom enchant (cyclic:curse) to ignore and not use these effects #2217 #2325. Fix Soundproofing block not muting Mekanism sounds #2389 (for example Precision Sawmill and others - you may need four or more soundproofing blocks for the desired effect). Patch an edge-case where User might drop items on the ground. New config [cyclic.blocks.soundproofing] radius = 6 to control the area. Fix item cable routing #2245 #2230. New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions #1913. Balance recipe changes for #2372. Balance changes made for Excavate enchant it will no longer trigger if the tool is not 'mineable' effective for example axe on dirt. New feature for Excavate enchant #2116 it will not trigger on anything matching the block data-tag 'cyclic:ignored/excavate'. [Backported changes from mc1.20.1] #2182 candle model assets; Block Breaker no longer tries (and fails) to mine liquid source blocks; Block Randomizer use wireframe rendering only of non-air instead of solid shading; Glistering & Corrupted chorus only restores 1 food-unit down from 3; a few recipes tweaked/backported to match mc1.20.1+, ported crafttweaker zenscript support for generator_fluid and generator_item; backported item data tags for use in recipes for example forge:vines, forge:sandstone, forge:mushrooms " - ,"1.5.24":"Fixed bug in the item cyclic:offset_scepter #2427. Tweaked block model visuals of the Transfer Nodes" + ,"1.5.24":"Fixed bug in the item cyclic:offset_scepter #2427. Tweaked block model visuals of the Transfer Nodes. Fix Mattock not saving contents of Shulker Boxes when mined #2411. " } }