Skip to content

Commit

Permalink
add kiki
Browse files Browse the repository at this point in the history
  • Loading branch information
IAFEnvoy committed Jan 20, 2025
1 parent 7019616 commit e2a7381
Show file tree
Hide file tree
Showing 10 changed files with 457 additions and 0 deletions.
407 changes: 407 additions & 0 deletions common/src/main/java/com/iafenvoy/sow/entity/KikiEntity.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.iafenvoy.neptune.util.EntityBuildHelper;
import com.iafenvoy.sow.SongsOfWar;
import com.iafenvoy.sow.entity.GrimEntity;
import com.iafenvoy.sow.entity.KikiEntity;
import com.iafenvoy.sow.entity.ardoni.*;
import com.iafenvoy.sow.entity.ardoni.random.*;
import com.iafenvoy.sow.entity.author.PixelZnimationEntity;
Expand Down Expand Up @@ -48,6 +49,7 @@ public final class SowEntities {
public static final RegistrySupplier<EntityType<SendarisArdoniEntity>> SENDARIS_ARDONI = build("sendaris_ardoni", SendarisArdoniEntity::new, SpawnGroup.CREATURE, 64, 3, false, EntityBuildHelper.PLAYER.scale(1.1f));
public static final RegistrySupplier<EntityType<VoltarisArdoniEntity>> VOLTARIS_ARDONI = build("voltaris_ardoni", VoltarisArdoniEntity::new, SpawnGroup.CREATURE, 64, 3, false, EntityBuildHelper.PLAYER.scale(1.1f));
public static final RegistrySupplier<EntityType<GrimEntity>> GRIM = build("grim", GrimEntity::new, SpawnGroup.CREATURE, 64, 3, false, EntityBuildHelper.PLAYER);
public static final RegistrySupplier<EntityType<KikiEntity>> KIKI = build("kiki", KikiEntity::new, SpawnGroup.CREATURE, 10, 3, true, new EntityBuildHelper.Dimension(0.5F, 0.5F));
//Ardoni
public static final RegistrySupplier<EntityType<TideSingerEntity>> TIDE_SINGER = build("tide_singer", TideSingerEntity::new, SpawnGroup.CREATURE, 64, 3, false, EntityBuildHelper.PLAYER.scale(1.1f));
public static final RegistrySupplier<EntityType<DeathSingerEntity>> DEATH_SINGER = build("death_singer", DeathSingerEntity::new, SpawnGroup.CREATURE, 64, 3, false, EntityBuildHelper.PLAYER.scale(1.1f));
Expand Down Expand Up @@ -161,6 +163,7 @@ public static void init() {
EntityAttributeRegistry.register(SENDARIS_ARDONI, SendarisArdoniEntity::createAttributes);
EntityAttributeRegistry.register(VOLTARIS_ARDONI, VoltarisArdoniEntity::createAttributes);
EntityAttributeRegistry.register(GRIM, GrimEntity::createAttributes);
EntityAttributeRegistry.register(KIKI, KikiEntity::createAttributes);

EntityAttributeRegistry.register(TIDE_SINGER, TideSingerEntity::createAttributes);
EntityAttributeRegistry.register(DEATH_SINGER, DeathSingerEntity::createAttributes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.iafenvoy.sow.render.block.SongCubeBlockEntityRenderer;
import com.iafenvoy.sow.render.block.WallsOfTimeBlockEntityRenderer;
import com.iafenvoy.sow.render.entity.ArdoniEntityRenderer;
import com.iafenvoy.sow.render.entity.KikiEntityRenderer;
import com.iafenvoy.sow.render.entity.MagnoriteEntityRenderer;
import com.iafenvoy.sow.render.power.entity.*;
import dev.architectury.registry.client.level.entity.EntityRendererRegistry;
Expand Down Expand Up @@ -53,6 +54,7 @@ public static void registerEntityRenderers() {
EntityRendererRegistry.register(SowEntities.NESTORIS_ARDONI, ArdoniEntityRenderer::new);
EntityRendererRegistry.register(SowEntities.KALTARIS_ARDONI, ArdoniEntityRenderer::new);
EntityRendererRegistry.register(SowEntities.GRIM, CommonPlayerLikeEntityRenderer::new);
EntityRendererRegistry.register(SowEntities.KIKI, KikiEntityRenderer::new);

EntityRendererRegistry.register(SowEntities.TIDE_SINGER, ArdoniEntityRenderer::new);
EntityRendererRegistry.register(SowEntities.DEATH_SINGER, ArdoniEntityRenderer::new);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public final class SowSpawnEggs {
public static final RegistrySupplier<Item> KALTARIS_ARDONI_SPAWN_EGG = REGISTRY.register("kaltaris_ardoni_spawn_egg", () -> ArdoniType.KALTARIS.createSpawnEgg(SowEntities.KALTARIS_ARDONI));
public static final RegistrySupplier<Item> MENDORIS_ARDONI_SPAWN_EGG = REGISTRY.register("mendoris_ardoni_spawn_egg", () -> ArdoniType.MENDORIS.createSpawnEgg(SowEntities.MENDORIS_ARDONI));
public static final RegistrySupplier<Item> GRIM_SPAWN_EGG = REGISTRY.register("grim_spawn_egg", SowSpawnEggItem.create(SowEntities.GRIM, 0xFF444444, 0xFF00FFFF));
public static final RegistrySupplier<Item> KIKI_SPAWN_EGG = REGISTRY.register("kiki_spawn_egg", SowSpawnEggItem.create(SowEntities.KIKI, 0xFFEEEEEE, 0xFFAAAAAA));
//Ardoni
public static final RegistrySupplier<Item> TIDE_SINGER_SPAWN_EGG = REGISTRY.register("tide_singer_spawn_egg", SowSpawnEggItem.create(SowEntities.TIDE_SINGER, 0xFF888888, 0xFFFFFF00));
public static final RegistrySupplier<Item> DEATH_SINGER_SPAWN_EGG = REGISTRY.register("death_singer_spawn_egg", SowSpawnEggItem.create(SowEntities.DEATH_SINGER, 0xFF444444, 0xFFF05C4F));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public final class SowTags {
public static final TagKey<Block> STONE_BRICKS = block("stone_bricks");
public static final TagKey<Block> STONE_BRICK_STAIRS = block("stone_brick_stairs");
public static final TagKey<Item> MASTER_STAFF = item("master_staff");
public static final TagKey<Item> KIKI_FOOD = item("kiki_food");

private static TagKey<Block> block(String id) {
return TagKey.of(RegistryKeys.BLOCK, Identifier.of(SongsOfWar.MOD_ID, id));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.iafenvoy.sow.render.entity;

import com.iafenvoy.sow.SongsOfWar;
import com.iafenvoy.sow.entity.KikiEntity;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.entity.EntityRendererFactory;
import net.minecraft.client.render.entity.MobEntityRenderer;
import net.minecraft.client.render.entity.model.EntityModelLayers;
import net.minecraft.client.render.entity.model.GhastEntityModel;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;

@Environment(EnvType.CLIENT)
public class KikiEntityRenderer extends MobEntityRenderer<KikiEntity, GhastEntityModel<KikiEntity>> {
private static final Identifier TEXTURE = Identifier.of(SongsOfWar.MOD_ID, "textures/entity/kiki.png");

public KikiEntityRenderer(EntityRendererFactory.Context context) {
super(context, new GhastEntityModel<>(context.getPart(EntityModelLayers.GHAST)), 0.3F);
}

@Override
public Identifier getTexture(KikiEntity entity) {
return TEXTURE;
}

@Override
protected void scale(KikiEntity entity, MatrixStack matrices, float amount) {
matrices.scale(0.5F, 0.5F, 0.5F);
}
}
2 changes: 2 additions & 0 deletions common/src/main/resources/assets/sow/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@
"entity.sow.kaltaris_ardoni": "Kaltaris Ardoni",
"entity.sow.kaltaris_master": "Kaltaris Master",
"entity.sow.karthen_guard": "Karthen Guard",
"entity.sow.kiki": "Kiki",
"entity.sow.kiyoshi": "Kiyoshi",
"entity.sow.leather_worker_folk": "Leather Worker Folk",
"entity.sow.lucan": "Lucan",
Expand Down Expand Up @@ -403,6 +404,7 @@
"item.sow.kaltaris_ardoni_spawn_egg": "Kaltaris Ardoni Spawn Egg",
"item.sow.kaltaris_master_spawn_egg": "Kaltaris Master Spawn Egg",
"item.sow.karthen_guard_spawn_egg": "Karthen Guard Spawn Egg",
"item.sow.kiki_spawn_egg": "Kiki Spawn Egg",
"item.sow.kiyoshi_spawn_egg": "Kiyoshi Spawn Egg",
"item.sow.laura_stimpson_blade_diamond": "Laura Stimpson Lade Diamond",
"item.sow.laura_stimpson_blade_iron": "Laura Stimpson Lade Iron",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:item/template_spawn_egg"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions common/src/main/resources/data/sow/tags/items/kiki_food.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"minecraft:coal",
"minecraft:charcoal"
]
}

0 comments on commit e2a7381

Please sign in to comment.