From de887142778782a890f932c818f60e8473835a41 Mon Sep 17 00:00:00 2001 From: fonnymunkey Date: Wed, 2 Oct 2024 02:58:48 -0400 Subject: [PATCH] Add handling for dumb vanilla particle change, remove extra texture, fix missing hat --- .../simplehats/client/hat/HatLayer.java | 12 +++++++++++- .../simplehats/common/init/ModRegistry.java | 1 + .../fonnymunkey/simplehats/util/HatEntry.java | 13 ++++--------- .../simplehats/textures/item/hats/rgbtophat.png | Bin 8013 -> 0 bytes .../textures/item/hats/rgbtophat.png.mcmeta | 10 ---------- .../textures/item/hats/rgbtophat_e.png | Bin 8013 -> 0 bytes .../textures/item/hats/rgbtophat_e.png.mcmeta | 10 ---------- 7 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png delete mode 100644 src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png.mcmeta delete mode 100644 src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png delete mode 100644 src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png.mcmeta diff --git a/src/main/java/fonnymunkey/simplehats/client/hat/HatLayer.java b/src/main/java/fonnymunkey/simplehats/client/hat/HatLayer.java index cd2a5b8..b44d754 100644 --- a/src/main/java/fonnymunkey/simplehats/client/hat/HatLayer.java +++ b/src/main/java/fonnymunkey/simplehats/client/hat/HatLayer.java @@ -18,6 +18,10 @@ import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.particle.EntityEffectParticleEffect; +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.ParticleType; +import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.RotationAxis; public class HatLayer & ModelWithHead> extends FeatureRenderer { @@ -72,7 +76,13 @@ private void render(ItemStack itemStack, MatrixStack poseStack, VertexConsumerPr case TRAILING_FEET -> livingEntity.getY()+0.25; case TRAILING_FULL -> livingEntity.getRandomBodyY(); }; - livingEntity.getWorld().addParticle(particleSettings.getParticleType(), livingEntity.getX() + livingEntity.getRandom().nextFloat() - 0.5, y, livingEntity.getZ() + livingEntity.getRandom().nextFloat() - 0.5, d0, d1,d2); + ParticleType particleType = particleSettings.getParticleType(); + if(particleType instanceof ParticleEffect particleEffect) { + livingEntity.getWorld().addParticle(particleEffect, livingEntity.getX() + livingEntity.getRandom().nextFloat() - 0.5, y, livingEntity.getZ() + livingEntity.getRandom().nextFloat() - 0.5, d0, d1,d2); + } + else if(particleType == ParticleTypes.ENTITY_EFFECT) { + livingEntity.getWorld().addParticle(EntityEffectParticleEffect.create(ParticleTypes.ENTITY_EFFECT, livingEntity.getRandom().nextFloat(), livingEntity.getRandom().nextFloat(), livingEntity.getRandom().nextFloat()), livingEntity.getX() + livingEntity.getRandom().nextFloat() - 0.5, y, livingEntity.getZ() + livingEntity.getRandom().nextFloat() - 0.5, d0, d1,d2); + } } } } diff --git a/src/main/java/fonnymunkey/simplehats/common/init/ModRegistry.java b/src/main/java/fonnymunkey/simplehats/common/init/ModRegistry.java index 9978d0e..a15231a 100644 --- a/src/main/java/fonnymunkey/simplehats/common/init/ModRegistry.java +++ b/src/main/java/fonnymunkey/simplehats/common/init/ModRegistry.java @@ -58,6 +58,7 @@ public class ModRegistry { public static final HatItem HATSPECIAL = Registry.register(Registries.ITEM, Identifier.of(SimpleHats.modId, "special"), new HatItem(new HatEntry("special", Rarity.EPIC, 0))); public static void registerHats() { + ModRegistry.hatList.add(HATSPECIAL); for(HatEntry entry : HatJson.getHatList()) { HatItem hat = entry.getHatDyeSettings().getUseDye() ? new HatItemDyeable(entry) : new HatItem(entry); hat = Registry.register(Registries.ITEM, Identifier.of(SimpleHats.modId, entry.getHatName()), hat); diff --git a/src/main/java/fonnymunkey/simplehats/util/HatEntry.java b/src/main/java/fonnymunkey/simplehats/util/HatEntry.java index 4ff89b8..734d72c 100644 --- a/src/main/java/fonnymunkey/simplehats/util/HatEntry.java +++ b/src/main/java/fonnymunkey/simplehats/util/HatEntry.java @@ -2,8 +2,7 @@ import com.google.gson.annotations.SerializedName; import fonnymunkey.simplehats.SimpleHats; -import net.minecraft.particle.ParticleTypes; -import net.minecraft.particle.SimpleParticleType; +import net.minecraft.particle.*; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; @@ -132,7 +131,7 @@ public static class HatParticleSettings { @SerializedName("movement") private HatParticleMovement particleMovement; - private transient SimpleParticleType particleTypeParsed = ParticleTypes.HEART; + private transient ParticleType particleTypeParsed = ParticleTypes.HEART; public HatParticleSettings(boolean useParticle, String particleTypeString, float particleFrequency, HatParticleMovement particleMovement) { this.useParticle = useParticle; @@ -144,7 +143,7 @@ public HatParticleSettings(boolean useParticle, String particleTypeString, float public boolean getUseParticles() { return this.useParticle; } - public SimpleParticleType getParticleType() { return this.particleTypeParsed; } + public ParticleType getParticleType() { return this.particleTypeParsed; } public float getParticleFrequency() { return this.particleFrequency; } @@ -158,11 +157,7 @@ public void validateParticleSettings() { } private void parseParticleString() { - var particleType = Registries.PARTICLE_TYPE.get(Identifier.tryParse(this.particleTypeString)); - - if (particleType instanceof SimpleParticleType simpleParticleType) { - this.particleTypeParsed = simpleParticleType; - } + this.particleTypeParsed = Registries.PARTICLE_TYPE.get(Identifier.tryParse(this.particleTypeString)); if(this.particleTypeParsed == null) { SimpleHats.logger.log(Level.ERROR, "Particle type \"" + this.particleTypeString + "\" failed to parse, setting default."); diff --git a/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png b/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png deleted file mode 100644 index 0fba4645723a2b540915b1aa830da6ab2895f827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8013 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 diff --git a/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png.mcmeta b/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png.mcmeta deleted file mode 100644 index 42ef91b..0000000 --- a/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 3, - "frames" :[ - 0, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png b/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png deleted file mode 100644 index 0fba4645723a2b540915b1aa830da6ab2895f827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8013 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 diff --git a/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png.mcmeta b/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png.mcmeta deleted file mode 100644 index 42ef91b..0000000 --- a/src/main/resources/assets/simplehats/textures/item/hats/rgbtophat_e.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 3, - "frames" :[ - 0, - 1 - ] - } -} \ No newline at end of file