Add block explode event & fix exploded blocks change method #3990

AyhamAl-Ali · 2021-05-12T06:25:53Z

Description

This PR adds BlockExplodeEvent that is also triggered by create explosion effect (Added support for it to Explosion Yield Expr and Exploded Blocks Expr)
Also, this PR fixes changing method of exploded blocks to allow all kind of changes to it such as:

on block explode:
	add blocks in radius 2 around event-location to exploded blocks
	set exploded blocks to blocks in radius 2 around event-location
	remove blocks in radius 2 around event-location from exploded blocks
	remove chest from exploded blocks # Removes 1 block that matches a chest block type from exploded blocks
	remove all sand from exploded blocks # Removes all blocks that matches a sand block type
	loop exploded blocks:
		loop-block is sand
		remove loop-block from exploded blocks

Target Minecraft Versions: All
Requirements: None
Related Issues: #3759

- Add block explode event - Fix exploded blocks change method to allow all kind of changing to it

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java

…into feature/block-explode-evt

FranKusmiruk

What do you think about merging the two events into a single SkriptEvent like on [(entity|block)] explode? This event would trigger for both entity and block explosions if not especified in the pattern. You'd also need to create an expression like (explosion cause|detonator) which would return either an Entity or a Block depending on the event.

Also, make sure to implement the Expression#iterator method on ExprExplodedBlocks, this way users can be allowed to delete the looped value in loops.

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

AyhamAl-Ali · 2021-05-12T13:29:14Z

Sure, I will do all that tonight (or maybe next month 🤔 my bad got so busy lately)

- Merging entity and block explosions - Added `explosion cause` that will return a string value ("block" or "entity") - Improved exploded blocks expression - Added a method suggested by Snow-Pyon for later use

src/main/java/ch/njol/skript/events/EvtExplode.java

src/main/java/ch/njol/skript/util/Utils.java

src/main/java/ch/njol/skript/events/EvtExplode.java

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java

src/main/java/ch/njol/skript/util/Utils.java

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java

src/main/java/ch/njol/skript/events/EvtExplode.java

NOTE: getReturnType() of explosion cause is Object.class, if that could cause an issue and get() method is called before getReturnType() then I might be able to set isEntity in get() method and use it in getReturnType() method

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java

src/main/java/ch/njol/skript/events/EvtExplode.java

src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java

src/main/java/ch/njol/skript/events/EvtExplode.java

src/main/java/ch/njol/skript/util/Utils.java

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

@TPGamesNL

Many thanks to @TPGamesNL for helping me understanding the issue and fixing it for me

src/main/java/ch/njol/skript/events/EvtExplode.java

TPGamesNL · 2022-06-30T15:09:46Z

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

+
+	@Override
+	@Nullable
+	public Iterator<? extends Block> iterator(Event e) {


Is overriding iterator necessary here?

TPGamesNL · 2022-06-30T15:10:16Z

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

+	}
+
+	@Override
+	public @Nullable <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {


What's the reason behind this method? If there is one, write a comment in the code for, otherwise remove it

TPGamesNL · 2022-06-30T15:12:02Z

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

+	}
+
+	@Override
+	public void change(Event e, final @Nullable Object[] delta, final ChangeMode mode) {


Suggested change

public void change(Event e, final @Nullable Object[] delta, final ChangeMode mode) {

public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {

TPGamesNL · 2022-06-30T15:18:23Z

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java

+							break;
+						} else if (amount > 0)
+							for (Block b : new ArrayList<>(blocks)) {
+								if (amountRemoved >= amount)


What would happen when you use remove 5 dirt and 2 stone from exploded blocks? Looks like it'll not remove any stone, but could be wrong

TPGamesNL · 2022-06-30T15:18:38Z

src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java

-		if (!getParser().isCurrentEvent(EntityExplodeEvent.class)) {
-			Skript.error("The 'explosion block yield' is only usable in an explosion event", ErrorQuality.SEMANTIC_ERROR);
+		if (!getParser().isCurrentEvent(BlockExplodeEvent.class, EntityExplodeEvent.class)) {
+			Skript.error("Explosion block yield can only be retrieved from an explode event.");


Suggested change

Skript.error("Explosion block yield can only be retrieved from an explode event.");

Skript.error("Explosion block yield can only be retrieved from an explode event");

TPGamesNL · 2022-06-30T15:21:17Z

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java

+	@Override
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	public @Nullable <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {


Suggested change

@Override

@SuppressWarnings({"unchecked", "rawtypes"})

public @Nullable <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {

@Override

@Nullable

@SuppressWarnings({"unchecked", "rawtypes"})

public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {

Can you add a comment to this method for why it's here?

TPGamesNL · 2022-06-30T15:26:13Z

src/main/java/ch/njol/util/coll/CollectionUtils.java

+	 * @param filter the {@link Predicate} / filter that will be checked to remove the elements
+	 * @return amount of elements that matched the filter and have been removed.
+	 */
+	public <E> int removeFirstIf(Collection<E> coll, int n, Predicate<E> filter) {


This method is not used with the current version of this PR. If you think it can still be useful in the future, it's fine to keep it, but otherwise change the first arg from a Collection to a List, as a collection isn't ordered, and therefore the first n elements doesn't make sense for all collections.

TPGamesNL · 2022-06-30T15:28:12Z

src/main/java/ch/njol/util/coll/CollectionUtils.java

+
+		for (; each.hasNext() && n > 0; n--) {
+			if (filter.test(each.next())) {
+				each.remove();


Iterator#remove is an optional operation, it is not guaranteed to be available. You should probably switch to removing from the collection directly.

Co-authored-by: TPGamesNL <29547183+TPGamesNL@users.noreply.github.com>

AyhamAl-Ali · 2023-09-13T22:42:31Z

Coming Back Soon 🚀

AyhamAl-Ali added 3 commits May 12, 2021 09:10

Add block explode event & fix exploded blocks change method

3c2a866

- Add block explode event - Fix exploded blocks change method to allow all kind of changing to it

Improve error message

6462433

Merge branch 'master' into feature/block-explode-evt

f84e19e

TPGamesNL reviewed May 12, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java Outdated Show resolved Hide resolved

TPGamesNL reviewed May 12, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java Outdated Show resolved Hide resolved

TPGamesNL reviewed May 12, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java Outdated Show resolved Hide resolved

TPGamesNL reviewed May 12, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java Outdated Show resolved Hide resolved

TPGamesNL reviewed May 12, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java Outdated Show resolved Hide resolved

AyhamAl-Ali added 2 commits May 12, 2021 10:39

Code Improvements

e3facc2

Merge remote-tracking branch 'AyhamAl-Ali/feature/block-explode-evt' …

3d77ac9

…into feature/block-explode-evt

FranKusmiruk suggested changes May 12, 2021

View reviewed changes

TPGamesNL added 2.6 feature Pull request adding a new feature. labels May 12, 2021

AyhamAl-Ali mentioned this pull request May 22, 2021

on explode doesn't run when "create explosion" effect #4014

Closed

AyhamAl-Ali added 3 commits June 30, 2021 14:13

Merge branch 'master' into feature/block-explode-evt

353d79b

Requested changes

9bdd682

- Merging entity and block explosions - Added `explosion cause` that will return a string value ("block" or "entity") - Improved exploded blocks expression - Added a method suggested by Snow-Pyon for later use

Merge branch 'master' into feature/block-explode-evt

96739ed

AyhamAl-Ali requested a review from FranKusmiruk June 30, 2021 16:38

Pikachu920 requested changes Jun 30, 2021

View reviewed changes

src/main/java/ch/njol/skript/events/EvtExplode.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/util/Utils.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/util/Utils.java Outdated Show resolved Hide resolved

AyhamAl-Ali added 2 commits July 1, 2021 20:15

Changes as requested

2bea7cc

Merge branch 'master' into feature/block-explode-evt

6f079df

TPGamesNL requested changes Jul 1, 2021

View reviewed changes

Changes as requested

4609a81

TPGamesNL reviewed Jul 2, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java Outdated Show resolved Hide resolved

TPGamesNL requested changes Jul 2, 2021

View reviewed changes

src/main/java/ch/njol/skript/events/EvtExplode.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/events/EvtExplode.java Outdated Show resolved Hide resolved

Changes as requested

a3532c2

NOTE: getReturnType() of explosion cause is Object.class, if that could cause an issue and get() method is called before getReturnType() then I might be able to set isEntity in get() method and use it in getReturnType() method

FranKusmiruk suggested changes Jul 7, 2021

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprExplosionCause.java Outdated Show resolved Hide resolved

TPGamesNL mentioned this pull request Jul 16, 2021

Allow SkriptEvent to specify Event classes for ParserInstance #4195

Merged

Merge branch 'master' into feature/block-explode-evt

4d3a426

AyhamAl-Ali requested a review from TPGamesNL October 31, 2021 20:54

TPGamesNL requested changes Nov 1, 2021

View reviewed changes

AyhamAl-Ali added 3 commits January 19, 2022 19:43

Merge branch 'master' into feature/block-explode-evt

7954ac8

Update Files

474cf6c

Fix return type of ExprExplosionCause

5560a7b

Many thanks to @TPGamesNL for helping me understanding the issue and fixing it for me

AyhamAl-Ali requested a review from TPGamesNL January 21, 2022 13:32

Merge branch 'master' into feature/block-explode-evt

6c1a3ad

AyhamAl-Ali mentioned this pull request Apr 12, 2022

Respawn Anchor support. #4726

Closed

1 task

Merge branch 'master' into feature/block-explode-evt

81aa67e

APickledWalrus removed the 2.6 label Jun 10, 2022

TPGamesNL requested changes Jun 30, 2022

View reviewed changes

TheLimeGlass requested a review from Pikachu920 October 26, 2022 10:15

Update src/main/java/ch/njol/skript/events/EvtExplode.java

b7fdfb4

Co-authored-by: TPGamesNL <29547183+TPGamesNL@users.noreply.github.com>

AyhamAl-Ali mentioned this pull request Feb 18, 2023

Falling blocks death #5429

Closed

1 task

AyhamAl-Ali marked this pull request as draft April 22, 2023 00:04

AyhamAl-Ali added the bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. label Apr 22, 2023

sovdeeth mentioned this pull request Apr 23, 2023

Respawn anchor and bed explosions don't trigger on explode event. #5632

Closed

1 task

Moderocky force-pushed the master branch 2 times, most recently from bd134d0 to 3f08853 Compare September 16, 2023 16:59

Fusezion mentioned this pull request May 6, 2024

ExprExplodedBlocks - fix not being able to remove #6655

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add block explode event & fix exploded blocks change method #3990

Add block explode event & fix exploded blocks change method #3990

AyhamAl-Ali commented May 12, 2021 •

edited

Loading

FranKusmiruk left a comment •

edited

Loading

AyhamAl-Ali commented May 12, 2021 •

edited

Loading

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

TPGamesNL Jun 30, 2022

AyhamAl-Ali commented Sep 13, 2023

	public void change(Event e, final @Nullable Object[] delta, final ChangeMode mode) {
	public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {

	Skript.error("Explosion block yield can only be retrieved from an explode event.");
	Skript.error("Explosion block yield can only be retrieved from an explode event");

Add block explode event & fix exploded blocks change method #3990

Are you sure you want to change the base?

Add block explode event & fix exploded blocks change method #3990

Conversation

AyhamAl-Ali commented May 12, 2021 • edited Loading

Description

FranKusmiruk left a comment • edited Loading

Choose a reason for hiding this comment

AyhamAl-Ali commented May 12, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AyhamAl-Ali commented Sep 13, 2023

AyhamAl-Ali commented May 12, 2021 •

edited

Loading

FranKusmiruk left a comment •

edited

Loading

AyhamAl-Ali commented May 12, 2021 •

edited

Loading