Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/net/modfest/fireblanket/Fireblanket.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ public class Fireblanket implements ModInitializer {
.category(GameRuleCategory.PLAYER)
.buildAndRegister(FireblanketConstants.id("adventure_wind_charge_interaction"));

public static final GameRule<Boolean> ALLOW_TRIGGER_EXPLOSIONS =
GameRuleBuilder.forBoolean(false)
.category(GameRuleCategory.MISC)
.buildAndRegister(FireblanketConstants.id("allow_trigger_explosions"));

public static final Logger LOGGER = LoggerFactory.getLogger("Fireblanket");

public record QueuedPacket(Connection conn, Packet<?> packet, ChannelFutureListener listener) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
package net.modfest.fireblanket.mixin.adventure_fix;

import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.Explosion;
import net.minecraft.world.level.GameType;
import net.minecraft.world.level.ServerExplosion;
import net.modfest.fireblanket.Fireblanket;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

/**
* @author Ampflower
**/
@Mixin(ServerExplosion.class)
public abstract class MixinServerExplosion implements Explosion {
@Shadow
@Final
private ServerLevel level;

@ModifyReturnValue(method = "canTriggerBlocks", at = @At("RETURN"))
private boolean modifyReturn(final boolean original) {
if (original && !this.level.getGameRules().get(Fireblanket.ALLOW_TRIGGER_EXPLOSIONS)) {
return false;
}

if (original && this.getIndirectSourceEntity() instanceof ServerPlayer player) {
return player.gameMode() != GameType.ADVENTURE
|| this.level().getGameRules().get(Fireblanket.ADVENTURE_WIND_CHARGE_INTERACTION);
|| this.level.getGameRules().get(Fireblanket.ADVENTURE_WIND_CHARGE_INTERACTION);
}

return original;
}
}
2 changes: 2 additions & 0 deletions src/main/resources/assets/fireblanket/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"gamerule.fireblanket.lightning_broadcast_radius.description": "How far in blocks players will receive lightning strikes from in-game. Set to 0 to effectively disable broadcasting.",
"gamerule.fireblanket.adventure_wind_charge_interaction": "Wind charges interaction in Adventure",
"gamerule.fireblanket.adventure_wind_charge_interaction.description": "Whether wind charges interact with blocks in adventure.",
"gamerule.fireblanket.allow_trigger_explosions": "Allow trigger explosions",
"gamerule.fireblanket.allow_trigger_explosions.description": "Whether trigger explosions (such as those from wind charges) can happen",
"commands.gamerule.locked": "You do not have permission to modify this gamerule",
"commandsBlock.commandSetByPlayer": "%s set the command at (%s) to: %s",
"fireblanket.fsc.broken": "[Fireblanket] Despite relevant mixins being disabled or broken, we're still requesting FSC?",
Expand Down
Loading