diff --git a/src/main/java/gay/pridecraft/joy/Joy.java b/src/main/java/gay/pridecraft/joy/Joy.java index fec6322..2497642 100644 --- a/src/main/java/gay/pridecraft/joy/Joy.java +++ b/src/main/java/gay/pridecraft/joy/Joy.java @@ -93,7 +93,7 @@ public class Joy implements ModInitializer { .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0) .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 1.0)); - FabricDefaultAttributeRegistry.register(ModEntities.PRIDE_FROG, MobEntity.createMobAttributes() + FabricDefaultAttributeRegistry.register(ModEntities.FROG, MobEntity.createMobAttributes() .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 10.0) .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 1.0)); diff --git a/src/main/java/gay/pridecraft/joy/JoyClient.java b/src/main/java/gay/pridecraft/joy/JoyClient.java index 1494d42..a046735 100644 --- a/src/main/java/gay/pridecraft/joy/JoyClient.java +++ b/src/main/java/gay/pridecraft/joy/JoyClient.java @@ -59,7 +59,7 @@ public class JoyClient implements ClientModInitializer { EntityRendererRegistry.register(ModEntities.ENBEE, EnbeeRenderer::new); EntityRendererRegistry.register(ModEntities.TREE, TreeRenderer::new); EntityRendererRegistry.register(ModEntities.AXOLOTL, AxolotlRenderer::new); - EntityRendererRegistry.register(ModEntities.PRIDE_FROG, PrideFrogRenderer::new); + EntityRendererRegistry.register(ModEntities.FROG, FrogRenderer::new); EntityRendererRegistry.register(ModEntities.PRIDE_SLIME, PrideSlimeRenderer::new); EntityRendererRegistry.register(ModEntities.PRIDE_SNIFFER, PrideSnifferRenderer::new); } diff --git a/src/main/java/gay/pridecraft/joy/entity/ModEntities.java b/src/main/java/gay/pridecraft/joy/entity/ModEntities.java index 7be2581..aa0bf4a 100644 --- a/src/main/java/gay/pridecraft/joy/entity/ModEntities.java +++ b/src/main/java/gay/pridecraft/joy/entity/ModEntities.java @@ -79,7 +79,7 @@ public class ModEntities { .build() ); - public static final EntityType PRIDE_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()) diff --git a/src/main/java/gay/pridecraft/joy/item/ModItems.java b/src/main/java/gay/pridecraft/joy/item/ModItems.java index bd90b8d..484ef7f 100644 --- a/src/main/java/gay/pridecraft/joy/item/ModItems.java +++ b/src/main/java/gay/pridecraft/joy/item/ModItems.java @@ -24,7 +24,7 @@ public class ModItems { public static final Item ENBEE_SPAWN_EGG = registerItem("bii_spawn_egg", new RainbowSpawnEggItem(ModEntities.ENBEE, 16577588, 0x9C59D1, new Item.Settings())); 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.PRIDE_FROG, 13661252, 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())); diff --git a/src/main/java/gay/pridecraft/joy/renderer/entity/PrideFrogRenderer.java b/src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java similarity index 65% rename from src/main/java/gay/pridecraft/joy/renderer/entity/PrideFrogRenderer.java rename to src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java index f23260e..444b22b 100644 --- a/src/main/java/gay/pridecraft/joy/renderer/entity/PrideFrogRenderer.java +++ b/src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java @@ -2,7 +2,7 @@ package gay.pridecraft.joy.renderer.entity; import gay.pridecraft.joy.Joy; import gay.pridecraft.joy.entity.custom.living.CustomFrogEntity; -import gay.pridecraft.joy.renderer.model.PrideFrogEntityModel; +import gay.pridecraft.joy.renderer.model.FrogEntityModel; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.entity.EntityRendererFactory; @@ -11,13 +11,13 @@ import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) -public class PrideFrogRenderer extends MobEntityRenderer> { - private static final Identifier TEMPERATE_TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/frog/pride_temperate_frog.png"); - private static final Identifier WARM_TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/frog/pride_warm_frog.png"); - private static final Identifier COLD_TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/frog/pride_cold_frog.png"); +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"); - public PrideFrogRenderer(EntityRendererFactory.Context context) { - super(context, new PrideFrogEntityModel<>(context.getPart(EntityModelLayers.FROG)), 0.3F); + public FrogRenderer(EntityRendererFactory.Context context) { + super(context, new FrogEntityModel<>(context.getPart(EntityModelLayers.FROG)), 0.3F); } @Override diff --git a/src/main/java/gay/pridecraft/joy/renderer/model/PrideFrogEntityModel.java b/src/main/java/gay/pridecraft/joy/renderer/model/FrogEntityModel.java similarity index 97% rename from src/main/java/gay/pridecraft/joy/renderer/model/PrideFrogEntityModel.java rename to src/main/java/gay/pridecraft/joy/renderer/model/FrogEntityModel.java index 6759f98..ed5c5a6 100644 --- a/src/main/java/gay/pridecraft/joy/renderer/model/PrideFrogEntityModel.java +++ b/src/main/java/gay/pridecraft/joy/renderer/model/FrogEntityModel.java @@ -14,7 +14,7 @@ import net.minecraft.client.render.entity.model.SinglePartEntityModel; import net.minecraft.entity.passive.FrogEntity; @Environment(EnvType.CLIENT) -public class PrideFrogEntityModel extends SinglePartEntityModel { +public class FrogEntityModel extends SinglePartEntityModel { private static final float WALKING_LIMB_ANGLE_SCALE = 1.5F; private static final float SWIMMING_LIMB_ANGLE_SCALE = 1.0F; private static final float LIMB_DISTANCE_SCALE = 2.5F; @@ -29,7 +29,7 @@ public class PrideFrogEntityModel extends SinglePartEntity private final ModelPart rightLeg; private final ModelPart croakingBody; - public PrideFrogEntityModel(ModelPart root) { + public FrogEntityModel(ModelPart root) { this.root = root.getChild("root"); this.body = this.root.getChild("body"); this.head = this.body.getChild("head"); diff --git a/src/main/resources/assets/joy/textures/entity/frog/pride_cold_frog.png b/src/main/resources/assets/joy/textures/entity/frog/cold_frog.png similarity index 100% rename from src/main/resources/assets/joy/textures/entity/frog/pride_cold_frog.png rename to src/main/resources/assets/joy/textures/entity/frog/cold_frog.png diff --git a/src/main/resources/assets/joy/textures/entity/frog/pride_temperate_frog.png b/src/main/resources/assets/joy/textures/entity/frog/temperate_frog.png similarity index 100% rename from src/main/resources/assets/joy/textures/entity/frog/pride_temperate_frog.png rename to src/main/resources/assets/joy/textures/entity/frog/temperate_frog.png diff --git a/src/main/resources/assets/joy/textures/entity/frog/pride_warm_frog.png b/src/main/resources/assets/joy/textures/entity/frog/warm_frog.png similarity index 100% rename from src/main/resources/assets/joy/textures/entity/frog/pride_warm_frog.png rename to src/main/resources/assets/joy/textures/entity/frog/warm_frog.png