Skip to content

Commit f344e82

Browse files
committed
Allow block Flash
Unclear why this was special cased?
1 parent 3d0f100 commit f344e82

2 files changed

Lines changed: 1 addition & 18 deletions

File tree

src/main/java/meteordevelopment/meteorclient/gui/screens/settings/ParticleTypeListSettingScreen.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import meteordevelopment.meteorclient.settings.Setting;
1212
import meteordevelopment.meteorclient.utils.misc.Names;
1313
import net.minecraft.core.particles.ParticleType;
14-
import net.minecraft.core.particles.ParticleTypes;
1514
import net.minecraft.core.registries.BuiltInRegistries;
1615

1716
import java.util.List;
@@ -21,11 +20,6 @@ public ParticleTypeListSettingScreen(GuiTheme theme, Setting<List<ParticleType<?
2120
super(theme, "Select Particles", setting, setting.get(), BuiltInRegistries.PARTICLE_TYPE);
2221
}
2322

24-
@Override
25-
protected boolean includeValue(ParticleType<?> value) {
26-
return value != ParticleTypes.FLASH;
27-
}
28-
2923
@Override
3024
protected WWidget getValueWidget(ParticleType<?> value) {
3125
return theme.label(Names.get(value));

src/main/java/meteordevelopment/meteorclient/mixin/ParticleEngineMixin.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,17 @@
1010
import net.minecraft.client.particle.Particle;
1111
import net.minecraft.client.particle.ParticleEngine;
1212
import net.minecraft.core.particles.ParticleOptions;
13-
import net.minecraft.core.particles.ParticleTypes;
14-
import org.jetbrains.annotations.Nullable;
1513
import org.spongepowered.asm.mixin.Mixin;
16-
import org.spongepowered.asm.mixin.Shadow;
1714
import org.spongepowered.asm.mixin.injection.At;
1815
import org.spongepowered.asm.mixin.injection.Inject;
1916
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
2017

2118
@Mixin(ParticleEngine.class)
2219
public abstract class ParticleEngineMixin {
23-
@Shadow
24-
@Nullable
25-
protected abstract <T extends ParticleOptions> Particle makeParticle(T options, double x, double y, double z, double xa, double ya, double za);
26-
2720
@Inject(method = "createParticle(Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)Lnet/minecraft/client/particle/Particle;", at = @At("HEAD"), cancellable = true)
2821
private void onCreateParticle(ParticleOptions options, double x, double y, double z, double xa, double ya, double za, CallbackInfoReturnable<Particle> cir) {
2922
ParticleEvent event = MeteorClient.EVENT_BUS.post(ParticleEvent.get(options));
3023

31-
if (event.isCancelled()) {
32-
if (options.getType() == ParticleTypes.FLASH)
33-
cir.setReturnValue(makeParticle(options, x, y, z, xa, ya, za));
34-
else cir.cancel();
35-
}
24+
if (event.isCancelled()) cir.cancel();
3625
}
3726
}

0 commit comments

Comments
 (0)