Added custom totem particles & translation keys

.gitignore

@@ -38,3 +38,7 @@ hs_err_*.log
 replay_*.log
 *.hprof
 *.jfr
+
+# custom
+
+src/main/generated/.cache

src/main/generated/.cache/8770c6a8ac8d2755ede4a837ea5efd88d1bc224a

@@ -1,4 +1,4 @@
-// 1.20.4	2024-04-29T14:58:41.4604677	JoyMod/Tags for minecraft:block
+// 1.20.4	2024-04-29T19:51:59.8040029	JoyMod/Tags for minecraft:block
 9acbaf32e18e27b6a6202af8cedb528c27df34bf data\minecraft\tags\blocks\candles.json
 9af5bacfe025cd906e6e30ed372a86c2d3f322f5 data\minecraft\tags\blocks\candle_cakes.json
 f3ab575d702492b1e267f7328e3bdcb971a7216f data\minecraft\tags\blocks\beds.json

src/main/generated/.cache/bfa73bf4889c7f67ea3b0c947a1e1b64e07ab40e

@@ -1,4 +1,4 @@
-// 1.20.4	2024-04-29T14:58:41.4574672	JoyMod/Model Definitions
+// 1.20.4	2024-04-29T19:51:59.802003	JoyMod/Model Definitions
 4dd6434ec1ac811113197632eb04c55cc19c6833 assets\joymod\models\item\bigender_candle.json
 74845f73cdcbc1f88b2258acc458af8b1da1f19c assets\joymod\models\item\gender_fluid_candle_cake.json
 c90617289caecc5b637d2ced05b24791b6a664ad assets\joymod\models\block\mlm_candle_two_candles.json
@@ -191,9 +191,9 @@ f1de6696858b1b0dac2c7b053363a66cf6e8ba14 assets\joymod\models\block\progress_can
 80b846496b132e036f542da01b9aa3d0560c9cac assets\joymod\models\block\gender_fluid_candle_two_candles_lit.json
 da4d7390d3d5dc11e9bb5dc2a63c8180aa5a9920 assets\joymod\models\block\trans_candle_one_candle.json
 c76e66bad32f48d065d53f6569d8cd4fbf6833a7 assets\joymod\models\block\bisexual_candle_four_candles_lit.json
-7f497a1c76d34fada5a73b6f8f6dee71b305bde1 assets\joymod\models\block\pan_candle_three_candles_lit.json
 daeeb94b70483d72811c6fb5bf148f425749431d assets\joymod\models\block\progress_candle_one_candle_lit.json
 42789bce7e3c35ccc8f6b2104bb12a40f3c734e2 assets\joymod\models\block\aroace_candle_cake_lit.json
+7f497a1c76d34fada5a73b6f8f6dee71b305bde1 assets\joymod\models\block\pan_candle_three_candles_lit.json
 d3d40864c36e76daa49c2cb2bd2befb074595f68 assets\joymod\models\block\pan_candle_four_candles.json
 0ab67a490cde483ee1c2f1a6c9ea462f9da0e751 assets\joymod\models\block\mlm_candle_one_candle_lit.json
 783018a4960f15829ac8c88972f15e755ed0fc49 assets\joymod\models\item\aplatonic_candle_cake.json

src/main/generated/.cache/c959e30059f722adb5722193aa70d0ecb1fcff00

@@ -1 +1 @@
-// 1.20.4	2024-04-29T14:58:41.4574672	JoyMod/Block Loot Tables
+// 1.20.4	2024-04-29T19:51:59.802003	JoyMod/Block Loot Tables

src/main/generated/.cache/e0bd7ee43f62e84afa180a329325789ff8bff380

@@ -1 +1 @@
-// 1.20.4	2024-04-29T14:58:41.4614674	JoyMod/Tags for minecraft:item
+// 1.20.4	2024-04-29T19:51:59.8040029	JoyMod/Tags for minecraft:item

src/main/generated/.cache/e1807a75e2c01637cc0474d02a1113bb183d1dcc

@@ -1 +1 @@
-// 1.20.4	2024-04-29T14:58:41.456468	JoyMod/Recipes
+// 1.20.4	2024-04-29T19:51:59.8010029	JoyMod/Recipes

src/main/java/gay/pridecraft/joymod/JoyMod.java

@@ -5,6 +5,7 @@ import gay.pridecraft.joymod.block.ModBlocks;
 import gay.pridecraft.joymod.item.ModItemGroups;
 import gay.pridecraft.joymod.item.ModItems;
 import gay.pridecraft.joymod.painting.ModPaintings;
+import gay.pridecraft.joymod.particle.ModParticles;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
 import net.minecraft.entity.attribute.EntityAttributes;
@@ -18,11 +19,13 @@ public class JoyMod implements ModInitializer {
 
     @Override
     public void onInitialize() {
+        ModParticles.registerParticles();
         ModItemGroups.registerItemGroups();
         ModItems.registerModItems();
         ModBlocks.registerModBlocks();
         ModEntities.registerBlockEntities();
         ModPaintings.registerPaintings();
+
         registerEntityAttributes();
     }
 

src/main/java/gay/pridecraft/joymod/JoyModClient.java

@@ -2,11 +2,13 @@ package gay.pridecraft.joymod;
 
 import gay.pridecraft.joymod.entity.ModEntities;
 import gay.pridecraft.joymod.block.ModBlocks;
-import gay.pridecraft.joymod.renderer.*;
+import gay.pridecraft.joymod.particle.ModParticles;
+import gay.pridecraft.joymod.particle.TotemOfPrideParticle;
 import gay.pridecraft.joymod.renderer.entity.*;
 import gay.pridecraft.joymod.renderer.feature.CustomElytraFeatureRenderer;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback;
 import net.minecraft.client.render.RenderLayer;
@@ -16,7 +18,7 @@ import net.minecraft.util.Identifier;
 public class JoyModClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        BlockEntityRendererFactories.register(ModEntities.CUSTOM_BED_BLOCK_ENTITY, CustomBedBlockEntityRenderer::new);
+        BlockEntityRendererFactories.register(ModEntities.CUSTOM_BED_BLOCK_ENTITY, CustomBedBlockRenderer::new);
 
         registerBedBlockRenderLayers();
         registerEntityRenderers();
@@ -25,6 +27,8 @@ public class JoyModClient implements ClientModInitializer {
             Identifier elytra = new Identifier("minecraft:textures/entity/elytra.png");
             registrationHelper.register(new CustomElytraFeatureRenderer<>(entityRenderer, context.getModelLoader(), elytra));
         });
+
+        ParticleFactoryRegistry.getInstance().register(ModParticles.TOTEM_OF_PRIDE_PARTICLE, TotemOfPrideParticle.Factory::new);
     }
 
     private static void registerBedBlockRenderLayers() {

src/main/java/gay/pridecraft/joymod/item/ModItemGroups.java

@@ -15,7 +15,7 @@ public class ModItemGroups {
     public static final ItemGroup JOYMOD_GROUP = Registry.register(Registries.ITEM_GROUP,
             new Identifier(JoyMod.MOD_ID, "joymod"),
             FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joymod_group"))
-                    .icon(() -> new ItemStack(ModBlocks.GAY_BED)).entries((displayContext, entries) -> {
+                    .icon(() -> new ItemStack(ModItems.PRIDE_BRUSH)).entries((displayContext, entries) -> {
 
                         entries.add(ModBlocks.GAY_BED);
                         entries.add(ModBlocks.ENBY_BED);

src/main/java/gay/pridecraft/joymod/mixin/ClientPlayNetworkHandlerMixin.java

@@ -1,25 +1,73 @@
 package gay.pridecraft.joymod.mixin;
 
 import gay.pridecraft.joymod.item.ModItems;
+import gay.pridecraft.joymod.particle.ModParticles;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Hand;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientPlayNetworkHandler.class)
-public class ClientPlayNetworkHandlerMixin {
+public abstract class ClientPlayNetworkHandlerMixin {
+
+    @Shadow
+    public abstract ClientWorld getWorld();
 
     @Inject(at = @At("HEAD"), method = "getActiveTotemOfUndying", cancellable = true)
     private static void modifyTotemOfUndyingAnimation(PlayerEntity player, CallbackInfoReturnable<ItemStack> cir) {
-        for(Hand hand : Hand.values()) {
+        for (Hand hand : Hand.values()) {
             ItemStack itemStack = player.getStackInHand(hand);
             if (itemStack.isOf(ModItems.TOTEM_OF_PRIDE)) {
                 cir.setReturnValue(itemStack);
             }
         }
     }
+
+    @Unique
+    private static ItemStack modifyTotem(PlayerEntity player) {
+        for (Hand hand : Hand.values()) {
+            ItemStack itemStack = player.getStackInHand(hand);
+            if (itemStack.isOf(ModItems.TOTEM_OF_PRIDE)) {
+                return itemStack;
+            }
+        }
+
+        return null;
+    }
+
+    @Inject(at = @At("HEAD"), method = "onEntityStatus")
+    private void onCustomEntityStatus(EntityStatusS2CPacket packet, CallbackInfo ci) {
+        if (this.getWorld() != null) {
+            Entity entity = packet.getEntity(this.getWorld());
+            if (entity != null) {
+                int status = packet.getStatus();
+                if (status == 36) {
+                    MinecraftClient.getInstance().particleManager.addEmitter(entity, ModParticles.TOTEM_OF_PRIDE_PARTICLE, 30);
+                    playSound(entity);
+                    if (entity == MinecraftClient.getInstance().player) {
+                        MinecraftClient.getInstance().gameRenderer.showFloatingItem(modifyTotem(MinecraftClient.getInstance().player));
+                    }
+                }
+            }
+        }
+    }
+
+    @Unique
+    private void playSound(Entity entity) {
+        if (MinecraftClient.getInstance().world != null) {
+            MinecraftClient.getInstance().world.playSound(entity.getX(), entity.getY(), entity.getZ(), SoundEvents.ITEM_TOTEM_USE, entity.getSoundCategory(), 1.0F, 1.0F, false);
+        }
+    }
 }

src/main/java/gay/pridecraft/joymod/mixin/LivingEntityMixin.java

@@ -33,10 +33,10 @@ public abstract class LivingEntityMixin extends Entity {
 
     @Inject(at = @At("HEAD"), method = "tryUseTotem", cancellable = true)
     public void useCustomTotem(DamageSource damageSource, CallbackInfoReturnable<Boolean> callback) {
-        LivingEntityMixin entity = this;
+        Entity entity = this;
 
-        ItemStack offhandStack = entity.getStackInHand(Hand.OFF_HAND);
-        ItemStack mainhandStack = entity.getStackInHand(Hand.MAIN_HAND);
+        ItemStack offhandStack = ((LivingEntityMixin) entity).getStackInHand(Hand.OFF_HAND);
+        ItemStack mainhandStack = ((LivingEntityMixin) entity).getStackInHand(Hand.MAIN_HAND);
 
         if (offhandStack.isOf(ModItems.TOTEM_OF_PRIDE) || mainhandStack.isOf(ModItems.TOTEM_OF_PRIDE)) {
                 if (offhandStack.isOf(ModItems.TOTEM_OF_PRIDE)) {
@@ -47,12 +47,13 @@ public abstract class LivingEntityMixin extends Entity {
 
                 this.setHealth(1.0F);
                 this.clearStatusEffects();
-                this.addStatusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 125, 2));
-                this.addStatusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 350, 4));
-                this.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 100, 2));
-                this.getWorld().sendEntityStatus(entity, (byte) 35);
+                this.addStatusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 45 * 20, 1));
+                this.addStatusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 40 * 20, 0));
+                this.addStatusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 5 * 20, 1));
 
-                callback.setReturnValue(true);
+                this.getWorld().sendEntityStatus(entity, (byte) 36);
+
+            callback.setReturnValue(true);
         }
     }
 }

src/main/java/gay/pridecraft/joymod/particle/ModParticles.java

@@ -0,0 +1,17 @@
+package gay.pridecraft.joymod.particle;
+
+import gay.pridecraft.joymod.JoyMod;
+import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+
+public class ModParticles {
+    public static final DefaultParticleType TOTEM_OF_PRIDE_PARTICLE = FabricParticleTypes.simple();
+
+    public static void registerParticles() {
+        Registry.register(Registries.PARTICLE_TYPE, new Identifier(JoyMod.MOD_ID, "totem_of_pride_particle"),
+                TOTEM_OF_PRIDE_PARTICLE);
+    }
+}

src/main/java/gay/pridecraft/joymod/particle/TotemOfPrideParticle.java

@@ -0,0 +1,74 @@
+package gay.pridecraft.joymod.particle;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.particle.*;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.client.particle.AnimatedParticle;
+import net.minecraft.client.particle.ParticleTextureSheet;
+import net.minecraft.client.particle.SpriteProvider;
+import net.minecraft.util.math.random.Random;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Environment(EnvType.CLIENT)
+public class TotemOfPrideParticle extends AnimatedParticle {
+    public static final List<int[]> LGBT_COLORS = Arrays.asList(
+            new int[]{228, 3, 3}, // Red
+            new int[]{255, 140, 0}, // Orange
+            new int[]{255, 237, 0}, // Yellow
+            new int[]{0, 128, 38}, // Green
+            new int[]{36, 64, 142}, // Blue
+            new int[]{115, 41, 130} // Purple
+    );
+
+    private final int colorIndex;
+
+    public TotemOfPrideParticle(ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider, int colorIndex) {
+        super(world, x, y, z, spriteProvider, 1.25F);
+        this.velocityMultiplier = 0.6F;
+        this.velocityX = velocityX;
+        this.velocityY = velocityY;
+        this.velocityZ = velocityZ;
+        this.scale *= 0.75F;
+        this.maxAge = 60 + this.random.nextInt(12);
+        this.setSpriteForAge(spriteProvider);
+        this.colorIndex = colorIndex;
+        this.setColor(LGBT_COLORS.get(colorIndex % LGBT_COLORS.size()));
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+        if (this.age % 10 == 0) {
+            this.setColor(LGBT_COLORS.get((this.colorIndex + 1) % LGBT_COLORS.size()));
+        }
+    }
+
+    private void setColor(int[] rgb) {
+        this.red = rgb[0] / 255.0F;
+        this.green = rgb[1] / 255.0F;
+        this.blue = rgb[2] / 255.0F;
+    }
+
+    @Environment(EnvType.CLIENT)
+    public static class Factory implements ParticleFactory<DefaultParticleType> {
+        private static int colorCounter = 0;
+        private final SpriteProvider spriteProvider;
+
+        public Factory(SpriteProvider spriteProvider) {
+            this.spriteProvider = spriteProvider;
+        }
+
+        public Particle createParticle(
+                DefaultParticleType defaultParticleType, ClientWorld clientWorld, double d, double e, double f, double g, double h, double i
+        ) {
+            int colorIndex = colorCounter % LGBT_COLORS.size();
+            colorCounter++;
+            return new TotemOfPrideParticle(clientWorld, d, e, f, g, h, i, this.spriteProvider, colorIndex);
+        }
+    }
+
+}

src/main/java/gay/pridecraft/joymod/renderer/entity/CustomBedBlockRenderer.java

@@ -1,4 +1,4 @@
-package gay.pridecraft.joymod.renderer;
+package gay.pridecraft.joymod.renderer.entity;
 
 
 import gay.pridecraft.joymod.entity.ModEntities;
@@ -26,11 +26,11 @@ import net.minecraft.util.math.RotationAxis;
 import net.minecraft.world.World;
 
 @Environment(EnvType.CLIENT)
-public class CustomBedBlockEntityRenderer implements BlockEntityRenderer<CustomBedBlockEntity> {
+public class CustomBedBlockRenderer implements BlockEntityRenderer<CustomBedBlockEntity> {
     private final ModelPart bedHead;
     private final ModelPart bedFoot;
 
-    public CustomBedBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
+    public CustomBedBlockRenderer(BlockEntityRendererFactory.Context ctx) {
         this.bedHead = ctx.getLayerModelPart(EntityModelLayers.BED_HEAD);
         this.bedFoot = ctx.getLayerModelPart(EntityModelLayers.BED_FOOT);
     }

src/main/java/gay/pridecraft/joymod/renderer/entity/PrideFrogRenderer.java

@@ -12,9 +12,9 @@ import net.minecraft.util.Identifier;
 
 @Environment(EnvType.CLIENT)
 public class PrideFrogRenderer extends MobEntityRenderer<CustomFrogEntity.PrideFrogEntity, PrideFrogEntityModel<CustomFrogEntity.PrideFrogEntity>> {
-    private static final Identifier TEMPERATE_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/temperate_frog.png");
-    private static final Identifier WARM_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/warm_frog.png");
-    private static final Identifier COLD_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/cold_frog.png");
+    private static final Identifier TEMPERATE_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/pride_temperate_frog.png");
+    private static final Identifier WARM_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/pride_warm_frog.png");
+    private static final Identifier COLD_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/pride_cold_frog.png");
 
     public PrideFrogRenderer(EntityRendererFactory.Context context) {
         super(context, new PrideFrogEntityModel<>(context.getPart(EntityModelLayers.FROG)), 0.3F);

src/main/resources/assets/joymod/lang/en_us.json

@@ -1,3 +1,47 @@
 {
+  "itemgroup.joymod_group": "Joy Mod",
 
+  "block.joymod.gay_bed": "Gay Bed",
+  "block.joymod.enby_bed": "Enby Bed",
+  "block.joymod.intersex_bed": "Intersex Bed",
+  "block.joymod.agender_bed": "Agender Bed",
+  "block.joymod.bigender_bed": "Bigender Bed",
+  "block.joymod.bisexual_bed": "Bisexual Bed",
+  "block.joymod.mlm_bed": "MLM Bed",
+  "block.joymod.ace_bed": "Ace Bed",
+  "block.joymod.aro_bed": "Aro Bed",
+  "block.joymod.aplatonic_bed": "Aplatonically Oriented Bed",
+  "block.joymod.gender_fluid_bed": "Gender Fluid Bed",
+  "block.joymod.pan_bed": "Pan Bed",
+  "block.joymod.trans_bed": "Trans Bed",
+  "block.joymod.aroace_bed": "Aro-Ace Bed",
+  "block.joymod.lesbian_bed": "Lesbian Bed",
+  "block.joymod.progress_bed": "Progress Bed",
+  "block.joymod.gay_candle": "Gay Candle",
+  "block.joymod.enby_candle": "Enby Candle",
+  "block.joymod.intersex_candle": "Intersex Candle",
+  "block.joymod.agender_candle": "Agender Candle",
+  "block.joymod.bigender_candle": "Bigender Candle",
+  "block.joymod.bisexual_candle": "Bisexual Candle",
+  "block.joymod.mlm_candle": "MLM Candle",
+  "block.joymod.ace_candle": "Ace Candle",
+  "block.joymod.aro_candle": "Aro Candle",
+  "block.joymod.aplatonic_candle": "Aplatonically Oriented Candle",
+  "block.joymod.gender_fluid_candle": "Gender Fluid Candle",
+  "block.joymod.pan_candle": "Pan Candle",
+  "block.joymod.trans_candle": "Trans Candle",
+  "block.joymod.aroace_candle": "Aro-Ace Candle",
+  "block.joymod.lesbian_candle": "Lesbian Candle",
+  "block.joymod.progress_candle": "Progress Candle",
+
+  "item.joymod.pride_elytra": "Pride Elytra",
+  "item.joymod.totem_of_pride": "Totem of Pride",
+  "item.joymod.pride_brush": "Pride Brush",
+  "item.joymod.pride_slime_ball": "Pride Slime Ball",
+  "item.joymod.thigh_high_fox_spawn_egg": "Thigh-High Fox Spawn Egg",
+  "item.joymod.pride_bii_spawn_egg": "Pride Bii Spawn Egg",
+  "item.joymod.pride_axolotl_spawn_egg": "Pride Axolotl Spawn Egg",
+  "item.joymod.pride_frog_spawn_egg": "Pride Frog Spawn Egg",
+  "item.joymod.pride_slime_spawn_egg": "Pride Slime Spawn Egg",
+  "item.joymod.pride_sniffer_spawn_egg": "Pride Sniffer Spawn Egg"
 }

src/main/resources/assets/joymod/models/item/lesbian_bed.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "pride_land:item/lesbian_bed"
-  }
-}

src/main/resources/assets/joymod/particles/totem_of_pride_particle.json

@@ -0,0 +1,12 @@
+{
+  "textures": [
+    "minecraft:glitter_7",
+    "minecraft:glitter_6",
+    "minecraft:glitter_5",
+    "minecraft:glitter_4",
+    "minecraft:glitter_3",
+    "minecraft:glitter_2",
+    "minecraft:glitter_1",
+    "minecraft:glitter_0"
+  ]
+}

src/main/resources/assets/joymod/textures/entity/axolotl/_list.json

@@ -1 +0,0 @@
-{"directories":[],"files":["axolotl_blue.png","axolotl_cyan.png","axolotl_gold.png","axolotl_lucy.png","axolotl_wild.png"]}