TheCloud/joy
1
0
Fork 0
mirror of https://github.com/Pridecraft-Studios/joy.git synced 2025-08-03 22:46:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

PrideSniffer -> Sniffer, fix some frog, slime and axolotl stuff

Browse Source
This commit is contained in:
blryface 2024-09-15 19:09:54 -03:00
parent 7eef422965
commit d6c1a416ba
10 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/gay/pridecraft/joy/Joy.java
View File

@ -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));
}
}

2
src/main/java/gay/pridecraft/joy/JoyClient.java
View File

@ -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);
}
}

20
src/main/java/gay/pridecraft/joy/entity/ModEntities.java
View File

@ -79,28 +79,20 @@ public class ModEntities {
.build()
);
public static final EntityType<CustomFrogEntity.PrideFrogEntity> FROG = Registry.register(
public static final EntityType<CustomFrogEntity.FrogEntity> 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<CustomSlimeEntity.PrideSlimeEntity> 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<CustomSnifferEntity.PrideSnifferEntity> PRIDE_SNIFFER = Registry.register(
public static final EntityType<CustomSnifferEntity.SnifferEntity> 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()

4
src/main/java/gay/pridecraft/joy/entity/custom/living/CustomFrogEntity.java
View File

@ -10,8 +10,8 @@ public class CustomFrogEntity extends FrogEntity {
super(entityType, world);
}
public static class PrideFrogEntity extends CustomFrogEntity {
public PrideFrogEntity(EntityType<? extends PrideFrogEntity> entityType, World world) {
public static class FrogEntity extends CustomFrogEntity {
public FrogEntity(EntityType<? extends FrogEntity> entityType, World world) {
super(entityType, world);
}
}

4
src/main/java/gay/pridecraft/joy/entity/custom/living/CustomSnifferEntity.java
View File

@ -11,8 +11,8 @@ public class CustomSnifferEntity extends SnifferEntity {
super(entityType, world);
}
public static class PrideSnifferEntity extends CustomSnifferEntity {
public PrideSnifferEntity(EntityType<? extends PrideSnifferEntity> entityType, World world) {
public static class SnifferEntity extends CustomSnifferEntity {
public SnifferEntity(EntityType<? extends SnifferEntity> entityType, World world) {
super(entityType, world);
}
}

5
src/main/java/gay/pridecraft/joy/item/ModItemGroups.java
View File

@ -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());

3
src/main/java/gay/pridecraft/joy/item/ModItems.java
View File

@ -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);

4
src/main/java/gay/pridecraft/joy/renderer/entity/FrogRenderer.java
View File

@ -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<CustomFrogEntity.PrideFrogEntity, FrogEntityModel<CustomFrogEntity.PrideFrogEntity>> {
public class FrogRenderer extends MobEntityRenderer<CustomFrogEntity.FrogEntity, FrogEntityModel<CustomFrogEntity.FrogEntity>> {
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<CustomFrogEntity.PrideFrogEn
}
@Override
public Identifier getTexture(CustomFrogEntity.PrideFrogEntity entity) {
public Identifier getTexture(CustomFrogEntity.FrogEntity entity) {
if (entity.getVariant().getKey().isEmpty())
return TEMPERATE_TEXTURE;

10
src/main/java/gay/pridecraft/joy/renderer/entity/PrideSnifferRenderer.java → src/main/java/gay/pridecraft/joy/renderer/entity/SnifferRenderer.java
View File

@ -2,7 +2,7 @@ package gay.pridecraft.joy.renderer.entity;
import gay.pridecraft.joy.Joy;
import gay.pridecraft.joy.entity.custom.living.CustomSnifferEntity;
import gay.pridecraft.joy.renderer.model.PrideSnifferEntityModel;
import gay.pridecraft.joy.renderer.model.SnifferEntityModel;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.entity.EntityRendererFactory;
@ -11,15 +11,15 @@ import net.minecraft.client.render.entity.model.EntityModelLayers;
import net.minecraft.util.Identifier;
@Environment(EnvType.CLIENT)
public class PrideSnifferRenderer extends MobEntityRenderer<CustomSnifferEntity.PrideSnifferEntity, PrideSnifferEntityModel<CustomSnifferEntity.PrideSnifferEntity>> {
public class SnifferRenderer extends MobEntityRenderer<CustomSnifferEntity.SnifferEntity, SnifferEntityModel<CustomSnifferEntity.SnifferEntity>> {
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;
}
}

4
src/main/java/gay/pridecraft/joy/renderer/model/PrideSnifferEntityModel.java → src/main/java/gay/pridecraft/joy/renderer/model/SnifferEntityModel.java
View File

@ -15,13 +15,13 @@ import net.minecraft.client.render.entity.animation.SnifferAnimations;
import net.minecraft.entity.passive.SnifferEntity;
@Environment(EnvType.CLIENT)
public class PrideSnifferEntityModel<T extends SnifferEntity> extends SinglePartEntityModelWithChildTransform<T> {
public class SnifferEntityModel<T extends SnifferEntity> extends SinglePartEntityModelWithChildTransform<T> {
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");