diff --git a/src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java b/src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java index bff04ed96..24af4be06 100644 --- a/src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java +++ b/src/main/java/net/mcreator/target/client/particle/BulletHoleParticle.java @@ -8,14 +8,14 @@ import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) public class BulletHoleParticle extends TextureSheetParticle { - public static BulltholeParticleProvider provider(SpriteSet spriteSet) { - return new BulltholeParticleProvider(spriteSet); + public static BulletholeParticleProvider provider(SpriteSet spriteSet) { + return new BulletholeParticleProvider(spriteSet); } - public static class BulltholeParticleProvider implements ParticleProvider { + public static class BulletholeParticleProvider implements ParticleProvider { private final SpriteSet spriteSet; - public BulltholeParticleProvider(SpriteSet spriteSet) { + public BulletholeParticleProvider(SpriteSet spriteSet) { this.spriteSet = spriteSet; } diff --git a/src/main/java/net/mcreator/target/client/particle/FireStarParticle.java b/src/main/java/net/mcreator/target/client/particle/FireStarParticle.java index 505abf392..7252e256f 100644 --- a/src/main/java/net/mcreator/target/client/particle/FireStarParticle.java +++ b/src/main/java/net/mcreator/target/client/particle/FireStarParticle.java @@ -8,14 +8,14 @@ import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) public class FireStarParticle extends TextureSheetParticle { - public static FirestarParticleProvider provider(SpriteSet spriteSet) { - return new FirestarParticleProvider(spriteSet); + public static FireStarParticleProvider provider(SpriteSet spriteSet) { + return new FireStarParticleProvider(spriteSet); } - public static class FirestarParticleProvider implements ParticleProvider { + public static class FireStarParticleProvider implements ParticleProvider { private final SpriteSet spriteSet; - public FirestarParticleProvider(SpriteSet spriteSet) { + public FireStarParticleProvider(SpriteSet spriteSet) { this.spriteSet = spriteSet; } diff --git a/src/main/java/net/mcreator/target/command/MediumExpCommand.java b/src/main/java/net/mcreator/target/command/MediumExpCommand.java index 176239c37..a68e57f97 100644 --- a/src/main/java/net/mcreator/target/command/MediumExpCommand.java +++ b/src/main/java/net/mcreator/target/command/MediumExpCommand.java @@ -43,7 +43,7 @@ public class MediumExpCommand { server.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, (y + 1), z), Vec2.ZERO, server, 4, "", Component.literal(""), server.getServer(), null).withSuppressedOutput(), "particle minecraft:campfire_cosy_smoke ~ ~ ~ 2 0.001 2 0.01 80 force"); server.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, (y + 1), z), Vec2.ZERO, server, 4, "", Component.literal(""), server.getServer(), null).withSuppressedOutput(), - "particle target:firestar ~ ~ ~ 0 0 0 0.2 80 force"); + "particle target:fire_star ~ ~ ~ 0 0 0 0.2 80 force"); } return 0; })); diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index 9b0cd18ca..f43eb6b4c 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -263,9 +263,9 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa if (this.beast) { serverLevel.sendParticles(ParticleTypes.END_ROD, location.x, location.y, location.z, 15, 0.1, 0.1, 0.1, 0.05); } else { - serverLevel.sendParticles(TargetModParticleTypes.BULLTHOLE.get(), location.x, location.y, location.z, 1, 0, 0, 0, 0); + serverLevel.sendParticles(TargetModParticleTypes.BULLET_HOLE.get(), location.x, location.y, location.z, 1, 0, 0, 0, 0); serverLevel.sendParticles(ParticleTypes.SMOKE, location.x, location.y, location.z, 3, 0, 0.1, 0, 0.01); - serverLevel.sendParticles(TargetModParticleTypes.BULLTHOLE.get(), location.x, location.y, location.z, 1, 0, 0, 0, 0); + serverLevel.sendParticles(TargetModParticleTypes.BULLET_HOLE.get(), location.x, location.y, location.z, 1, 0, 0, 0, 0); this.discard(); } diff --git a/src/main/java/net/mcreator/target/init/TargetModParticleTypes.java b/src/main/java/net/mcreator/target/init/TargetModParticleTypes.java index 3d8c30936..1b1d87fb9 100644 --- a/src/main/java/net/mcreator/target/init/TargetModParticleTypes.java +++ b/src/main/java/net/mcreator/target/init/TargetModParticleTypes.java @@ -9,7 +9,8 @@ import net.minecraftforge.registries.RegistryObject; public class TargetModParticleTypes { public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, TargetMod.MODID); - public static final RegistryObject FIRESTAR = REGISTRY.register("firestar", () -> new SimpleParticleType(false)); - public static final RegistryObject BULLTHOLE = REGISTRY.register("bullthole", () -> new SimpleParticleType(false)); + + public static final RegistryObject FIRE_STAR = REGISTRY.register("fire_star", () -> new SimpleParticleType(false)); + public static final RegistryObject BULLET_HOLE = REGISTRY.register("bullet_hole", () -> new SimpleParticleType(false)); } diff --git a/src/main/java/net/mcreator/target/init/TargetModParticles.java b/src/main/java/net/mcreator/target/init/TargetModParticles.java index 7e5f8b8ca..ae498354f 100644 --- a/src/main/java/net/mcreator/target/init/TargetModParticles.java +++ b/src/main/java/net/mcreator/target/init/TargetModParticles.java @@ -11,8 +11,8 @@ import net.minecraftforge.fml.common.Mod; public class TargetModParticles { @SubscribeEvent public static void registerParticles(RegisterParticleProvidersEvent event) { - event.registerSpriteSet(TargetModParticleTypes.FIRESTAR.get(), FireStarParticle::provider); - event.registerSpriteSet(TargetModParticleTypes.BULLTHOLE.get(), BulletHoleParticle::provider); + event.registerSpriteSet(TargetModParticleTypes.FIRE_STAR.get(), FireStarParticle::provider); + event.registerSpriteSet(TargetModParticleTypes.BULLET_HOLE.get(), BulletHoleParticle::provider); } } diff --git a/src/main/resources/assets/target/particles/bullet_hole.json b/src/main/resources/assets/target/particles/bullet_hole.json new file mode 100644 index 000000000..dd7acdd9d --- /dev/null +++ b/src/main/resources/assets/target/particles/bullet_hole.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "target:bullet_hole" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/target/particles/bullthole.json b/src/main/resources/assets/target/particles/bullthole.json deleted file mode 100644 index eede94ff1..000000000 --- a/src/main/resources/assets/target/particles/bullthole.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": [ - "target:bullthole" - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/target/particles/fire_star.json b/src/main/resources/assets/target/particles/fire_star.json new file mode 100644 index 000000000..cdfac76aa --- /dev/null +++ b/src/main/resources/assets/target/particles/fire_star.json @@ -0,0 +1,12 @@ +{ + "textures": [ + "target:fire_star_1", + "target:fire_star_2", + "target:fire_star_3", + "target:fire_star_4", + "target:fire_star_5", + "target:fire_star_6", + "target:fire_star_7", + "target:fire_star_8" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/target/particles/firestar.json b/src/main/resources/assets/target/particles/firestar.json deleted file mode 100644 index f957f7435..000000000 --- a/src/main/resources/assets/target/particles/firestar.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "textures": [ - "target:firestar_1", - "target:firestar_2", - "target:firestar_3", - "target:firestar_4", - "target:firestar_5", - "target:firestar_6", - "target:firestar_7", - "target:firestar_8" - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/target/textures/particle/bullthole.png b/src/main/resources/assets/target/textures/particle/bullthole.png deleted file mode 100644 index 25353b6c9..000000000 Binary files a/src/main/resources/assets/target/textures/particle/bullthole.png and /dev/null differ diff --git a/src/main/resources/assets/target/textures/particle/firestar.png b/src/main/resources/assets/target/textures/particle/fire_star.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar.png rename to src/main/resources/assets/target/textures/particle/fire_star.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_1.png b/src/main/resources/assets/target/textures/particle/fire_star_1.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_1.png rename to src/main/resources/assets/target/textures/particle/fire_star_1.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_2.png b/src/main/resources/assets/target/textures/particle/fire_star_2.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_2.png rename to src/main/resources/assets/target/textures/particle/fire_star_2.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_3.png b/src/main/resources/assets/target/textures/particle/fire_star_3.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_3.png rename to src/main/resources/assets/target/textures/particle/fire_star_3.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_4.png b/src/main/resources/assets/target/textures/particle/fire_star_4.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_4.png rename to src/main/resources/assets/target/textures/particle/fire_star_4.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_5.png b/src/main/resources/assets/target/textures/particle/fire_star_5.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_5.png rename to src/main/resources/assets/target/textures/particle/fire_star_5.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_6.png b/src/main/resources/assets/target/textures/particle/fire_star_6.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_6.png rename to src/main/resources/assets/target/textures/particle/fire_star_6.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_7.png b/src/main/resources/assets/target/textures/particle/fire_star_7.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_7.png rename to src/main/resources/assets/target/textures/particle/fire_star_7.png diff --git a/src/main/resources/assets/target/textures/particle/firestar_8.png b/src/main/resources/assets/target/textures/particle/fire_star_8.png similarity index 100% rename from src/main/resources/assets/target/textures/particle/firestar_8.png rename to src/main/resources/assets/target/textures/particle/fire_star_8.png