From d6c1a416babaa0b9d2d2e4cb24f0a910dbac170f Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sun, 15 Sep 2024 19:09:54 -0300 Subject: [PATCH] PrideSniffer -> Sniffer, fix some frog, slime and axolotl stuff --- src/main/java/gay/pridecraft/joy/Joy.java | 2 +- .../java/gay/pridecraft/joy/JoyClient.java | 2 +- .../pridecraft/joy/entity/ModEntities.java | 20 ++++++------------- .../custom/living/CustomFrogEntity.java | 4 ++-- .../custom/living/CustomSnifferEntity.java | 4 ++-- .../pridecraft/joy/item/ModItemGroups.java | 5 ++--- .../gay/pridecraft/joy/item/ModItems.java | 3 +-- .../joy/renderer/entity/FrogRenderer.java | 4 ++-- ...fferRenderer.java => SnifferRenderer.java} | 10 +++++----- ...tityModel.java => SnifferEntityModel.java} | 4 ++-- 10 files changed, 24 insertions(+), 34 deletions(-) rename src/main/java/gay/pridecraft/joy/renderer/entity/{PrideSnifferRenderer.java => SnifferRenderer.java} (56%) rename src/main/java/gay/pridecraft/joy/renderer/model/{PrideSnifferEntityModel.java => SnifferEntityModel.java} (97%) diff --git a/src/main/java/gay/pridecraft/joy/Joy.java b/src/main/java/gay/pridecraft/joy/Joy.java index 9f5f6fe..fce7707 100644 --- a/src/main/java/gay/pridecraft/joy/Joy.java +++ b/src/main/java/gay/pridecraft/joy/Joy.java @@ -97,7 +97,7 @@ public class Joy implements ModInitializer { .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 10.0) .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 1.0)); - FabricDefaultAttributeRegistry.register(ModEntities.PRIDE_SNIFFER, MobEntity.createMobAttributes() + FabricDefaultAttributeRegistry.register(ModEntities.SNIFFER, MobEntity.createMobAttributes() .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.1)); } } \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/joy/JoyClient.java b/src/main/java/gay/pridecraft/joy/JoyClient.java index e283afa..a918e1a 100644 --- a/src/main/java/gay/pridecraft/joy/JoyClient.java +++ b/src/main/java/gay/pridecraft/joy/JoyClient.java @@ -60,6 +60,6 @@ public class JoyClient implements ClientModInitializer { EntityRendererRegistry.register(ModEntities.TREE, TreeRenderer::new); EntityRendererRegistry.register(ModEntities.AXOLOTL, AxolotlRenderer::new); EntityRendererRegistry.register(ModEntities.FROG, FrogRenderer::new); - EntityRendererRegistry.register(ModEntities.PRIDE_SNIFFER, PrideSnifferRenderer::new); + EntityRendererRegistry.register(ModEntities.SNIFFER, SnifferRenderer::new); } } diff --git a/src/main/java/gay/pridecraft/joy/entity/ModEntities.java b/src/main/java/gay/pridecraft/joy/entity/ModEntities.java index aa0bf4a..7ec9dcf 100644 --- a/src/main/java/gay/pridecraft/joy/entity/ModEntities.java +++ b/src/main/java/gay/pridecraft/joy/entity/ModEntities.java @@ -79,28 +79,20 @@ public class ModEntities { .build() ); - public static final EntityType FROG = Registry.register( + public static final EntityType FROG = Registry.register( Registries.ENTITY_TYPE, - Identifier.of(Joy.MOD_ID, "pride_frog"), - EntityType.Builder.create(CustomFrogEntity.PrideFrogEntity::new, EntityType.FROG.getSpawnGroup()) + Identifier.of(Joy.MOD_ID, "frog"), + EntityType.Builder.create(CustomFrogEntity.FrogEntity::new, EntityType.FROG.getSpawnGroup()) .dimensions(0.5F, 0.5f) .maxTrackingRange(10) .build() ); - public static final EntityType PRIDE_SLIME = Registry.register( - Registries.ENTITY_TYPE, - Identifier.of(Joy.MOD_ID, "pride_slime"), - EntityType.Builder.create(CustomSlimeEntity.PrideSlimeEntity::new, EntityType.SLIME.getSpawnGroup()) - .dimensions(0.5f, 0.5f) - .maxTrackingRange(10) - .build() - ); - public static final EntityType PRIDE_SNIFFER = Registry.register( + public static final EntityType SNIFFER = Registry.register( Registries.ENTITY_TYPE, - Identifier.of(Joy.MOD_ID, "pride_sniffer"), - EntityType.Builder.create(CustomSnifferEntity.PrideSnifferEntity::new, EntityType.SNIFFER.getSpawnGroup()) + Identifier.of(Joy.MOD_ID, "sniffer"), + EntityType.Builder.create(CustomSnifferEntity.SnifferEntity::new, EntityType.SNIFFER.getSpawnGroup()) .dimensions(1.9F, 1.75F) .maxTrackingRange(10) .build() diff --git a/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomFrogEntity.java b/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomFrogEntity.java index 8d87bf6..1409b0f 100644 --- a/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomFrogEntity.java +++ b/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomFrogEntity.java @@ -10,8 +10,8 @@ public class CustomFrogEntity extends FrogEntity { super(entityType, world); } - public static class PrideFrogEntity extends CustomFrogEntity { - public PrideFrogEntity(EntityType entityType, World world) { + public static class FrogEntity extends CustomFrogEntity { + public FrogEntity(EntityType entityType, World world) { super(entityType, world); } } diff --git a/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomSnifferEntity.java b/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomSnifferEntity.java index ac249ea..31efbb0 100644 --- a/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomSnifferEntity.java +++ b/src/main/java/gay/pridecraft/joy/entity/custom/living/CustomSnifferEntity.java @@ -11,8 +11,8 @@ public class CustomSnifferEntity extends SnifferEntity { super(entityType, world); } - public static class PrideSnifferEntity extends CustomSnifferEntity { - public PrideSnifferEntity(EntityType entityType, World world) { + public static class SnifferEntity extends CustomSnifferEntity { + public SnifferEntity(EntityType entityType, World world) { super(entityType, world); } } diff --git a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java index 0dc75af..24a15b7 100644 --- a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java +++ b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java @@ -12,9 +12,9 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class ModItemGroups { - public static final ItemGroup JOYMOD_GROUP = Registry.register(Registries.ITEM_GROUP, + public static final ItemGroup JOY_GROUP = Registry.register(Registries.ITEM_GROUP, Identifier.of(Joy.MOD_ID, "joy"), - FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joymod_group")) + FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group")) .icon(() -> new ItemStack(ModItems.PRIDE_BRUSH)).entries((displayContext, entries) -> { entries.add(ModBlocks.GAY_BED); @@ -62,7 +62,6 @@ public class ModItemGroups { entries.add(ModItems.TREE_SPAWN_EGG); entries.add(ModItems.PRIDE_AXOLOTL_SPAWN_EGG); entries.add(ModItems.PRIDE_FROG_SPAWN_EGG); - entries.add(ModItems.PRIDE_SLIME_SPAWN_EGG); entries.add(ModItems.PRIDE_SNIFFER_SPAWN_EGG); }).build()); diff --git a/src/main/java/gay/pridecraft/joy/item/ModItems.java b/src/main/java/gay/pridecraft/joy/item/ModItems.java index 484ef7f..7fb9dac 100644 --- a/src/main/java/gay/pridecraft/joy/item/ModItems.java +++ b/src/main/java/gay/pridecraft/joy/item/ModItems.java @@ -25,8 +25,7 @@ public class ModItems { public static final Item TREE_SPAWN_EGG = registerItem("tree_spawn_egg", new RainbowSpawnEggItem(ModEntities.TREE, 16577588, 0x9C59D1, new Item.Settings())); public static final Item PRIDE_AXOLOTL_SPAWN_EGG = registerItem("pride_axolotl_spawn_egg", new RainbowSpawnEggItem(ModEntities.AXOLOTL, 16499171, 0xff80bf, new Item.Settings())); public static final Item PRIDE_FROG_SPAWN_EGG = registerItem("pride_frog_spawn_egg", new RainbowSpawnEggItem(ModEntities.FROG, 13661252, 0xff80bf, new Item.Settings())); - public static final Item PRIDE_SLIME_SPAWN_EGG = registerItem("pride_slime_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_SLIME, 5349438, 0xff80bf, new Item.Settings())); - public static final Item PRIDE_SNIFFER_SPAWN_EGG = registerItem("pride_sniffer_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_SNIFFER, 8855049, 0xff80bf, new Item.Settings())); + public static final Item PRIDE_SNIFFER_SPAWN_EGG = registerItem("pride_sniffer_spawn_egg", new RainbowSpawnEggItem(ModEntities.SNIFFER, 8855049, 0xff80bf, new Item.Settings())); private static Item registerItem(String name, Item item) { return Registry.register(Registries.ITEM, Identifier.of(Joy.MOD_ID, name), item); diff --git a/src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java b/src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java index 444b22b..e349ea8 100644 --- a/src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java +++ b/src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java @@ -11,7 +11,7 @@ import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) -public class FrogRenderer extends MobEntityRenderer> { +public class FrogRenderer extends MobEntityRenderer> { private static final Identifier TEMPERATE_TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/frog/temperate_frog.png"); private static final Identifier WARM_TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/frog/warm_frog.png"); private static final Identifier COLD_TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/frog/cold_frog.png"); @@ -21,7 +21,7 @@ public class FrogRenderer extends MobEntityRenderer> { +public class SnifferRenderer extends MobEntityRenderer> { private static final Identifier TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/sniffer/pride_sniffer.png"); - public PrideSnifferRenderer(EntityRendererFactory.Context context) { - super(context, new PrideSnifferEntityModel<>(context.getPart(EntityModelLayers.SNIFFER)), 1.1F); + public SnifferRenderer(EntityRendererFactory.Context context) { + super(context, new SnifferEntityModel<>(context.getPart(EntityModelLayers.SNIFFER)), 1.1F); } @Override - public Identifier getTexture(CustomSnifferEntity.PrideSnifferEntity entity) { + public Identifier getTexture(CustomSnifferEntity.SnifferEntity entity) { return TEXTURE; } } diff --git a/src/main/java/gay/pridecraft/joy/renderer/model/PrideSnifferEntityModel.java b/src/main/java/gay/pridecraft/joy/renderer/model/SnifferEntityModel.java similarity index 97% rename from src/main/java/gay/pridecraft/joy/renderer/model/PrideSnifferEntityModel.java rename to src/main/java/gay/pridecraft/joy/renderer/model/SnifferEntityModel.java index 437d46d..c7fe646 100644 --- a/src/main/java/gay/pridecraft/joy/renderer/model/PrideSnifferEntityModel.java +++ b/src/main/java/gay/pridecraft/joy/renderer/model/SnifferEntityModel.java @@ -15,13 +15,13 @@ import net.minecraft.client.render.entity.animation.SnifferAnimations; import net.minecraft.entity.passive.SnifferEntity; @Environment(EnvType.CLIENT) -public class PrideSnifferEntityModel extends SinglePartEntityModelWithChildTransform { +public class SnifferEntityModel extends SinglePartEntityModelWithChildTransform { private static final float LIMB_ANGLE_SCALE = 9.0F; private static final float LIMB_DISTANCE_SCALE = 100.0F; private final ModelPart root; private final ModelPart head; - public PrideSnifferEntityModel(ModelPart root) { + public SnifferEntityModel(ModelPart root) { super(0.5F, 24.0F); this.root = root.getChild("root"); this.head = this.root.getChild("bone").getChild("body").getChild("head");