diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index bb682a3..2ca5496 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,5 +1,6 @@ -// 1.21.1 2026-09-28T22:23:06.416820898 Registries +// 1.21.1 2026-09-29T16:57:54.505766212 Registries ead89faabf72208190d381bb26c0381632944e55 data/masterwild/neoforge/biome_modifier/spawn_butterfly.json +5b1394075b71f32144518c3778e59a37c35788b7 data/masterwild/neoforge/biome_modifier/spawn_capybara.json 7d8ae6f7dfb59ddf054cabf0a1169a571465c6bc data/masterwild/neoforge/biome_modifier/spawn_firefly.json 794f7cd1a27f9d8b96379fb661eab0d120cad281 data/masterwild/neoforge/biome_modifier/spawn_hedgehog.json 3d5b931996cbc1319a2e2afe8ddc7e455f407f18 data/masterwild/neoforge/biome_modifier/spawn_monkey.json diff --git a/src/generated/resources/.cache/6143fb1502ae754d8039ff811e28c49eaa7e6409 b/src/generated/resources/.cache/6143fb1502ae754d8039ff811e28c49eaa7e6409 index 00efaac..2b06a35 100644 --- a/src/generated/resources/.cache/6143fb1502ae754d8039ff811e28c49eaa7e6409 +++ b/src/generated/resources/.cache/6143fb1502ae754d8039ff811e28c49eaa7e6409 @@ -1,2 +1,2 @@ -// 1.21.1 2026-09-28T22:05:37.903072944 Languages: en_us for mod: masterwild -df1875a313c5fc24443af962c80c27a3f57525b5 assets/masterwild/lang/en_us.json +// 1.21.1 2026-09-29T16:23:56.996726612 Languages: en_us for mod: masterwild +35f1e1ce16f4613ff411eec96f0bcb280108e169 assets/masterwild/lang/en_us.json diff --git a/src/generated/resources/.cache/d1416cf72769a6a520cc2c44944968403e1a0de7 b/src/generated/resources/.cache/d1416cf72769a6a520cc2c44944968403e1a0de7 index 86d0d37..043eeb5 100644 --- a/src/generated/resources/.cache/d1416cf72769a6a520cc2c44944968403e1a0de7 +++ b/src/generated/resources/.cache/d1416cf72769a6a520cc2c44944968403e1a0de7 @@ -1,7 +1,8 @@ -// 1.21.1 2026-09-28T22:05:54.295366081 Item Models: masterwild +// 1.21.1 2026-09-29T16:23:56.997419393 Item Models: masterwild a92e1a88c1d3c3c04b2b001f0bffd19a1f3462f0 assets/masterwild/models/item/banana.json 8cb5b876c97ae89d180a200612d0d14c8456c2f7 assets/masterwild/models/item/banana_peel.json 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/masterwild/models/item/butterfly_spawn_egg.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/masterwild/models/item/capybara_spawn_egg.json 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/masterwild/models/item/firefly_spawn_egg.json 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/masterwild/models/item/hedgehog_spawn_egg.json 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/masterwild/models/item/monkey_spawn_egg.json diff --git a/src/generated/resources/assets/masterwild/lang/en_us.json b/src/generated/resources/assets/masterwild/lang/en_us.json index bf19c1a..815a5fb 100644 --- a/src/generated/resources/assets/masterwild/lang/en_us.json +++ b/src/generated/resources/assets/masterwild/lang/en_us.json @@ -1,6 +1,7 @@ { "creativetab.masterwild.masterwild": "MasterWild", "entity.masterwild.butterfly": "Butterfly", + "entity.masterwild.capybara": "Capybara", "entity.masterwild.firefly": "Firefly", "entity.masterwild.hedgehog": "Hedgehog", "entity.masterwild.monkey": "Monkey", @@ -12,6 +13,7 @@ "item.masterwild.banana": "Banana", "item.masterwild.banana_peel": "Banana Peel", "item.masterwild.butterfly_spawn_egg": "Butterfly Spawn Egg", + "item.masterwild.capybara_spawn_egg": "Capybara Spawn Egg", "item.masterwild.firefly_spawn_egg": "Firefly Spawn Egg", "item.masterwild.hedgehog_spawn_egg": "Hedgehog Spawn Egg", "item.masterwild.monkey_spawn_egg": "Monkey Spawn Egg", diff --git a/src/generated/resources/assets/masterwild/models/item/capybara_spawn_egg.json b/src/generated/resources/assets/masterwild/models/item/capybara_spawn_egg.json new file mode 100644 index 0000000..d1aaa9d --- /dev/null +++ b/src/generated/resources/assets/masterwild/models/item/capybara_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/template_spawn_egg" +} \ No newline at end of file diff --git a/src/generated/resources/data/masterwild/neoforge/biome_modifier/spawn_capybara.json b/src/generated/resources/data/masterwild/neoforge/biome_modifier/spawn_capybara.json new file mode 100644 index 0000000..ad51bb3 --- /dev/null +++ b/src/generated/resources/data/masterwild/neoforge/biome_modifier/spawn_capybara.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_spawns", + "biomes": [ + "minecraft:mangrove_swamp", + "minecraft:swamp", + "minecraft:savanna" + ], + "spawners": { + "type": "masterwild:capybara", + "maxCount": 4, + "minCount": 3, + "weight": 5 + } +} \ No newline at end of file diff --git a/src/main/java/ovh/glitchlabs/masterwild/Item/ModCreativeModeTabs.java b/src/main/java/ovh/glitchlabs/masterwild/Item/ModCreativeModeTabs.java index 1505950..113a83d 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/Item/ModCreativeModeTabs.java +++ b/src/main/java/ovh/glitchlabs/masterwild/Item/ModCreativeModeTabs.java @@ -31,6 +31,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.BUTTERFLY_SPAWN_EGG); output.accept(ModItems.RACCOON_SPAWN_EGG); output.accept(ModItems.MONKEY_SPAWN_EGG); + output.accept(ModItems.CAPYBARA_SPAWN_EGG); }).build()); diff --git a/src/main/java/ovh/glitchlabs/masterwild/Item/ModItems.java b/src/main/java/ovh/glitchlabs/masterwild/Item/ModItems.java index b9f9a8e..c87578b 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/Item/ModItems.java +++ b/src/main/java/ovh/glitchlabs/masterwild/Item/ModItems.java @@ -52,6 +52,9 @@ public class ModItems { public static final DeferredItem MONKEY_SPAWN_EGG = ITEMS.register("monkey_spawn_egg", () -> new DeferredSpawnEggItem(ModEntities.MONKEY, 0x795136, 0x9e9178, new Item.Properties())); + public static final DeferredItem CAPYBARA_SPAWN_EGG = ITEMS.register("capybara_spawn_egg", + () -> new DeferredSpawnEggItem(ModEntities.CAPYBARA, 0x372a21, 0x9e9178, + new Item.Properties())); public static void register(IEventBus eventBus) { ITEMS.register(eventBus); diff --git a/src/main/java/ovh/glitchlabs/masterwild/Masterwild.java b/src/main/java/ovh/glitchlabs/masterwild/Masterwild.java index 9bb099e..e5c4884 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/Masterwild.java +++ b/src/main/java/ovh/glitchlabs/masterwild/Masterwild.java @@ -25,6 +25,7 @@ import ovh.glitchlabs.masterwild.entity.client.Raccoon.RaccoonRenderer; import ovh.glitchlabs.masterwild.entity.client.Rooster.RoosterRenderer; import ovh.glitchlabs.masterwild.entity.client.Shark.SharkRenderer; import ovh.glitchlabs.masterwild.entity.client.butterfly.ButterflyRenderer; +import ovh.glitchlabs.masterwild.entity.client.capibara.CapybaraRenderer; import ovh.glitchlabs.masterwild.entity.client.firefly.FireflyRenderer; import ovh.glitchlabs.masterwild.entity.client.hedgehog.HedgehogRenderer; import ovh.glitchlabs.masterwild.entity.client.red_panda.Red_PandaRenderer; @@ -84,6 +85,7 @@ public class Masterwild { EntityRenderers.register(ModEntities.BUTTERFLY.get(), ButterflyRenderer::new); EntityRenderers.register(ModEntities.RACCOON.get(), RaccoonRenderer::new); EntityRenderers.register(ModEntities.MONKEY.get(), MonkeyRenderer::new); + EntityRenderers.register(ModEntities.CAPYBARA.get(), CapybaraRenderer::new); } } } diff --git a/src/main/java/ovh/glitchlabs/masterwild/datagen/ModItemModelProvider.java b/src/main/java/ovh/glitchlabs/masterwild/datagen/ModItemModelProvider.java index 725c036..c6cea78 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/datagen/ModItemModelProvider.java +++ b/src/main/java/ovh/glitchlabs/masterwild/datagen/ModItemModelProvider.java @@ -30,5 +30,6 @@ public class ModItemModelProvider extends ItemModelProvider { withExistingParent(ModItems.BUTTERFLY_SPAWN_EGG.getId().getPath(), mcLoc("item/template_spawn_egg")); withExistingParent(ModItems.RACCOON_SPAWN_EGG.getId().getPath(), mcLoc("item/template_spawn_egg")); withExistingParent(ModItems.MONKEY_SPAWN_EGG.getId().getPath(), mcLoc("item/template_spawn_egg")); + withExistingParent(ModItems.CAPYBARA_SPAWN_EGG.getId().getPath(), mcLoc("item/template_spawn_egg")); } } \ No newline at end of file diff --git a/src/main/java/ovh/glitchlabs/masterwild/datagen/ModLanguageProvider.java b/src/main/java/ovh/glitchlabs/masterwild/datagen/ModLanguageProvider.java index c96b6d5..dfef3d3 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/datagen/ModLanguageProvider.java +++ b/src/main/java/ovh/glitchlabs/masterwild/datagen/ModLanguageProvider.java @@ -26,6 +26,7 @@ public class ModLanguageProvider extends LanguageProvider { add(ModEntities.BUTTERFLY.get(), "Butterfly"); add(ModEntities.RACCOON.get(), "Raccoon"); add(ModEntities.MONKEY.get(), "Monkey"); + add(ModEntities.CAPYBARA.get(), "Capybara"); add(ModItems.PINGUIN_SPAWN_EGG.get(), "Pinguin Spawn Egg"); add(ModItems.FIREFLY_SPAWN_EGG.get(), "Firefly Spawn Egg"); @@ -36,6 +37,7 @@ public class ModLanguageProvider extends LanguageProvider { add(ModItems.BUTTERFLY_SPAWN_EGG.get(), "Butterfly Spawn Egg"); add(ModItems.RACCOON_SPAWN_EGG.get(), "Raccoon Spawn Egg"); add(ModItems.MONKEY_SPAWN_EGG.get(), "Monkey Spawn Egg"); + add(ModItems.CAPYBARA_SPAWN_EGG.get(), "Capybara Spawn Egg"); add("creativetab.masterwild.masterwild", "MasterWild"); diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/client/capibara/CapybaraModel.java b/src/main/java/ovh/glitchlabs/masterwild/entity/client/capibara/CapybaraModel.java index b8739b9..2b141bf 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/client/capibara/CapybaraModel.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/client/capibara/CapybaraModel.java @@ -48,24 +48,24 @@ public class CapybaraModel extends HierarchicalModel> { private static final ResourceLocation TEXTURE = - ResourceLocation.fromNamespaceAndPath(Masterwild.MODID, "textures/entity/capibara.png"); - private static final float ADULT_SCALE = 1.5f; + ResourceLocation.fromNamespaceAndPath(Masterwild.MODID, "textures/entity/capybara.png"); + private static final float ADULT_SCALE = 1.0f; private static final float BABY_SCALE = 0.5f; private static final float SHADOW = 0.45f; diff --git a/src/main/java/ovh/glitchlabs/masterwild/event/ModEventBusEvents.java b/src/main/java/ovh/glitchlabs/masterwild/event/ModEventBusEvents.java index 914f144..5a8e801 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/event/ModEventBusEvents.java +++ b/src/main/java/ovh/glitchlabs/masterwild/event/ModEventBusEvents.java @@ -6,6 +6,7 @@ import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent; import ovh.glitchlabs.masterwild.Masterwild; import ovh.glitchlabs.masterwild.entity.ModEntities; +import ovh.glitchlabs.masterwild.entity.client.Monkey.MonkeyModel; import ovh.glitchlabs.masterwild.entity.client.Pinguin.PinguinModel; import ovh.glitchlabs.masterwild.entity.client.Raccoon.RaccoonModel; import ovh.glitchlabs.masterwild.entity.client.Rooster.RoosterModel; @@ -29,7 +30,8 @@ public class ModEventBusEvents { event.registerLayerDefinition(Red_PandaModel.LAYER_LOCATION, Red_PandaModel::createBodyLayer); event.registerLayerDefinition(ButterflyModel.LAYER_LOCATION, ButterflyModel::createBodyLayer); event.registerLayerDefinition(RaccoonModel.LAYER_LOCATION, RaccoonModel::createBodyLayer); - event.registerLayerDefinition(CapybaraModel.LAYER_LOCATION, RaccoonModel::createBodyLayer); + event.registerLayerDefinition(MonkeyModel.LAYER_LOCATION, MonkeyModel::createBodyLayer); + event.registerLayerDefinition(CapybaraModel.LAYER_LOCATION, CapybaraModel::createBodyLayer); } @SubscribeEvent @@ -41,6 +43,7 @@ public class ModEventBusEvents { event.put(ModEntities.HEDGEHOG.get(), HedgehogEntity.createAttributes().build()); event.put(ModEntities.RED_PANDA.get(), Red_PandaEntity.createAttributes().build()); event.put(ModEntities.RACCOON.get(), RaccoonEntity.createAttributes().build()); + event.put(ModEntities.MONKEY.get(), MonkeyEntity.createAttributes().build()); event.put(ModEntities.CAPYBARA.get(), CapybaraEntity.createAttributes().build()); } } diff --git a/src/main/java/ovh/glitchlabs/masterwild/event/ModSpawnPlacements.java b/src/main/java/ovh/glitchlabs/masterwild/event/ModSpawnPlacements.java index b8c7d0d..637cc96 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/event/ModSpawnPlacements.java +++ b/src/main/java/ovh/glitchlabs/masterwild/event/ModSpawnPlacements.java @@ -33,6 +33,9 @@ public class ModSpawnPlacements { event.register(ModEntities.MONKEY.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.REPLACE); + event.register(ModEntities.CAPYBARA.get(), SpawnPlacementTypes.ON_GROUND, + Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules, + RegisterSpawnPlacementsEvent.Operation.REPLACE); event.register(ModEntities.SHARK.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.OCEAN_FLOOR, WaterAnimal::checkSurfaceWaterAnimalSpawnRules, diff --git a/src/main/java/ovh/glitchlabs/masterwild/worldgen/ModBiomeModifiers.java b/src/main/java/ovh/glitchlabs/masterwild/worldgen/ModBiomeModifiers.java index 5ecf132..f58ef51 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/worldgen/ModBiomeModifiers.java +++ b/src/main/java/ovh/glitchlabs/masterwild/worldgen/ModBiomeModifiers.java @@ -29,6 +29,7 @@ public class ModBiomeModifiers { public static final ResourceKey SPAWN_RED_PANDA = registerKey("spawn_red_panda"); public static final ResourceKey SPAWN_BUTTERFLY = registerKey("spawn_butterfly"); public static final ResourceKey SPAWN_MONKEY = registerKey("spawn_monkey"); + public static final ResourceKey SPAWN_CAPYBARA = registerKey("spawn_capybara"); public static void bootstrap(BootstrapContext context) { var placedFeatures = context.lookup(Registries.PLACED_FEATURE); @@ -95,6 +96,13 @@ public class ModBiomeModifiers { biomes.getOrThrow(Biomes.PLAINS), biomes.getOrThrow(Biomes.CHERRY_GROVE)), ModEntities.BUTTERFLY.get(), 10, 3, 6); + + addSpawn(context, SPAWN_CAPYBARA, + HolderSet.direct( + biomes.getOrThrow(Biomes.MANGROVE_SWAMP), + biomes.getOrThrow(Biomes.SWAMP), + biomes.getOrThrow(Biomes.SAVANNA)), + ModEntities.CAPYBARA.get(), 5, 3, 4); } private static void addSpawn(BootstrapContext context, ResourceKey key, diff --git a/src/main/resources/assets/masterwild/textures/entity/capybara.png b/src/main/resources/assets/masterwild/textures/entity/capybara.png new file mode 100755 index 0000000..1331c9c Binary files /dev/null and b/src/main/resources/assets/masterwild/textures/entity/capybara.png differ