Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "aether_ii:item/rot_sentinel_spawn_egg"
}
}
2 changes: 2 additions & 0 deletions src/generated/resources/assets/aether_ii/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,7 @@
"entity.aether_ii.mimic": "Mimic",
"entity.aether_ii.moa": "Moa",
"entity.aether_ii.phyg": "Phyg",
"entity.aether_ii.rot_sentinel": "Rot Sentinel",
"entity.aether_ii.prismallard": "Prismallard",
"entity.aether_ii.prismallard_egg": "Prismallard Egg",
"entity.aether_ii.scatterglass_bolt": "Scatterglass Bolt",
Expand Down Expand Up @@ -1378,6 +1379,7 @@
"item.aether_ii.raw_taegore_meat": "Raw Taegore Meat",
"item.aether_ii.resonant_stone": "Resonant Stone",
"item.aether_ii.roasted_skyroot_lizard_on_a_stick": "Roasted Skyroot Lizard on a Stick",
"item.aether_ii.rot_sentinel_spawn_egg": "Rot Sentinel Spawn Egg",
"item.aether_ii.satival_bulb": "Satival Bulb",
"item.aether_ii.scatterglass_bolt": "Scatterglass Bolt",
"item.aether_ii.scatterglass_shard": "Scatterglass Shard",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "aether_ii:item/rot_sentinel_spawn_egg"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "minecraft:entity",
"random_sequence": "aether_ii:entities/rot_sentinel"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"#aether_ii:sentry_ruins_mobs"
"#aether_ii:sentry_ruins_mobs",
"#aether_ii:guardian_tree_mobs"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"aether_ii:bladeshroom_hunter",
"aether_ii:rot_sentinel"
]
}
6 changes: 6 additions & 0 deletions src/main/java/com/aetherteam/aetherii/AetherIIStats.java
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,12 @@ public class AetherIIStats {
.put(AetherIIAttributes.IMPACT_RESISTANCE, 2.0)
.put(AetherIIAttributes.PIERCE_RESISTANCE, 0.0)
.build();
public static final ImmutableMap<Holder<Attribute>, Double> ROT_SENTINEL = ImmutableMap.<Holder<Attribute>, Double>builder()
.put(Attributes.MAX_HEALTH, 150.0)
.put(AetherIIAttributes.SLASH_RESISTANCE, -1.0)
.put(AetherIIAttributes.IMPACT_RESISTANCE, 2.0)
.put(AetherIIAttributes.PIERCE_RESISTANCE, 0.0)
.build();

public static ItemAttributeModifiers.Entry baseDamageModifer(double amount) {
return new ItemAttributeModifiers.Entry(Attributes.ATTACK_DAMAGE, new AttributeModifier(Item.BASE_ATTACK_DAMAGE_ID, amount, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/aetherteam/aetherii/AetherIITags.java
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ public static class EntityTypes {
public static final TagKey<EntityType<?>> PLANT_MOBS = tag("talutons");
public static final TagKey<EntityType<?>> SENTRY_RUINS_MOBS = tag("sentry_ruins_mobs");
public static final TagKey<EntityType<?>> DUNGEON_MOBS = tag("dungeon_mobs");
public static final TagKey<EntityType<?>> GUARDIAN_TREE_MOBS = tag("guardian_tree_mobs");


public static final TagKey<EntityType<?>> NO_DOUBLE_DROPS = tag("no_double_drops");
public static final TagKey<EntityType<?>> NO_AMBROSIUM_DROPS = tag("no_ambrosium_drops");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class AetherIIModelLayers {
public static final ModelLayerLocation ARKENIUM_TALUTON = register("arkenium_taluton");
public static final ModelLayerLocation GRAVITITE_TALUTON = register("gravitite_taluton");
public static final ModelLayerLocation BLADESHROOM_HUNTER = register("bladeshroom_hunter");
public static final ModelLayerLocation ROT_SENTINEL = register("rot_sentinel");

public static final ModelLayerLocation MIMIC = register("mimic");
public static final ModelLayerLocation DETONATION_SENTRY = register("detonation_sentry");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.builders.CubeDeformation;
import net.minecraft.client.model.geom.builders.LayerDefinition;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.block.FluidModel;
import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
Expand Down Expand Up @@ -181,6 +180,7 @@ public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderer
event.registerEntityRenderer(AetherIIEntityTypes.SENTRY_GOLEM.get(), SentryGolemRenderer::new);
event.registerEntityRenderer(AetherIIEntityTypes.SLIDER.get(), SliderRenderer::new);
event.registerEntityRenderer(AetherIIEntityTypes.BLADESHROOM_HUNTER.get(), BladeshroomHunterRenderer::new);
event.registerEntityRenderer(AetherIIEntityTypes.ROT_SENTINEL.get(), RotSentinelRenderer::new);

// NPCs
event.registerEntityRenderer(AetherIIEntityTypes.EDWARD.get(), EdwardRenderer::new);
Expand Down Expand Up @@ -283,6 +283,7 @@ public static void registerLayerDefinition(EntityRenderersEvent.RegisterLayerDef
event.registerLayerDefinition(AetherIIModelLayers.SENTRY_GOLEM, SentryGolemModel::createBodyLayer);
event.registerLayerDefinition(AetherIIModelLayers.SLIDER, SliderModel::createBodyLayer);
event.registerLayerDefinition(AetherIIModelLayers.BLADESHROOM_HUNTER, BladeshroomHunterModel::createBodyLayer);
event.registerLayerDefinition(AetherIIModelLayers.ROT_SENTINEL, RotSentinelModel::createBodyLayer);

// Projectiles
event.registerLayerDefinition(AetherIIModelLayers.GRAVITITE_DEBRIS_SHOT, GravititeDebrisShotModel::createBodyLayer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.aetherteam.aetherii.client.renderer.AetherIIModelLayers;
import com.aetherteam.aetherii.client.renderer.entity.model.BladeshroomHunterModel;
import com.aetherteam.aetherii.client.renderer.entity.state.BladeshroomHunterRenderState;
import com.aetherteam.aetherii.entity.monster.BladeshroomHunter;
import com.aetherteam.aetherii.entity.monster.dungeon.BladeshroomHunter;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.aetherteam.aetherii.client.renderer.entity;

import com.aetherteam.aetherii.AetherII;
import com.aetherteam.aetherii.client.renderer.AetherIIModelLayers;
import com.aetherteam.aetherii.client.renderer.entity.model.RotSentinelModel;
import com.aetherteam.aetherii.entity.monster.dungeon.RotSentinel;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
import net.minecraft.resources.Identifier;

public class RotSentinelRenderer<T extends RotSentinel> extends MobRenderer<T, LivingEntityRenderState, RotSentinelModel<LivingEntityRenderState>> {
private static final Identifier LOCATION = Identifier.fromNamespaceAndPath(AetherII.MODID, "textures/entity/mobs/rot_sentinel/rot_sentinel.png");

public RotSentinelRenderer(EntityRendererProvider.Context context) {
super(context, new RotSentinelModel<>(context.bakeLayer(AetherIIModelLayers.ROT_SENTINEL)), 0.5F);
}

@Override
public LivingEntityRenderState createRenderState() {
return new LivingEntityRenderState();
}

@Override
public void extractRenderState(T bladeshroomHunter, LivingEntityRenderState renderState, float p_361157_) {
super.extractRenderState(bladeshroomHunter, renderState, p_361157_);
}

@Override
public Identifier getTextureLocation(LivingEntityRenderState renderState) {
return LOCATION;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package com.aetherteam.aetherii.client.renderer.entity.model;

import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*;
import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;

public class RotSentinelModel<T extends LivingEntityRenderState> extends EntityModel<T> {
private final ModelPart RotSentinel;
private final ModelPart Hip;
private final ModelPart Leg;
private final ModelPart Chestplate;
private final ModelPart Head;
private final ModelPart Chest;
private final ModelPart Roots;
private final ModelPart Arm_R;
private final ModelPart Arm_L;

public RotSentinelModel(ModelPart root) {
super(root);
this.RotSentinel = root.getChild("RotSentinel");
this.Hip = this.RotSentinel.getChild("Hip");
this.Leg = this.RotSentinel.getChild("Leg");
this.Chestplate = this.RotSentinel.getChild("Chestplate");
this.Head = this.RotSentinel.getChild("Head");
this.Chest = this.RotSentinel.getChild("Chest");
this.Roots = this.RotSentinel.getChild("Roots");
this.Arm_R = this.RotSentinel.getChild("Arm_R");
this.Arm_L = this.RotSentinel.getChild("Arm_L");
}

public static LayerDefinition createBodyLayer() {
MeshDefinition meshdefinition = new MeshDefinition();
PartDefinition partdefinition = meshdefinition.getRoot();

PartDefinition RotSentinel = partdefinition.addOrReplaceChild("RotSentinel", CubeListBuilder.create(), PartPose.offset(0.0F, 2.3505F, -11.1543F));

PartDefinition Hip = RotSentinel.addOrReplaceChild("Hip", CubeListBuilder.create(), PartPose.offset(0.0F, 3.091F, 9.3829F));

PartDefinition Hip_r1 = Hip.addOrReplaceChild("Hip_r1", CubeListBuilder.create().texOffs(88, 51).addBox(-4.0F, -5.0F, -3.0F, 8.0F, 10.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, -0.1309F, 0.0F, 0.0F));

PartDefinition Leg = RotSentinel.addOrReplaceChild("Leg", CubeListBuilder.create(), PartPose.offset(-0.5F, 19.1495F, 10.9043F));

PartDefinition Leg_r1 = Leg.addOrReplaceChild("Leg_r1", CubeListBuilder.create().texOffs(4, 64).addBox(-1.0F, -12.0F, -2.0F, 3.0F, 10.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0873F, 0.0F, 0.0F));

PartDefinition Chestplate = RotSentinel.addOrReplaceChild("Chestplate", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 1.0F));

PartDefinition Left_r1 = Chestplate.addOrReplaceChild("Left_r1", CubeListBuilder.create().texOffs(105, 70).addBox(-5.0F, -5.0F, 0.0F, 10.0F, 12.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(6.5F, -0.3505F, -0.0957F, 0.1173F, -0.6133F, 1.1432F));

PartDefinition Right_r1 = Chestplate.addOrReplaceChild("Right_r1", CubeListBuilder.create().texOffs(83, 70).addBox(-5.0F, -5.0F, 0.0F, 10.0F, 12.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-6.5F, -0.3505F, -0.0957F, 0.1173F, 0.6133F, -1.1432F));

PartDefinition Head = RotSentinel.addOrReplaceChild("Head", CubeListBuilder.create(), PartPose.offset(0.0095F, -8.6854F, 1.4619F));

PartDefinition Head_r1 = Head.addOrReplaceChild("Head_r1", CubeListBuilder.create().texOffs(86, 2).addBox(-5.0F, -3.0F, -2.5F, 10.0F, 7.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.5F, 0.3044F, 0.3967F, 0.0F, 0.6545F, 1.5708F));

PartDefinition Chest = RotSentinel.addOrReplaceChild("Chest", CubeListBuilder.create(), PartPose.offsetAndRotation(0.0F, -3.4842F, 4.0888F, 0.2618F, 0.0F, 0.0F));

PartDefinition Front_r1 = Chest.addOrReplaceChild("Front_r1", CubeListBuilder.create().texOffs(86, 17).addBox(-7.0F, 2.0F, 2.0F, 14.0F, 6.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -4.1257F, -7.6245F, 0.3491F, 0.0F, 0.0F));

PartDefinition Main_r1 = Chest.addOrReplaceChild("Main_r1", CubeListBuilder.create().texOffs(79, 28).addBox(-14.0F, -15.0F, 2.0F, 14.0F, 12.0F, 9.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(7.0F, 11.1336F, 0.0655F, 0.3491F, 0.0F, 0.0F));

PartDefinition Roots = RotSentinel.addOrReplaceChild("Roots", CubeListBuilder.create().texOffs(0, -14).addBox(0.0F, -6.0F, -18.375F, 0.0F, 12.0F, 18.0F, new CubeDeformation(0.0F))
.texOffs(39, -14).addBox(0.0F, -6.0F, 0.625F, 0.0F, 12.0F, 18.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.1315F, 15.6395F, 9.3202F, 0.0F, -0.7854F, 0.0F));

PartDefinition Root_R_r1 = Roots.addOrReplaceChild("Root_R_r1", CubeListBuilder.create().texOffs(0, 1).addBox(0.0F, -6.0F, -10.0F, 0.0F, 12.0F, 18.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-9.0F, 0.0F, -0.125F, 0.0F, 1.5708F, 0.0F));

PartDefinition Root_L_r1 = Roots.addOrReplaceChild("Root_L_r1", CubeListBuilder.create().texOffs(39, 1).addBox(0.0F, -6.0F, -9.0F, 0.0F, 12.0F, 18.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(10.0F, 0.0F, -0.125F, 0.0F, 1.5708F, 0.0F));

PartDefinition Arm_R = RotSentinel.addOrReplaceChild("Arm_R", CubeListBuilder.create(), PartPose.offsetAndRotation(-11.4167F, -6.1131F, 7.9239F, -0.1745F, 0.0F, 0.0F));

PartDefinition Joint_r1 = Arm_R.addOrReplaceChild("Joint_r1", CubeListBuilder.create().texOffs(41, 106).addBox(-10.0F, -1.0F, 1.0F, 2.0F, 6.0F, 3.0F, new CubeDeformation(0.0F))
.texOffs(97, 101).addBox(-17.0F, -5.0F, -1.0F, 7.0F, 13.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(12.4167F, -2.3863F, -3.5193F, -0.1745F, 0.0F, 0.0F));

PartDefinition Shoulder_Blade_r1 = Arm_R.addOrReplaceChild("Shoulder_Blade_r1", CubeListBuilder.create().texOffs(57, 36).addBox(-2.0F, -12.0F, -3.0F, 0.0F, 13.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(1.9167F, -8.6244F, 2.4392F, -0.5236F, 0.0F, 0.0F));

PartDefinition Shoulder_Bump_r1 = Arm_R.addOrReplaceChild("Shoulder_Bump_r1", CubeListBuilder.create().texOffs(19, 121).addBox(-2.0F, -1.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-0.0833F, -7.6244F, 1.9392F, -0.1745F, 0.0F, 0.0F));

PartDefinition Arm_r1 = Arm_R.addOrReplaceChild("Arm_r1", CubeListBuilder.create().texOffs(2, 117).addBox(-1.5F, -3.0F, -2.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-0.5833F, 7.5712F, -4.2389F, -0.7854F, 0.0F, 0.0F));

PartDefinition BladeCover_r1 = Arm_R.addOrReplaceChild("BladeCover_r1", CubeListBuilder.create().texOffs(1, 85).addBox(0.5F, -1.6073F, -2.7544F, 3.0F, 2.0F, 12.0F, new CubeDeformation(0.0F))
.texOffs(34, 85).addBox(25.5F, -1.6073F, -2.7544F, 3.0F, 2.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-3.0833F, 11.3212F, -6.9889F, -0.7854F, 0.0F, 0.0F));

PartDefinition Blade_r1 = Arm_R.addOrReplaceChild("Blade_r1", CubeListBuilder.create().texOffs(0, 29).addBox(0.5F, -1.6073F, -2.7544F, 0.0F, 8.0F, 20.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-1.5833F, 7.5712F, -4.2389F, -0.6981F, 0.0F, 0.0F));

PartDefinition Arm_L = RotSentinel.addOrReplaceChild("Arm_L", CubeListBuilder.create(), PartPose.offsetAndRotation(11.4167F, -6.1131F, 7.9239F, -0.1745F, 0.0F, 0.0F));

PartDefinition Joint_r2 = Arm_L.addOrReplaceChild("Joint_r2", CubeListBuilder.create().texOffs(21, 106).addBox(-10.0F, -1.0F, 1.0F, 2.0F, 6.0F, 3.0F, new CubeDeformation(0.0F))
.texOffs(65, 101).addBox(-8.0F, -5.0F, -1.0F, 7.0F, 13.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(5.5833F, -2.3863F, -3.5193F, -0.1745F, 0.0F, 0.0F));

PartDefinition Shoulder_Blade_r2 = Arm_L.addOrReplaceChild("Shoulder_Blade_r2", CubeListBuilder.create().texOffs(44, 36).addBox(-2.0F, -12.0F, -3.0F, 0.0F, 13.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(2.0833F, -8.6244F, 2.4392F, -0.5236F, 0.0F, 0.0F));

PartDefinition Shoulder_Bump_r2 = Arm_L.addOrReplaceChild("Shoulder_Bump_r2", CubeListBuilder.create().texOffs(38, 121).addBox(-2.0F, -1.0F, -2.0F, 4.0F, 2.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0833F, -7.6244F, 1.9392F, -0.1745F, 0.0F, 0.0F));

PartDefinition Arm_r2 = Arm_L.addOrReplaceChild("Arm_r2", CubeListBuilder.create().texOffs(2, 104).addBox(-1.5F, -3.0F, -2.0F, 2.0F, 6.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(1.5833F, 7.5712F, -4.2389F, -0.7854F, 0.0F, 0.0F));

PartDefinition Blade_r2 = Arm_L.addOrReplaceChild("Blade_r2", CubeListBuilder.create().texOffs(0, 19).addBox(0.5F, -1.6073F, -2.7544F, 0.0F, 8.0F, 20.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.5833F, 7.5712F, -4.2389F, -0.6981F, 0.0F, 0.0F));

return LayerDefinition.create(meshdefinition, 128, 128);
}

@Override
public void setupAnim(LivingEntityRenderState entity) {

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,7 @@ private void addItems() {
this.addSpawnEggItem(AetherIIItems.SENTRY_GOLEM_SPAWN_EGG);
this.addItem(AetherIIItems.SENTRY_CRATE_MIMIC_SPAWN_EGG, "Sentry Crate Mimic Spawn Egg");
this.addSpawnEggItem(AetherIIItems.SLIDER_SPAWN_EGG);
this.addSpawnEggItem(AetherIIItems.ROT_SENTINEL_SPAWN_EGG, "Rot Sentinel Spawn Egg");

// Misc
this.addItem(AetherIIItems.BEAST_PELT_BUNDLE, "Beast Pelt Bundle");
Expand Down Expand Up @@ -1455,6 +1456,7 @@ private void addEntityTypes() {
this.addEntityType(AetherIIEntityTypes.SENTRY_GOLEM, "Sentry Golem");
this.addEntityType(AetherIIEntityTypes.SLIDER, "Slider");
this.addEntityType(AetherIIEntityTypes.BLADESHROOM_HUNTER, "Bladeshroom Hunter");
this.addEntityType(AetherIIEntityTypes.ROT_SENTINEL, "Rot Sentinel");

// Projectile
this.addEntityType(AetherIIEntityTypes.HOLYSTONE_ROCK, "Holystone Rock");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ public void generate() {
);

this.add(AetherIIEntityTypes.BLADESHROOM_HUNTER.get(), LootTable.lootTable());
this.add(AetherIIEntityTypes.ROT_SENTINEL.get(), LootTable.lootTable());

this.add(AetherIIEntityTypes.MIMIC.get(), LootTable.lootTable()
// .withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)) // TODO WIP ALPHA THINGS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ public void run() {
this.generateFlatItem(AetherIIItems.SENTRY_GOLEM_SPAWN_EGG.get(), ModelTemplates.FLAT_ITEM);
this.generateFlatItem(AetherIIItems.SENTRY_CRATE_MIMIC_SPAWN_EGG.get(), ModelTemplates.FLAT_ITEM);
this.generateFlatItem(AetherIIItems.SLIDER_SPAWN_EGG.get(), ModelTemplates.FLAT_ITEM);
this.generateFlatItem(AetherIIItems.ROT_SENTINEL_SPAWN_EGG.get(), ModelTemplates.FLAT_ITEM);

// Misc
this.generateBundleModels(AetherIIItems.BEAST_PELT_BUNDLE.get());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,13 @@ public void addTags(HolderLookup.Provider provider) {
AetherIIEntityTypes.SENTRY_GOLEM.get(),
AetherIIEntityTypes.SLIDER.get()
);
this.tag(AetherIITags.EntityTypes.DUNGEON_MOBS).addTag(
AetherIITags.EntityTypes.SENTRY_RUINS_MOBS
this.tag(AetherIITags.EntityTypes.GUARDIAN_TREE_MOBS).add(
AetherIIEntityTypes.BLADESHROOM_HUNTER.get(),
AetherIIEntityTypes.ROT_SENTINEL.get()
);
this.tag(AetherIITags.EntityTypes.DUNGEON_MOBS).addTags(
AetherIITags.EntityTypes.SENTRY_RUINS_MOBS,
AetherIITags.EntityTypes.GUARDIAN_TREE_MOBS
);

this.tag(AetherIITags.EntityTypes.NO_DOUBLE_DROPS).add(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class AetherIIEntityIds {
public static final ResourceKey<EntityType<?>> SENTRY_GOLEM = createKey("sentry_golem");
public static final ResourceKey<EntityType<?>> SLIDER = createKey("slider");
public static final ResourceKey<EntityType<?>> BLADESHROOM_HUNTER = createKey("bladeshroom_hunter");
public static final ResourceKey<EntityType<?>> ROT_SENTINEL = createKey("rot_sentinel");


//NPCs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.aetherteam.aetherii.entity;

import com.aetherteam.aetherii.AetherII;
import com.aetherteam.aetherii.entity.monster.BladeshroomHunter;
import com.aetherteam.aetherii.entity.monster.dungeon.BladeshroomHunter;
import com.aetherteam.aetherii.entity.passive.Kirrid;
import com.aetherteam.aetherii.entity.passive.Sheepuff;
import com.aetherteam.aetherii.entity.variant.GlitterwingVariant;
Expand Down
Loading