Add a baby bogged

Author: pupnewfster

build.gradle

@@ -378,7 +378,8 @@ dependencies {
         datagenMainRuntimeOnly(emi)
     }
 
-    localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
+    //TODO: Re-enable once it doesn't cause Datagen to fail
+    //localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
 
     compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}:api")
     localRuntime("mcjty.theoneprobe:theoneprobe:${top_version}")
@@ -678,7 +679,7 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
                     //World gen
                     'biomes-o-plenty',
                     //Misc
-                    'applied-energistics-2', 'ctm', 'curios', 'dark-mode-everywhere', 'farmers-delight', 'female-gender-forge', 'flux-networks',
+                    'applied-energistics-2', 'ctm', 'curios-continuation', 'dark-mode-everywhere', 'female-gender-forge', 'flux-networks',
                     'json-things', 'perviaminvenire', 'projecte', 'recipe-stages'
             )
         }
@@ -750,7 +751,6 @@ if (System.getenv('MODRINTH_TOKEN') != null || project.hasProperty('modrinthToke
                 new ModDependency('XxWD5pD3', 'optional'),//AE2
                 new ModDependency('gu7yAYhd', 'optional'),//CC: Tweaked
                 new ModDependency('Xg35A4rS', 'optional'),//CraftTweaker
-                new ModDependency('vvuO3ImH', 'optional'),//Curios
                 new ModDependency('fRiHVvU7', 'optional'),//EMI
                 new ModDependency('R2OftAxM', 'optional'),//Farmer's Delight
                 new ModDependency('nvQzSEkH', 'optional'),//Jade

src/additions/java/mekanism/additions/client/AdditionsClientRegistration.java

@@ -21,6 +21,7 @@
 import mekanism.common.registration.impl.ItemRegistryObject;
 import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.renderer.entity.BoggedRenderer;
 import net.minecraft.client.renderer.entity.SkeletonRenderer;
 import net.minecraft.client.renderer.entity.StrayRenderer;
 import net.minecraft.client.renderer.entity.WitherSkeletonRenderer;
@@ -58,6 +59,7 @@ public static void registerRenderers(EntityRenderersEvent.RegisterRenderers even
         //Register entity rendering handlers
         event.registerEntityRenderer(AdditionsEntityTypes.OBSIDIAN_TNT.get(), RenderObsidianTNTPrimed::new);
         event.registerEntityRenderer(AdditionsEntityTypes.BALLOON.get(), RenderBalloon::new);
+        event.registerEntityRenderer(AdditionsEntityTypes.BABY_BOGGED.get(), BoggedRenderer::new);
         event.registerEntityRenderer(AdditionsEntityTypes.BABY_CREEPER.get(), RenderBabyCreeper::new);
         event.registerEntityRenderer(AdditionsEntityTypes.BABY_ENDERMAN.get(), RenderBabyEnderman::new);
         event.registerEntityRenderer(AdditionsEntityTypes.BABY_SKELETON.get(), SkeletonRenderer::new);

src/additions/java/mekanism/additions/common/AdditionsTags.java

@@ -100,6 +100,7 @@ public static class Entities {
         private Entities() {
         }
 
+        public static final TagKey<EntityType<?>> BOGGED = commonTag("bogged");
         public static final TagKey<EntityType<?>> CREEPERS = commonTag("creepers");
         public static final TagKey<EntityType<?>> ENDERMEN = commonTag("endermen");
 

src/additions/java/mekanism/additions/common/config/AdditionsConfig.java

@@ -49,6 +49,7 @@ public class AdditionsConfig extends BaseMekanismConfig {
               .defineInRange("VoicePort", 36_123, 1, 65_535));
 
         builder.comment("Config options regarding spawning of entities.").push("spawning");
+        addBabyTypeConfig(BabyType.BOGGED, builder, AdditionsEntityTypes.BABY_BOGGED, EntityType.BOGGED);
         addBabyTypeConfig(BabyType.CREEPER, builder, AdditionsEntityTypes.BABY_CREEPER, EntityType.CREEPER);
         addBabyTypeConfig(BabyType.ENDERMAN, builder, AdditionsEntityTypes.BABY_ENDERMAN, EntityType.ENDERMAN);
         addBabyTypeConfig(BabyType.SKELETON, builder, AdditionsEntityTypes.BABY_SKELETON, EntityType.SKELETON);

src/additions/java/mekanism/additions/common/entity/baby/BabyType.java

@@ -6,6 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public enum BabyType implements StringRepresentable {
+    BOGGED,
     CREEPER,
     ENDERMAN,
     SKELETON,

src/additions/java/mekanism/additions/common/entity/baby/EntityBabyBogged.java

@@ -0,0 +1,20 @@
+package mekanism.additions.common.entity.baby;
+
+import mekanism.additions.common.registries.AdditionsEntityTypes;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.monster.Bogged;
+import net.minecraft.world.level.Level;
+
+public class EntityBabyBogged extends Bogged {
+
+    public EntityBabyBogged(EntityType<EntityBabyBogged> type, Level world) {
+        super(type, world);
+        this.xpReward = (int) (this.xpReward * 2.5);
+        AdditionsEntityTypes.setupBabyModifiers(this);
+    }
+
+    @Override
+    public boolean isBaby() {
+        return true;
+    }
+}

src/additions/java/mekanism/additions/common/registries/AdditionsCreativeTabs.java

@@ -42,8 +42,9 @@ private static void addToExistingTabs(BuildCreativeModeTabContentsEvent event) {
         } else if (tabKey == CreativeModeTabs.COMBAT) {
             CreativeTabDeferredRegister.addToDisplay(event, AdditionsBlocks.OBSIDIAN_TNT);
         } else if (tabKey == CreativeModeTabs.SPAWN_EGGS) {
-            CreativeTabDeferredRegister.addToDisplay(event, AdditionsItems.BABY_CREEPER_SPAWN_EGG, AdditionsItems.BABY_ENDERMAN_SPAWN_EGG,
-                  AdditionsItems.BABY_SKELETON_SPAWN_EGG, AdditionsItems.BABY_STRAY_SPAWN_EGG, AdditionsItems.BABY_WITHER_SKELETON_SPAWN_EGG);
+            CreativeTabDeferredRegister.addToDisplay(event, AdditionsItems.BABY_BOGGED_SPAWN_EGG, AdditionsItems.BABY_CREEPER_SPAWN_EGG,
+                  AdditionsItems.BABY_ENDERMAN_SPAWN_EGG, AdditionsItems.BABY_SKELETON_SPAWN_EGG, AdditionsItems.BABY_STRAY_SPAWN_EGG,
+                  AdditionsItems.BABY_WITHER_SKELETON_SPAWN_EGG);
         }
     }
 

src/additions/java/mekanism/additions/common/registries/AdditionsEntityTypes.java

@@ -5,6 +5,7 @@
 import mekanism.additions.common.MekanismAdditions;
 import mekanism.additions.common.entity.EntityBalloon;
 import mekanism.additions.common.entity.EntityObsidianTNT;
+import mekanism.additions.common.entity.baby.EntityBabyBogged;
 import mekanism.additions.common.entity.baby.EntityBabyCreeper;
 import mekanism.additions.common.entity.baby.EntityBabyEnderman;
 import mekanism.additions.common.entity.baby.EntityBabySkeleton;
@@ -26,6 +27,7 @@
 import net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.monster.AbstractSkeleton;
+import net.minecraft.world.entity.monster.Bogged;
 import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.level.block.Block;
@@ -41,6 +43,7 @@ private AdditionsEntityTypes() {
 
     public static final EntityTypeDeferredRegister ENTITY_TYPES = new EntityTypeDeferredRegister(MekanismAdditions.MODID);
 
+    public static final MekanismDeferredHolder<EntityType<?>, EntityType<EntityBabyBogged>> BABY_BOGGED = ENTITY_TYPES.registerBasicMonster("baby_bogged", () -> baby(EntityBabyBogged::new, EntityType.BOGGED), Bogged::createAttributes);
     public static final MekanismDeferredHolder<EntityType<?>, EntityType<EntityBabyCreeper>> BABY_CREEPER = ENTITY_TYPES.registerBasicMonster("baby_creeper", () -> baby(EntityBabyCreeper::new, EntityType.CREEPER, 0.625F), Creeper::createAttributes);
     public static final MekanismDeferredHolder<EntityType<?>, EntityType<EntityBabyEnderman>> BABY_ENDERMAN = ENTITY_TYPES.registerBasicMonster("baby_enderman", () -> baby(EntityBabyEnderman::new, EntityType.ENDERMAN, 0.525F), EnderMan::createAttributes);
     public static final MekanismDeferredHolder<EntityType<?>, EntityType<EntityBabySkeleton>> BABY_SKELETON = ENTITY_TYPES.registerBasicMonster("baby_skeleton", () -> baby(EntityBabySkeleton::new, EntityType.SKELETON), AbstractSkeleton::createAttributes);

src/additions/java/mekanism/additions/common/registries/AdditionsItems.java

@@ -18,6 +18,7 @@ private AdditionsItems() {
 
     public static final ItemDeferredRegister ITEMS = new ItemDeferredRegister(MekanismAdditions.MODID);
 
+    public static final ItemRegistryObject<DeferredSpawnEggItem> BABY_BOGGED_SPAWN_EGG = ITEMS.registerSpawnEgg(AdditionsEntityTypes.BABY_BOGGED, 0x8FB85A, 0x1D3B06);
     public static final ItemRegistryObject<DeferredSpawnEggItem> BABY_CREEPER_SPAWN_EGG = ITEMS.registerSpawnEgg(AdditionsEntityTypes.BABY_CREEPER, 0x31E02F, 0x1E1E1E);
     public static final ItemRegistryObject<DeferredSpawnEggItem> BABY_ENDERMAN_SPAWN_EGG = ITEMS.registerSpawnEgg(AdditionsEntityTypes.BABY_ENDERMAN, 0x242424, 0x1E1E1E);
     public static final ItemRegistryObject<DeferredSpawnEggItem> BABY_SKELETON_SPAWN_EGG = ITEMS.registerSpawnEgg(AdditionsEntityTypes.BABY_SKELETON, 0xFFFFFF, 0x800080);

src/additions/resources/assets/mekanismadditions/models/item/baby_bogged_spawn_egg.json

@@ -0,0 +1,3 @@
+{
+  "parent": "item/template_spawn_egg"
+}