From 640d412992474f63f4ad6a89e5ae9fc24f606105 Mon Sep 17 00:00:00 2001
From: itsmeow <itsmeow@itsmeow.dev>
Date: Thu, 22 Dec 2022 08:39:29 -0500
Subject: [PATCH] Preliminary 1.19.3 support
---
.../BetterAnimalsPlusMod.java | 18 +++++------
.../client/ClientLifecycleHandler.java | 24 +++++++-------
.../client/model/armor/ModelBearCape.java | 6 ++--
.../client/model/armor/ModelWolfCape.java | 6 ++--
.../client/model/block/ModelTrillium.java | 4 +--
.../model/block/ModelTrilliumMulti.java | 4 +--
.../model/block/ModelTrilliumMulti2.java | 4 +--
.../client/model/entity/ModelLamprey.java | 4 +--
.../client/model/entity/ModelPiranha.java | 4 +--
.../blockentity/RenderBlockTrillium.java | 4 +--
.../renderer/entity/RenderTarantulaHair.java | 15 +++++----
.../common/CommonEventHandler.java | 7 ++--
.../common/entity/EntityGoose.java | 7 ++--
.../common/entity/EntityReindeer.java | 2 +-
.../entity/projectile/EntityBadgerDirt.java | 6 ++--
.../entity/projectile/EntityModEgg.java | 3 +-
.../projectile/EntityTarantulaHair.java | 4 +--
.../EntityTameableBetterAnimalsPlus.java | 7 ++--
.../common/item/ItemBetterFood.java | 2 +-
.../common/item/ItemCape.java | 2 +-
.../common/item/ItemHorseshoeCrabBlood.java | 2 +-
.../common/item/ItemThrowableCustomEgg.java | 2 +-
.../init/ModBlockEntities.java | 4 +--
.../betteranimalsplus/init/ModBlocks.java | 4 +--
.../betteranimalsplus/init/ModEntities.java | 8 ++---
.../betteranimalsplus/init/ModItems.java | 8 ++---
.../betteranimalsplus/init/ModResources.java | 6 ++--
.../init/ModSoundEvents.java | 6 ++--
.../betteranimalsplus/init/ModWorldGen.java | 17 +++++-----
.../mixin/LocalPlayerMixin.java | 6 ++--
.../models/block/turkey_eaten_1_cooked.json | 2 +-
.../models/block/turkey_eaten_1_raw.json | 2 +-
.../models/block/turkey_eaten_2_cooked.json | 2 +-
.../models/block/turkey_eaten_2_raw.json | 2 +-
.../models/block/turkey_eaten_3_cooked.json | 2 +-
.../models/block/turkey_eaten_3_raw.json | 2 +-
.../models/block/turkey_eaten_4_cooked.json | 2 +-
.../models/block/turkey_eaten_4_raw.json | 2 +-
.../models/block/turkey_eaten_5_cooked.json | 2 +-
.../models/block/turkey_eaten_5_raw.json | 2 +-
.../models/block/turkey_eaten_6_cooked.json | 2 +-
.../models/block/turkey_eaten_6_raw.json | 2 +-
.../models/block/turkey_eaten_7_cooked.json | 2 +-
.../models/block/turkey_eaten_7_raw.json | 2 +-
.../models/block/turkey_whole_cooked.json | 2 +-
.../models/block/turkey_whole_raw.json | 2 +-
.../models/item/advancement_icon_badger.json | 2 +-
.../item/advancement_icon_jellyfish.json | 2 +-
.../advancement_icon_jellyfish_cross.json | 2 +-
.../models/item/advancement_icon_lamprey.json | 2 +-
.../models/item/advancement_icon_octopus.json | 2 +-
.../models/item/advancement_icon_shark.json | 2 +-
.../item/advancement_icon_squirrel.json | 2 +-
.../item/advancement_icon_succening.json | 2 +-
.../betteranimalsplus/models/item/antler.json | 2 +-
.../models/item/barracuda_bucket.json | 4 +--
.../models/item/bear_cape_black.json | 2 +-
.../models/item/bear_cape_brown.json | 2 +-
.../models/item/bear_cape_kermode.json | 2 +-
.../models/item/bear_skin_black.json | 2 +-
.../models/item/bear_skin_brown.json | 2 +-
.../models/item/bear_skin_kermode.json | 2 +-
.../models/item/blackbearhead_black.json | 2 +-
.../models/item/blackbearhead_kermode.json | 2 +-
.../models/item/blubber.json | 2 +-
.../models/item/boarhead_dark_brown.json | 2 +-
.../models/item/boarhead_gray.json | 2 +-
.../models/item/boarhead_light_brown.json | 2 +-
.../models/item/bottled_butterfly.json | 2 +-
.../models/item/bottled_dragonfly.json | 2 +-
.../models/item/brownbearhead_1.json | 2 +-
.../models/item/calamari_cooked.json | 2 +-
.../models/item/calamari_raw.json | 2 +-
.../models/item/coyotehead_1.json | 2 +-
.../models/item/crab_bucket.json | 4 +--
.../models/item/crab_meat_cooked.json | 2 +-
.../models/item/crab_meat_raw.json | 2 +-
.../models/item/deerhead_1.json | 2 +-
.../models/item/deerhead_2.json | 2 +-
.../models/item/deerhead_3.json | 2 +-
.../models/item/deerhead_4.json | 2 +-
.../models/item/eel_freshwater_bucket.json | 4 +--
.../models/item/eel_meat_cooked.json | 2 +-
.../models/item/eel_meat_raw.json | 2 +-
.../models/item/eel_saltwater_bucket.json | 4 +--
.../models/item/feralwolfhead_arctic.json | 2 +-
.../models/item/feralwolfhead_black.json | 2 +-
.../models/item/feralwolfhead_brown.json | 2 +-
.../models/item/feralwolfhead_red.json | 2 +-
.../models/item/feralwolfhead_snowy.json | 2 +-
.../models/item/feralwolfhead_timber.json | 2 +-
.../models/item/flying_fish_bucket.json | 4 +--
.../item/flying_fish_bucket_purple.json | 4 +--
.../item/flying_fish_bucket_yellow.json | 4 +--
.../models/item/fried_egg.json | 2 +-
.../models/item/golden_goose_egg.json | 2 +-
.../models/item/goose_egg.json | 2 +-
.../models/item/horseshoe_crab_blood.json | 2 +-
.../models/item/horseshoecrab_bucket.json | 4 +--
.../models/item/jellyfish_bucket.json | 4 +--
.../models/item/lamprey_bucket.json | 4 +--
.../models/item/moosehead_1.json | 2 +-
.../models/item/moosehead_2.json | 2 +-
.../models/item/moosehead_3.json | 2 +-
.../models/item/moosehead_4.json | 2 +-
.../models/item/nautilus_bucket.json | 4 +--
.../models/item/pheasant_egg.json | 2 +-
.../models/item/pheasantcooked.json | 2 +-
.../models/item/pheasantraw.json | 2 +-
.../models/item/piranha_bucket.json | 4 +--
.../models/item/record_crab_rave.json | 2 +-
.../models/item/record_walrus.json | 2 +-
.../models/item/reindeerhead_1.json | 2 +-
.../models/item/reindeerhead_2.json | 2 +-
.../models/item/reindeerhead_3.json | 2 +-
.../models/item/reindeerhead_4.json | 2 +-
.../models/item/saltwater_eel_bucket.json | 2 +-
.../models/item/trillium.json | 2 +-
.../models/item/turkey_egg.json | 2 +-
.../models/item/turkey_leg_cooked.json | 2 +-
.../models/item/turkey_leg_raw.json | 2 +-
.../models/item/venisoncooked.json | 2 +-
.../models/item/venisonraw.json | 2 +-
.../models/item/wolf_cape_arctic.json | 2 +-
.../models/item/wolf_cape_black.json | 2 +-
.../models/item/wolf_cape_brown.json | 2 +-
.../models/item/wolf_cape_classic.json | 2 +-
.../models/item/wolf_cape_red.json | 2 +-
.../models/item/wolf_cape_timber.json | 2 +-
.../models/item/wolf_pelt_arctic.json | 2 +-
.../models/item/wolf_pelt_black.json | 2 +-
.../models/item/wolf_pelt_brown.json | 2 +-
.../models/item/wolf_pelt_red.json | 2 +-
.../models/item/wolf_pelt_snowy.json | 2 +-
.../models/item/wolf_pelt_timber.json | 2 +-
.../turkey_block_slice_1_cooked.png | Bin
.../turkey_block_slice_1_raw.png | Bin
.../turkey_block_slice_2_cooked.png | Bin
.../turkey_block_slice_2_raw.png | Bin
.../turkey_block_slice_3_cooked.png | Bin
.../turkey_block_slice_3_raw.png | Bin
.../turkey_block_whole_cooked.png | Bin
.../turkey_block_whole_raw.png | Bin
.../advancement_icon_badger.png | Bin
.../advancement_icon_jellyfish.png | Bin
.../advancement_icon_jellyfish_cross.png | Bin
.../advancement_icon_lamprey.png | Bin
.../advancement_icon_octopus.png | Bin
.../advancement_icon_shark.png | Bin
.../advancement_icon_squirrel.png | Bin
.../advancement_icon_succening.png | Bin
.../textures/{items => item}/antler.png | Bin
.../{items => item}/bear_cape_black.png | Bin
.../{items => item}/bear_cape_brown.png | Bin
.../{items => item}/bear_cape_kermode.png | Bin
.../{items => item}/bear_skin_black.png | Bin
.../{items => item}/bear_skin_brown.png | Bin
.../{items => item}/bear_skin_kermode.png | Bin
.../textures/{items => item}/blubber.png | Bin
.../{items => item}/boarhead_dark_brown.png | Bin
.../{items => item}/boarhead_gray.png | Bin
.../{items => item}/boarhead_light_brown.png | Bin
.../{items => item}/boarhead_white.png | Bin
.../{items => item}/bottled_butterfly.png | Bin
.../{items => item}/bottled_dragonfly.png | Bin
.../bucket_content/barracuda.png | Bin
.../{items => item}/bucket_content/crab.png | Bin
.../bucket_content/eel_freshwater.png | Bin
.../bucket_content/eel_saltwater.png | Bin
.../bucket_content/flying_fish.png | Bin
.../bucket_content/flying_fish_purple.png | Bin
.../bucket_content/flying_fish_yellow.png | Bin
.../bucket_content/horseshoecrab.png | Bin
.../bucket_content/jellyfish.png | Bin
.../bucket_content/lamprey.png | Bin
.../bucket_content/nautilus.png | Bin
.../bucket_content/piranha.png | Bin
.../{items => item}/calamari_cooked.png | Bin
.../textures/{items => item}/calamari_raw.png | Bin
.../textures/{items => item}/coyotehead_1.png | Bin
.../{items => item}/crab_meat_cooked.png | Bin
.../{items => item}/crab_meat_raw.png | Bin
.../textures/{items => item}/crab_rave.png | Bin
.../{items => item}/eel_meat_cooked.png | Bin
.../textures/{items => item}/eel_meat_raw.png | Bin
.../{items => item}/feralwolfhead_arctic.png | Bin
.../{items => item}/feralwolfhead_black.png | Bin
.../{items => item}/feralwolfhead_brown.png | Bin
.../{items => item}/feralwolfhead_red.png | Bin
.../{items => item}/feralwolfhead_snowy.png | Bin
.../{items => item}/feralwolfhead_timber.png | Bin
.../textures/{items => item}/fried_egg.png | Bin
.../{items => item}/golden_goose_egg.png | Bin
.../textures/{items => item}/goose_egg.png | Bin
.../{items => item}/head_bear_black.png | Bin
.../{items => item}/head_bear_brown.png | Bin
.../{items => item}/head_bear_kermode.png | Bin
.../textures/{items => item}/head_deer_1.png | Bin
.../textures/{items => item}/head_deer_2.png | Bin
.../textures/{items => item}/head_deer_3.png | Bin
.../textures/{items => item}/head_deer_4.png | Bin
.../textures/{items => item}/head_moose_1.png | Bin
.../textures/{items => item}/head_moose_2.png | Bin
.../textures/{items => item}/head_moose_3.png | Bin
.../textures/{items => item}/head_moose_4.png | Bin
.../{items => item}/horseshoe_crab_blood.png | Bin
.../textures/{items => item}/lower_bucket.png | Bin
.../{items => item}/pheasant_cooked.png | Bin
.../textures/{items => item}/pheasant_egg.png | Bin
.../textures/{items => item}/pheasant_raw.png | Bin
.../{items => item}/record_walrus.png | Bin
.../textures/{items => item}/reindeerhead.png | Bin
.../{items => item}/reindeerhead_white.png | Bin
.../textures/{items => item}/trillium.png | Bin
.../textures/{items => item}/trillium2.png | Bin
.../textures/{items => item}/turkey_egg.png | Bin
.../{items => item}/turkey_leg_cooked.png | Bin
.../{items => item}/turkey_leg_raw.png | Bin
.../{items => item}/venison_cooked.png | Bin
.../textures/{items => item}/venison_raw.png | Bin
.../{items => item}/wolf_cape_arctic.png | Bin
.../{items => item}/wolf_cape_black.png | Bin
.../{items => item}/wolf_cape_brown.png | Bin
.../{items => item}/wolf_cape_classic.png | Bin
.../{items => item}/wolf_cape_red.png | Bin
.../{items => item}/wolf_cape_timber.png | Bin
.../{items => item}/wolf_pelt_arctic.png | Bin
.../{items => item}/wolf_pelt_black.png | Bin
.../{items => item}/wolf_pelt_brown.png | Bin
.../{items => item}/wolf_pelt_red.png | Bin
.../{items => item}/wolf_pelt_snowy.png | Bin
.../{items => item}/wolf_pelt_timber.png | Bin
fabric/build.gradle | 4 +--
.../fabric/BetterAnimalsPlusClientFabric.java | 4 +--
.../fabric/BetterAnimalsPlusModImpl.java | 30 ------------------
fabric/src/main/resources/fabric.mod.json | 4 +--
.../forge/BetterAnimalsPlusModImpl.java | 26 ---------------
forge/src/main/resources/META-INF/mods.toml | 6 ++--
gradle.properties | 20 ++++++------
239 files changed, 235 insertions(+), 289 deletions(-)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_slice_1_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_slice_1_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_slice_2_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_slice_2_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_slice_3_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_slice_3_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_whole_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{blocks => block}/turkey_block_whole_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_badger.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_jellyfish.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_jellyfish_cross.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_lamprey.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_octopus.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_shark.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_squirrel.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/advancement_icon_succening.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/antler.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bear_cape_black.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bear_cape_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bear_cape_kermode.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bear_skin_black.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bear_skin_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bear_skin_kermode.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/blubber.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/boarhead_dark_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/boarhead_gray.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/boarhead_light_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/boarhead_white.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bottled_butterfly.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bottled_dragonfly.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/barracuda.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/crab.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/eel_freshwater.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/eel_saltwater.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/flying_fish.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/flying_fish_purple.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/flying_fish_yellow.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/horseshoecrab.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/jellyfish.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/lamprey.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/nautilus.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/bucket_content/piranha.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/calamari_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/calamari_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/coyotehead_1.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/crab_meat_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/crab_meat_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/crab_rave.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/eel_meat_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/eel_meat_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/feralwolfhead_arctic.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/feralwolfhead_black.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/feralwolfhead_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/feralwolfhead_red.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/feralwolfhead_snowy.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/feralwolfhead_timber.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/fried_egg.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/golden_goose_egg.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/goose_egg.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_bear_black.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_bear_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_bear_kermode.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_deer_1.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_deer_2.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_deer_3.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_deer_4.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_moose_1.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_moose_2.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_moose_3.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/head_moose_4.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/horseshoe_crab_blood.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/lower_bucket.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/pheasant_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/pheasant_egg.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/pheasant_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/record_walrus.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/reindeerhead.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/reindeerhead_white.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/trillium.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/trillium2.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/turkey_egg.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/turkey_leg_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/turkey_leg_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/venison_cooked.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/venison_raw.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_cape_arctic.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_cape_black.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_cape_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_cape_classic.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_cape_red.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_cape_timber.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_pelt_arctic.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_pelt_black.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_pelt_brown.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_pelt_red.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_pelt_snowy.png (100%)
rename common/src/main/resources/assets/betteranimalsplus/textures/{items => item}/wolf_pelt_timber.png (100%)
delete mode 100644 fabric/src/main/java/dev/itsmeow/betteranimalsplus/fabric/BetterAnimalsPlusModImpl.java
delete mode 100644 forge/src/main/java/dev/itsmeow/betteranimalsplus/forge/BetterAnimalsPlusModImpl.java
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/BetterAnimalsPlusMod.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/BetterAnimalsPlusMod.java
index 8ad318d6..b69feb03 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/BetterAnimalsPlusMod.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/BetterAnimalsPlusMod.java
@@ -2,11 +2,9 @@
import com.google.common.collect.ImmutableList;
import dev.architectury.event.events.common.PlayerEvent;
-import dev.architectury.injectables.annotations.ExpectPlatform;
import dev.architectury.networking.NetworkChannel;
-import dev.architectury.platform.Platform;
+import dev.architectury.registry.CreativeTabRegistry;
import dev.architectury.utils.Env;
-import dev.architectury.utils.PlatformExpectedError;
import dev.itsmeow.betteranimalsplus.client.dumb.SafeSyncThing;
import dev.itsmeow.betteranimalsplus.common.CommonEventHandler;
import dev.itsmeow.betteranimalsplus.common.entity.EntityCoyote;
@@ -19,7 +17,8 @@
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -71,24 +70,23 @@ public static void construct() {
}
public static void init(Consumer<Runnable> enqueue) {
+ BetterAnimalsPlusMod.addEggItems();
ModWorldGen.init(enqueue);
LOGGER.info("Overspawning lammergeiers...");
}
public static boolean isDev(UUID uuid) {
- //return DEVS.contains(uuid);
- return true;
+ return DEVS.contains(uuid);
}
public static boolean isDev(Player player) {
return isDev(player.getGameProfile().getId());
}
- public static final CreativeModeTab TAB = getPlatformTab();
+ public static final CreativeTabRegistry.TabSupplier TAB = CreativeTabRegistry.create(new ResourceLocation(Ref.MOD_ID, "main"), () -> new ItemStack(ModItems.ANTLER.get()));
- @ExpectPlatform
- public static CreativeModeTab getPlatformTab() {
- throw new PlatformExpectedError("getPlatformTab(): Expected Platform");
+ public static void addEggItems() {
+ CreativeTabRegistry.append(TAB, ModEntities.getEntities().values().stream().map(cont -> cont.getEggItem().get()).collect(Collectors.toList()).toArray(new ItemLike[0]));
}
public static void onPlayerJoin(ServerPlayer player) {
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/ClientLifecycleHandler.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/ClientLifecycleHandler.java
index f493449c..f8164ca2 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/ClientLifecycleHandler.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/ClientLifecycleHandler.java
@@ -1,7 +1,7 @@
package dev.itsmeow.betteranimalsplus.client;
import com.google.common.collect.ImmutableMap;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.architectury.platform.Platform;
import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry;
import dev.itsmeow.betteranimalsplus.BetterAnimalsPlusMod;
@@ -60,7 +60,7 @@ public static void registerEntityRenders() {
RenderFactory.addRender(ModEntities.PROJECTILE_TARANTULA_HAIR::get, RenderTarantulaHair::new);
R.addRender(ModEntities.TARANTULA::getEntityType, 1F, r -> r.tVariant().mSingle(ModelTarantula::new, "tarantula").preRender((e, s, p) -> {
if(e.isClimbing()) {
- s.mulPose(Vector3f.XP.rotationDegrees(-90F));
+ s.mulPose(Axis.XP.rotationDegrees(-90F));
s.translate(0.0F, 0.75F, -0.5F);
}
}).layer(t -> new LayerEyes<>(t, ModResources.tarantula_eyes)));
@@ -82,7 +82,7 @@ public static void registerEntityRenders() {
R.addRender(ModEntities.LAMPREY::getEntityType, 0.4F, r -> r.tVariant().mSingle(ModelLamprey::new, "lamprey").preRender((e, s, p) -> {
s.scale(0.5F, 0.5F, 0.5F);
if(e.getVehicle() != null) {
- s.mulPose(Vector3f.YP.rotationDegrees(180F));
+ s.mulPose(Axis.YP.rotationDegrees(180F));
s.translate(0, 0, 0.5F);
}
}));
@@ -184,29 +184,29 @@ public static void registerEntityRenders() {
float f = Mth.lerp(p, e.prevSquidPitch, e.squidPitch);
float f1 = Mth.lerp(p, e.prevSquidYaw, e.squidYaw);
s.translate(0.0F, 0.5F, 0.0F);
- s.mulPose(Vector3f.YP.rotationDegrees(180.0F - y));
- s.mulPose(Vector3f.XP.rotationDegrees(f));
- s.mulPose(Vector3f.YP.rotationDegrees(f1));
+ s.mulPose(Axis.YP.rotationDegrees(180.0F - y));
+ s.mulPose(Axis.XP.rotationDegrees(f));
+ s.mulPose(Axis.YP.rotationDegrees(f1));
s.translate(0.0F, -1.2F, 0.0F);
}));
R.addRender(ModEntities.SQUID_GIANT::getEntityType, 3F, r -> r.tSingle("squid_giant").mSingle(ModelGiantSquid::new, "giant_squid").simpleScale(e -> 2.2F).handleRotation((e, p) -> Mth.lerp(p, e.lastTentacleAngle, e.tentacleAngle)).applyRotations((e, s, a, y, p) -> {
float f = Mth.lerp(p, e.prevSquidPitch, e.squidPitch);
float f1 = Mth.lerp(p, e.prevSquidYaw, e.squidYaw);
s.translate(0.0F, 0.5F, 0.0F);
- s.mulPose(Vector3f.YP.rotationDegrees(180.0F - y));
- s.mulPose(Vector3f.XP.rotationDegrees(f));
- s.mulPose(Vector3f.YP.rotationDegrees(f1));
+ s.mulPose(Axis.YP.rotationDegrees(180.0F - y));
+ s.mulPose(Axis.XP.rotationDegrees(f));
+ s.mulPose(Axis.YP.rotationDegrees(f1));
s.translate(0.0F, -1.2F, 0.0F);
}));
R.addRender(ModEntities.PIRANHA::getEntityType, 0.4F, r -> r.tSingle("piranha").mSingle(ModelPiranha::new, "piranha").simpleScale(e -> 0.3F));
R.addRender(ModEntities.OCTOPUS::getEntityType, 1F, r -> r.tVariant().mSingle(ModelOctopus::new, "octopus").handleRotation((e, p) -> Mth.lerp(p, e.lastTentacleAngle, e.tentacleAngle)).applyRotations((e, s, a, y, p) -> {
// s.translate(0.0F, 0.5F, 0.0F);
- s.mulPose(Vector3f.YP.rotationDegrees(180.0F - y));
+ s.mulPose(Axis.YP.rotationDegrees(180.0F - y));
if(e.isInWaterOrBubble() && (!e.isAboveBlock() || e.getDeltaMovement().length() > 0.01)) {
float f = Mth.lerp(p, e.prevSquidPitch, e.squidPitch);
float f1 = Mth.lerp(p, e.prevSquidYaw, e.squidYaw);
- s.mulPose(Vector3f.XP.rotationDegrees(f));
- s.mulPose(Vector3f.YP.rotationDegrees(f1));
+ s.mulPose(Axis.XP.rotationDegrees(f));
+ s.mulPose(Axis.YP.rotationDegrees(f1));
}
// s.translate(0.0F, -1.2F, 0.0F);
}));
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelBearCape.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelBearCape.java
index 61f68d04..60afe7a2 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelBearCape.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelBearCape.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.ModelPart;
@@ -89,8 +89,8 @@ public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int
matrixStackIn.translate(0.0F, 0.05F, 0.025F);
float angle = 6.0F + f2_r / 2.0F + f1_r;
angle = Math.min(angle, 90F);
- matrixStackIn.mulPose(Vector3f.XP.rotationDegrees(angle));
- matrixStackIn.mulPose(Vector3f.ZP.rotationDegrees(f3_r / 2.0F));
+ matrixStackIn.mulPose(Axis.XP.rotationDegrees(angle));
+ matrixStackIn.mulPose(Axis.ZP.rotationDegrees(f3_r / 2.0F));
super.renderToBuffer(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
matrixStackIn.popPose();
this.bearCapeArmL1.visible = true;
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelWolfCape.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelWolfCape.java
index 0fed3397..6782efc5 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelWolfCape.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/armor/ModelWolfCape.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.ModelPart;
@@ -98,8 +98,8 @@ public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int
matrixStackIn.translate(0.0F, 0.05F, 0.025F);
float angle = 6.0F + f2_r / 2.0F + f1_r;
angle = Math.min(angle, 90F);
- matrixStackIn.mulPose(Vector3f.XP.rotationDegrees(angle));
- matrixStackIn.mulPose(Vector3f.ZP.rotationDegrees(f3_r / 2.0F));
+ matrixStackIn.mulPose(Axis.XP.rotationDegrees(angle));
+ matrixStackIn.mulPose(Axis.ZP.rotationDegrees(f3_r / 2.0F));
super.renderToBuffer(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
matrixStackIn.popPose();
this.wolfCapeArmL1.visible = true;
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrillium.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrillium.java
index 44093b6d..73f27ddf 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrillium.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrillium.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.client.model.abstracts.ModelBAP;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
@@ -102,7 +102,7 @@ public void setupAnim(T entityIn, float limbSwing, float limbSwingAmount, float
@Override
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float r, float g, float b, float a) {
- poseStack.mulPose(Vector3f.YP.rotationDegrees(rotation)); // Yaw
+ poseStack.mulPose(Axis.YP.rotationDegrees(rotation)); // Yaw
stem01.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
stem02.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
stem03.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti.java
index 945be280..7a317afe 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.client.model.abstracts.ModelBAP;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
@@ -96,7 +96,7 @@ public void setupAnim(T entityIn, float limbSwing, float limbSwingAmount, float
@Override
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float r, float g, float b, float a) {
- poseStack.mulPose(Vector3f.YP.rotationDegrees(rotation)); // Yaw
+ poseStack.mulPose(Axis.YP.rotationDegrees(rotation)); // Yaw
stem01.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
stem02.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
stem03.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti2.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti2.java
index f9474df4..dd210c5f 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti2.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/ModelTrilliumMulti2.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.client.model.abstracts.ModelBAP;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
@@ -121,7 +121,7 @@ public static LayerDefinition createBodyLayer() {
@Override
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float r, float g, float b, float a) {
- poseStack.mulPose(Vector3f.YP.rotationDegrees(rotation)); // Yaw
+ poseStack.mulPose(Axis.YP.rotationDegrees(rotation)); // Yaw
stem01.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
stem02.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
stem03.render(poseStack, buffer, packedLight, packedOverlay, r, g, b, a);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelLamprey.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelLamprey.java
index 7f9f3706..99900676 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelLamprey.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelLamprey.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.client.model.abstracts.ModelBAP;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
@@ -71,7 +71,7 @@ public static LayerDefinition createBodyLayer() {
@Override
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
if (putOnSide) {
- matrixStackIn.mulPose(Vector3f.ZP.rotationDegrees(90F));
+ matrixStackIn.mulPose(Axis.ZP.rotationDegrees(90F));
matrixStackIn.translate(1.5F, -1.75F, 0F);
}
this.body01.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelPiranha.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelPiranha.java
index d87a2e1f..f00d2bd5 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelPiranha.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/ModelPiranha.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.client.model.abstracts.ModelBAP;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
@@ -95,7 +95,7 @@ public void renderToBuffer(PoseStack stack, VertexConsumer bufferIn, int packedL
stack.pushPose();
{
if (!this.isInWater) {
- stack.mulPose(Vector3f.ZP.rotationDegrees(90F));
+ stack.mulPose(Axis.ZP.rotationDegrees(90F));
stack.translate(2F, -1F, 0F);
}
this.body.render(stack, bufferIn, packedLightIn, packedOverlayIn);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/blockentity/RenderBlockTrillium.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/blockentity/RenderBlockTrillium.java
index d9144438..7cea3210 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/blockentity/RenderBlockTrillium.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/blockentity/RenderBlockTrillium.java
@@ -1,7 +1,7 @@
package dev.itsmeow.betteranimalsplus.client.renderer.blockentity;
import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.Ref;
import dev.itsmeow.betteranimalsplus.client.model.block.ModelTrillium;
import dev.itsmeow.betteranimalsplus.client.model.block.ModelTrilliumMulti;
@@ -46,7 +46,7 @@ public void render(BlockEntityTrillium blockEntity, float partialTicks, PoseStac
matrixStackIn.pushPose();
{
matrixStackIn.translate(0.5F, 1.5F, 0.5F);
- matrixStackIn.mulPose(Vector3f.ZP.rotationDegrees(180F));
+ matrixStackIn.mulPose(Axis.ZP.rotationDegrees(180F));
matrixStackIn.pushPose();
{
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/entity/RenderTarantulaHair.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/entity/RenderTarantulaHair.java
index 01ddbd26..01e8fa1b 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/entity/RenderTarantulaHair.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/client/renderer/entity/RenderTarantulaHair.java
@@ -2,9 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix3f;
-import com.mojang.math.Matrix4f;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.itsmeow.betteranimalsplus.common.entity.projectile.EntityTarantulaHair;
import dev.itsmeow.betteranimalsplus.init.ModResources;
import net.minecraft.client.renderer.MultiBufferSource;
@@ -14,6 +12,9 @@
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
+import org.joml.Matrix3f;
+import org.joml.Matrix4f;
+import org.joml.Vector3f;
public class RenderTarantulaHair extends EntityRenderer<EntityTarantulaHair> {
@@ -24,9 +25,9 @@ public RenderTarantulaHair(EntityRendererProvider.Context ctx) {
@Override
public void render(EntityTarantulaHair entityIn, float entityYaw, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn, int packedLightIn) {
matrixStackIn.pushPose();
- matrixStackIn.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(partialTicks, entityIn.yRotO, entityIn.getYRot()) - 90.0F));
- matrixStackIn.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(partialTicks, entityIn.xRotO, entityIn.getXRot())));
- matrixStackIn.mulPose(Vector3f.XP.rotationDegrees(45.0F));
+ matrixStackIn.mulPose(Axis.YP.rotationDegrees(Mth.lerp(partialTicks, entityIn.yRotO, entityIn.getYRot()) - 90.0F));
+ matrixStackIn.mulPose(Axis.ZP.rotationDegrees(Mth.lerp(partialTicks, entityIn.xRotO, entityIn.getXRot())));
+ matrixStackIn.mulPose(Axis.XP.rotationDegrees(45.0F));
matrixStackIn.scale(0.05625F, 0.05625F, 0.05625F);
matrixStackIn.translate(-4.0D, 0.0D, 0.0D);
VertexConsumer ivertexbuilder = bufferIn.getBuffer(RenderType.entityCutout(this.getTextureLocation(entityIn)));
@@ -43,7 +44,7 @@ public void render(EntityTarantulaHair entityIn, float entityYaw, float partialT
this.vert(matrix4f, matrix3f, ivertexbuilder, -7, -2, -2, 0.0F, 0.3125F, 1, 0, 0, packedLightIn);
for (int j = 0; j < 4; ++j) {
- matrixStackIn.mulPose(Vector3f.XP.rotationDegrees(90.0F));
+ matrixStackIn.mulPose(Axis.XP.rotationDegrees(90.0F));
this.vert(matrix4f, matrix3f, ivertexbuilder, -8, -2, 0, 0.0F, 0.0F, 0, 1, 0, packedLightIn);
this.vert(matrix4f, matrix3f, ivertexbuilder, 8, -2, 0, 0.5F, 0.0F, 0, 1, 0, packedLightIn);
this.vert(matrix4f, matrix3f, ivertexbuilder, 8, 2, 0, 0.5F, 0.15625F, 0, 1, 0, packedLightIn);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/CommonEventHandler.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/CommonEventHandler.java
index b1d4856e..17d59afc 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/CommonEventHandler.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/CommonEventHandler.java
@@ -7,9 +7,7 @@
import dev.architectury.event.events.common.EntityEvent;
import dev.architectury.event.events.common.InteractionEvent;
import dev.architectury.injectables.annotations.ExpectPlatform;
-import dev.architectury.registry.registries.Registries;
import dev.architectury.utils.PlatformExpectedError;
-import dev.itsmeow.betteranimalsplus.Ref;
import dev.itsmeow.betteranimalsplus.common.entity.*;
import dev.itsmeow.betteranimalsplus.common.entity.util.IHaveHunger;
import dev.itsmeow.betteranimalsplus.common.entity.util.abstracts.EntitySharkBase;
@@ -17,12 +15,13 @@
import dev.itsmeow.betteranimalsplus.init.ModLootTables;
import dev.itsmeow.betteranimalsplus.init.ModTriggers;
import dev.itsmeow.betteranimalsplus.mixin.MobAccessor;
+import dev.itsmeow.imdlib.IMDLib;
import dev.itsmeow.imdlib.entity.interfaces.IBucketable;
import dev.itsmeow.imdlib.entity.util.variant.IVariant;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
@@ -134,7 +133,7 @@ public static EventResult rightClickBlock(Player player, InteractionHand hand, B
public static CompoundEventResult<ItemStack> rightClickItem(Player player, InteractionHand hand) {
ItemStack stack = player.getItemInHand(hand);
- ResourceLocation reg = Registries.get(Ref.MOD_ID).get(Registry.ITEM_REGISTRY).getId(stack.getItem());
+ ResourceLocation reg = IMDLib.getRegistry(Registries.ITEM).getId(stack.getItem());
if(reg != null && reg.getPath().equals("portable_jukebox") && player instanceof ServerPlayer) {
if(stack.getTagElement("Disc") != null) {
Item item = ItemStack.of(stack.getTagElement("Disc")).getItem();
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityGoose.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityGoose.java
index f439beec..5693b2f9 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityGoose.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityGoose.java
@@ -8,14 +8,15 @@
import dev.itsmeow.betteranimalsplus.init.ModEntities;
import dev.itsmeow.betteranimalsplus.init.ModItems;
import dev.itsmeow.betteranimalsplus.init.ModSoundEvents;
+import dev.itsmeow.imdlib.IMDLib;
import dev.itsmeow.imdlib.entity.EntityTypeContainer;
import dev.itsmeow.imdlib.entity.util.variant.IVariant;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
import net.minecraft.core.particles.ItemParticleOption;
import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.StringTag;
@@ -266,10 +267,10 @@ public boolean canHoldItem(ItemStack newStack) {
public boolean isPickupBlacklisted(Item item) {
for(String itemsId : (List<String>) getContainer().getCustomConfiguration().getAnyHolder(List.class, PICKUP_BLOCK_LIST_KEY).get()) {
if (itemsId.startsWith("#")) {
- if(item.builtInRegistryHolder().is(TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation(itemsId.substring(1))))) {
+ if(item.builtInRegistryHolder().is(TagKey.create(Registries.ITEM, new ResourceLocation(itemsId.substring(1))))) {
return true;
}
- } else if(itemsId.equals(Registry.ITEM.getKey(item).toString())) {
+ } else if(itemsId.equals(IMDLib.getRegistry(Registries.ITEM).getKey(item).toString())) {
return true;
}
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityReindeer.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityReindeer.java
index 826aacf8..1592e1ea 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityReindeer.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityReindeer.java
@@ -794,7 +794,7 @@ public void onPlayerJump(int jumpPowerIn) {
}
@Override
- public boolean canJump() {
+ public boolean canJump(Player player) {
return true;
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityBadgerDirt.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityBadgerDirt.java
index 85535591..5436f1eb 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityBadgerDirt.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityBadgerDirt.java
@@ -1,13 +1,13 @@
package dev.itsmeow.betteranimalsplus.common.entity.projectile;
-import dev.itsmeow.betteranimalsplus.init.ModTriggers;
import dev.architectury.networking.NetworkManager;
+import dev.itsmeow.betteranimalsplus.init.ModTriggers;
import net.minecraft.core.particles.BlockParticleOption;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.Difficulty;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
@@ -86,7 +86,7 @@ protected void onHit(HitResult result) {
}
@Override
- public Packet<?> getAddEntityPacket() {
+ public Packet<ClientGamePacketListener> getAddEntityPacket() {
return NetworkManager.createAddEntityPacket(this);
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityModEgg.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityModEgg.java
index 2e5858a4..33f753bd 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityModEgg.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityModEgg.java
@@ -8,6 +8,7 @@
import net.minecraft.core.particles.ItemParticleOption;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
@@ -71,7 +72,7 @@ protected void onHit(HitResult result) {
}
@Override
- public Packet<?> getAddEntityPacket() {
+ public Packet<ClientGamePacketListener> getAddEntityPacket() {
return NetworkManager.createAddEntityPacket(this);
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityTarantulaHair.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityTarantulaHair.java
index 29178c31..a8c47077 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityTarantulaHair.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/projectile/EntityTarantulaHair.java
@@ -2,7 +2,7 @@
import dev.architectury.networking.NetworkManager;
import net.minecraft.network.protocol.Packet;
-import net.minecraft.world.Difficulty;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
@@ -59,7 +59,7 @@ protected void onHit(HitResult result) {
}
@Override
- public Packet<?> getAddEntityPacket() {
+ public Packet<ClientGamePacketListener> getAddEntityPacket() {
return NetworkManager.createAddEntityPacket(this);
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/util/abstracts/EntityTameableBetterAnimalsPlus.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/util/abstracts/EntityTameableBetterAnimalsPlus.java
index 32b768ba..c7fad70f 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/util/abstracts/EntityTameableBetterAnimalsPlus.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/util/abstracts/EntityTameableBetterAnimalsPlus.java
@@ -1,9 +1,10 @@
package dev.itsmeow.betteranimalsplus.common.entity.util.abstracts;
import dev.itsmeow.betteranimalsplus.common.entity.util.EntityTypeContainerBAPTameable;
+import dev.itsmeow.imdlib.IMDLib;
import dev.itsmeow.imdlib.entity.EntityTypeContainer;
import dev.itsmeow.imdlib.entity.interfaces.IContainerEntity;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.EntityType;
@@ -35,10 +36,10 @@ public boolean isTamingItem(Item item) {
EntityTypeContainer<?> container = getContainer();
if(container instanceof EntityTypeContainerBAPTameable<?>) {
String[] items = ((EntityTypeContainerBAPTameable<?>) container).getTameItems();
- String id = Registry.ITEM.getKey(item).toString();
+ String id = IMDLib.getRegistry(Registries.ITEM).getKey(item).toString();
for(String itemsId : items) {
if(itemsId.startsWith("#")) {
- if(item.builtInRegistryHolder().is(TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation(itemsId.substring(1))))) {
+ if(item.builtInRegistryHolder().is(TagKey.create(Registries.ITEM, new ResourceLocation(itemsId.substring(1))))) {
return true;
}
} else if(id.equals(itemsId)) {
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemBetterFood.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemBetterFood.java
index b5958470..95f8a18c 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemBetterFood.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemBetterFood.java
@@ -10,7 +10,7 @@ public class ItemBetterFood extends Item {
public final int itemUseDuration;
public ItemBetterFood(int foodToFill, float saturationMultiplier, int eatLength, boolean isMeat) {
- super(new Item.Properties().tab(BetterAnimalsPlusMod.TAB).food(createFood(foodToFill, saturationMultiplier, isMeat)));
+ super(new Item.Properties().arch$tab(BetterAnimalsPlusMod.TAB).food(createFood(foodToFill, saturationMultiplier, isMeat)));
this.itemUseDuration = eatLength;
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemCape.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemCape.java
index a6092f47..43906910 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemCape.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemCape.java
@@ -53,7 +53,7 @@ public static boolean dispenseArmor(BlockSource blockSource, ItemStack stack) {
}
public ItemCape(Item repairItem, ArmorMaterial material) {
- super(material, EquipmentSlot.CHEST, new Properties().tab(BetterAnimalsPlusMod.TAB));
+ super(material, EquipmentSlot.CHEST, new Properties().arch$tab(BetterAnimalsPlusMod.TAB));
this.repairItem = repairItem;
DispenserBlock.registerBehavior(this, DISPENSE_ITEM_BEHAVIOR);
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemHorseshoeCrabBlood.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemHorseshoeCrabBlood.java
index 2b860e24..4f3b9188 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemHorseshoeCrabBlood.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemHorseshoeCrabBlood.java
@@ -19,7 +19,7 @@ public class ItemHorseshoeCrabBlood extends Item {
public static final Component CURES_WITHER = Component.translatable("tooltip.betteranimalsplus.cures_wither").withStyle(ChatFormatting.GREEN);
public ItemHorseshoeCrabBlood() {
- super(new Properties().stacksTo(1).craftRemainder(Items.GLASS_BOTTLE).tab(BetterAnimalsPlusMod.TAB));
+ super(new Properties().stacksTo(1).craftRemainder(Items.GLASS_BOTTLE).arch$tab(BetterAnimalsPlusMod.TAB));
}
private static boolean cure(LivingEntity entityLiving) {
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemThrowableCustomEgg.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemThrowableCustomEgg.java
index 874af96c..8925703c 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemThrowableCustomEgg.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/common/item/ItemThrowableCustomEgg.java
@@ -39,7 +39,7 @@ public interface EggConstructorThrower<T extends ThrowableItemProjectile> {
private final EggConstructorThrower eggSupplier2;
public ItemThrowableCustomEgg(Supplier<EntityType<? extends T>> typeSupplier, EggConstructorPosition<T> egg, EggConstructorThrower<T> egg2) {
- super(new Item.Properties().stacksTo(16).tab(BetterAnimalsPlusMod.TAB));
+ super(new Item.Properties().stacksTo(16).arch$tab(BetterAnimalsPlusMod.TAB));
this.typeSupplier = typeSupplier;
this.eggSupplier = egg;
this.eggSupplier2 = egg2;
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlockEntities.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlockEntities.java
index b494cce3..4e303222 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlockEntities.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlockEntities.java
@@ -4,14 +4,14 @@
import dev.architectury.registry.registries.RegistrySupplier;
import dev.itsmeow.betteranimalsplus.Ref;
import dev.itsmeow.betteranimalsplus.common.blockentity.BlockEntityTrillium;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import java.util.function.Supplier;
public class ModBlockEntities {
- private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(Ref.MOD_ID, Registry.BLOCK_ENTITY_TYPE_REGISTRY);
+ private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(Ref.MOD_ID, Registries.BLOCK_ENTITY_TYPE);
public static final RegistrySupplier<BlockEntityType<BlockEntityTrillium>> TRILLIUM_TYPE = r("trillium", () -> BlockEntityType.Builder.of(BlockEntityTrillium::new, ModBlocks.TRILLIUM.get()).build(null));
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlocks.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlocks.java
index 913e0f32..5b38fc7c 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlocks.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModBlocks.java
@@ -6,14 +6,14 @@
import dev.itsmeow.betteranimalsplus.common.block.BlockTrillium;
import dev.itsmeow.betteranimalsplus.common.block.BlockTurkey;
import dev.itsmeow.betteranimalsplus.common.block.BlockTurkeyRaw;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.block.Block;
import java.util.function.Supplier;
public class ModBlocks {
- private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(Ref.MOD_ID, Registry.BLOCK_REGISTRY);
+ private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(Ref.MOD_ID, Registries.BLOCK);
public static final RegistrySupplier<BlockTrillium> TRILLIUM = r("trillium", BlockTrillium::new);
public static final RegistrySupplier<BlockTurkeyRaw> TURKEY_RAW = r("turkey_raw", BlockTurkeyRaw::new);
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModEntities.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModEntities.java
index 396a0d64..f277ca85 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModEntities.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModEntities.java
@@ -1,6 +1,7 @@
package dev.itsmeow.betteranimalsplus.init;
import com.google.common.collect.Lists;
+import dev.architectury.registry.CreativeTabRegistry;
import dev.architectury.registry.registries.RegistrySupplier;
import dev.itsmeow.betteranimalsplus.BetterAnimalsPlusMod;
import dev.itsmeow.betteranimalsplus.Ref;
@@ -19,7 +20,7 @@
import dev.itsmeow.imdlib.entity.util.variant.EntityVariant;
import dev.itsmeow.imdlib.item.ItemModEntityContainer;
import dev.itsmeow.imdlib.item.ItemModFishBucket;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.entity.EntityType;
@@ -30,7 +31,6 @@
import net.minecraft.world.entity.monster.Monster;
import net.minecraft.world.entity.monster.Spider;
import net.minecraft.world.entity.projectile.Projectile;
-import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.biome.Biomes;
import net.minecraft.world.level.block.Blocks;
@@ -43,7 +43,7 @@ public class ModEntities {
public static final EntityRegistrarHandlerBAP H = new EntityRegistrarHandlerBAP();
private static final String MODID = Ref.MOD_ID;
- private static final CreativeModeTab G = BetterAnimalsPlusMod.TAB;
+ private static final CreativeTabRegistry.TabSupplier G = BetterAnimalsPlusMod.TAB;
public static final EntityTypeContainerBAPTameable<EntityLammergeier> LAMMERGEIER = H.addTame(EntityLammergeier.class, EntityLammergeier::new, "lammergeier", () -> Mob.createMobAttributes()
.add(Attributes.ATTACK_SPEED)
.add(Attributes.ATTACK_DAMAGE)
@@ -505,6 +505,6 @@ public static void init() {
}
private static <T extends Projectile> RegistrySupplier<EntityType<T>> projectile(EntityType.EntityFactory<T> factory, String name, float width, float height) {
- return IMDLib.getRegistry(Registry.ENTITY_TYPE_REGISTRY).register(new ResourceLocation(MODID, name), () -> H.createEntityType(factory, name, MobCategory.MISC, 64, 1, true, width, height));
+ return IMDLib.getRegistry(Registries.ENTITY_TYPE).register(new ResourceLocation(MODID, name), () -> H.createEntityType(factory, name, MobCategory.MISC, 64, 1, true, width, height));
}
}
\ No newline at end of file
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModItems.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModItems.java
index acb12292..1f7b4ec1 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModItems.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModItems.java
@@ -13,7 +13,7 @@
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.ChatFormatting;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem;
@@ -31,7 +31,7 @@
public class ModItems {
- private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(Ref.MOD_ID, Registry.ITEM_REGISTRY);
+ private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(Ref.MOD_ID, Registries.ITEM);
private static final Map<ResourceLocation, RegistrySupplier<? extends ItemModeledArmor>> MODELED_ARMOR = new WeakHashMap<>();
@@ -111,7 +111,7 @@ public void appendHoverText(ItemStack stack, Level worldIn, List<Component> tool
public static final RegistrySupplier<BlockItem> TRILLIUM = rIB(ModBlocks.TRILLIUM);
protected static RegistrySupplier<Item> r(String name) {
- return ITEMS.register(name, () -> new Item(new Item.Properties().tab(BetterAnimalsPlusMod.TAB)));
+ return ITEMS.register(name, () -> new Item(new Item.Properties().arch$tab(BetterAnimalsPlusMod.TAB)));
}
protected static RegistrySupplier<Item> rH(String name) {
@@ -127,7 +127,7 @@ protected static <T extends Item> RegistrySupplier<T> varArg(String nameBase, St
}
protected static RegistrySupplier<BlockItem> rIB(RegistrySupplier<? extends Block> parent) {
- return ITEMS.register(parent.getId().getPath(), () -> new BlockItem(parent.get(), new Item.Properties().tab(BetterAnimalsPlusMod.TAB)));
+ return ITEMS.register(parent.getId().getPath(), () -> new BlockItem(parent.get(), new Item.Properties().arch$tab(BetterAnimalsPlusMod.TAB)));
}
protected static <T extends ItemModeledArmor> RegistrySupplier<T> modelArmor(RegistrySupplier<T> armor) {
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModResources.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModResources.java
index b5b357e8..4f9e786b 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModResources.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModResources.java
@@ -1,7 +1,7 @@
package dev.itsmeow.betteranimalsplus.init;
import dev.itsmeow.betteranimalsplus.Ref;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
@@ -37,7 +37,7 @@ public static void loadTags() {
}
private static TagKey<Block> tag(String name) {
- return TagKey.create(Registry.BLOCK_REGISTRY, new ResourceLocation(Ref.MOD_ID, name));
+ return TagKey.create(Registries.BLOCK, new ResourceLocation(Ref.MOD_ID, name));
}
}
@@ -50,7 +50,7 @@ public static void loadTags() {
}
private static TagKey<Item> tag(String name) {
- return TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation(Ref.MOD_ID, name));
+ return TagKey.create(Registries.ITEM, new ResourceLocation(Ref.MOD_ID, name));
}
}
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModSoundEvents.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModSoundEvents.java
index 099de28f..dd244b66 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModSoundEvents.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModSoundEvents.java
@@ -3,13 +3,13 @@
import dev.architectury.registry.registries.DeferredRegister;
import dev.architectury.registry.registries.RegistrySupplier;
import dev.itsmeow.betteranimalsplus.Ref;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
public class ModSoundEvents {
- private static final DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(Ref.MOD_ID, Registry.SOUND_EVENT_REGISTRY);
+ private static final DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(Ref.MOD_ID, Registries.SOUND_EVENT);
public static final RegistrySupplier<SoundEvent> GOOSE_DEATH = r("entity_goose_death");
public static final RegistrySupplier<SoundEvent> GOOSE_HURT = r("entity_goose_hurt");
@@ -17,7 +17,7 @@ public class ModSoundEvents {
public static final RegistrySupplier<SoundEvent> WALRUS_TUNE = r("walrus_tune");
private static RegistrySupplier<SoundEvent> r(String name) {
- return SOUNDS.register(name, () -> new SoundEvent(new ResourceLocation(Ref.MOD_ID, name.replaceAll("_", "."))));
+ return SOUNDS.register(name, () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(Ref.MOD_ID, name.replaceAll("_", "."))));
}
public static void init() {
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModWorldGen.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModWorldGen.java
index 9052f767..ee72a52e 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModWorldGen.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModWorldGen.java
@@ -5,10 +5,9 @@
import net.minecraft.core.Direction;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.Registries;
import net.minecraft.data.worldgen.features.FeatureUtils;
import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.BiomeTags;
import net.minecraft.tags.TagKey;
import net.minecraft.util.random.SimpleWeightedRandomList;
import net.minecraft.world.level.biome.Biome;
@@ -33,7 +32,9 @@ public class ModWorldGen {
public static PlacedFeature TRILLIUM_DENSE_PF = null;
public static void init(Consumer<Runnable> enqueue) {
- TRILLIUM_CF = new ConfiguredFeature(Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(
+ // TODO
+ // Mojang don't break worldgen code challenge (impossible)
+ /*TRILLIUM_CF = new ConfiguredFeature(Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(
new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder()
.add(ModBlocks.TRILLIUM.get().defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, Direction.NORTH), 1)
.add(ModBlocks.TRILLIUM.get().defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, Direction.EAST), 1)
@@ -51,9 +52,9 @@ public static void init(Consumer<Runnable> enqueue) {
HeightmapPlacement.onHeightmap(Heightmap.Types.MOTION_BLOCKING),
BiomeFilter.biome()));
enqueue.accept(() -> {
- Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new ResourceLocation(Ref.MOD_ID, "trillium"), TRILLIUM_CF);
- Registry.register(BuiltinRegistries.PLACED_FEATURE, new ResourceLocation(Ref.MOD_ID, "trillium"), TRILLIUM_PF);
- Registry.register(BuiltinRegistries.PLACED_FEATURE, new ResourceLocation(Ref.MOD_ID, "trillium_dense"), TRILLIUM_DENSE_PF);
+ Registry.register(Registries.CONFIGURED_FEATURE, new ResourceLocation(Ref.MOD_ID, "trillium"), TRILLIUM_CF);
+ Registry.register(Registries.PLACED_FEATURE, new ResourceLocation(Ref.MOD_ID, "trillium"), TRILLIUM_PF);
+ Registry.register(Registries.PLACED_FEATURE, new ResourceLocation(Ref.MOD_ID, "trillium_dense"), TRILLIUM_DENSE_PF);
});
BiomeModifications.addProperties(
ctx -> isSwamp(ctx) && !isDenseSwamp(ctx),
@@ -62,7 +63,7 @@ public static void init(Consumer<Runnable> enqueue) {
BiomeModifications.addProperties(
ctx -> isSwamp(ctx) && isDenseSwamp(ctx),
(ctx, mutable) -> mutable.getGenerationProperties().addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, TRILLIUM_DENSE_PF)
- );
+ );*/
}
private static boolean isSwamp(BiomeModifications.BiomeContext ctx) {
@@ -74,6 +75,6 @@ private static boolean isDenseSwamp(BiomeModifications.BiomeContext ctx) {
}
private static TagKey<Biome> key(String space, String key) {
- return TagKey.create(Registry.BIOME_REGISTRY, new ResourceLocation(space, key));
+ return TagKey.create(Registries.BIOME, new ResourceLocation(space, key));
}
}
diff --git a/common/src/main/java/dev/itsmeow/betteranimalsplus/mixin/LocalPlayerMixin.java b/common/src/main/java/dev/itsmeow/betteranimalsplus/mixin/LocalPlayerMixin.java
index 503c03ca..0620da98 100644
--- a/common/src/main/java/dev/itsmeow/betteranimalsplus/mixin/LocalPlayerMixin.java
+++ b/common/src/main/java/dev/itsmeow/betteranimalsplus/mixin/LocalPlayerMixin.java
@@ -10,11 +10,11 @@
@Mixin(LocalPlayer.class)
public class LocalPlayerMixin {
-
- @Inject(method = "command(Ljava/lang/String;Lnet/minecraft/network/chat/Component;)V", at = @At("HEAD"), cancellable = true)
+ // TODO
+ /*@Inject(method = "command(Ljava/lang/String;Lnet/minecraft/network/chat/Component;)V", at = @At("HEAD"), cancellable = true)
public void command(String message, Component component, CallbackInfo callback) {
if (DeveloperRenderThing.chat("/" + message).isFalse())
callback.cancel();
- }
+ }*/
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_cooked.json
index 170cd657..5f5a1170 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_whole_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_raw.json
index 0e31c704..d5fb7850 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_1_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_raw"
+ "particle": "betteranimalsplus:block/turkey_block_whole_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_cooked.json
index 43cd5996..c7fd4e6c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_whole_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_raw.json
index e879e6ff..0271ebc1 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_2_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_raw"
+ "particle": "betteranimalsplus:block/turkey_block_whole_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_cooked.json
index 86820c1e..89abc1d6 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_whole_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_raw.json
index 9ca15c5f..52d705ea 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_3_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_raw"
+ "particle": "betteranimalsplus:block/turkey_block_whole_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_cooked.json
index 9cf431e3..3bea8144 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_whole_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_raw.json
index 403ad672..221088e8 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_4_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_raw"
+ "particle": "betteranimalsplus:block/turkey_block_whole_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_cooked.json
index 20a5378d..1f8a605c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_slice_1_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_slice_1_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_raw.json
index bddd0f1e..c49d52ef 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_5_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_slice_1_raw"
+ "particle": "betteranimalsplus:block/turkey_block_slice_1_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_cooked.json
index 73bc38ea..fd59d7cf 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_slice_2_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_slice_2_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_raw.json
index 123b4fba..474f7909 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_6_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_slice_2_raw"
+ "particle": "betteranimalsplus:block/turkey_block_slice_2_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_cooked.json
index e405c8d0..895968d6 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_slice_3_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_slice_3_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_raw.json
index c5c6ebc5..e0f1f8f3 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_eaten_7_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_slice_3_raw"
+ "particle": "betteranimalsplus:block/turkey_block_slice_3_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_cooked.json
index a8bb03f5..90b5be15 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_cooked.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_cooked"
+ "particle": "betteranimalsplus:block/turkey_block_whole_cooked"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_raw.json
index 65e4574f..7674c008 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/block/turkey_whole_raw.json
@@ -3,7 +3,7 @@
"parent": "minecraft:block/block",
"ambientocclusion": false,
"textures": {
- "particle": "betteranimalsplus:blocks/turkey_block_whole_raw"
+ "particle": "betteranimalsplus:block/turkey_block_whole_raw"
},
"elements": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_badger.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_badger.json
index 323532f7..1b5fd7d5 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_badger.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_badger.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_badger"
+ "layer0": "betteranimalsplus:item/advancement_icon_badger"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish.json
index ed16a3dd..2fb75831 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_jellyfish"
+ "layer0": "betteranimalsplus:item/advancement_icon_jellyfish"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish_cross.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish_cross.json
index 899876cd..27b6f4c9 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish_cross.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_jellyfish_cross.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_jellyfish_cross"
+ "layer0": "betteranimalsplus:item/advancement_icon_jellyfish_cross"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_lamprey.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_lamprey.json
index fb679a5f..c6e361f8 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_lamprey.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_lamprey.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_lamprey"
+ "layer0": "betteranimalsplus:item/advancement_icon_lamprey"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_octopus.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_octopus.json
index db0becb4..763ab7b2 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_octopus.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_octopus.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_octopus"
+ "layer0": "betteranimalsplus:item/advancement_icon_octopus"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_shark.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_shark.json
index ab03d811..3c1b13a9 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_shark.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_shark.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_shark"
+ "layer0": "betteranimalsplus:item/advancement_icon_shark"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_squirrel.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_squirrel.json
index 8e786561..0a46ee5e 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_squirrel.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_squirrel.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_squirrel"
+ "layer0": "betteranimalsplus:item/advancement_icon_squirrel"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_succening.json b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_succening.json
index 0c5b7f8a..aea33790 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_succening.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/advancement_icon_succening.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/advancement_icon_succening"
+ "layer0": "betteranimalsplus:item/advancement_icon_succening"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/antler.json b/common/src/main/resources/assets/betteranimalsplus/models/item/antler.json
index b4c96346..112751b9 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/antler.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/antler.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/antler"
+ "layer0": "betteranimalsplus:item/antler"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/barracuda_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/barracuda_bucket.json
index 67156dc0..7e671dc7 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/barracuda_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/barracuda_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/barracuda"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/barracuda"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_black.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_black.json
index 03f79549..a11dea70 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_black.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_black.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bear_cape_black"
+ "layer0": "betteranimalsplus:item/bear_cape_black"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_brown.json
index 105470de..96764863 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_brown.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bear_cape_brown"
+ "layer0": "betteranimalsplus:item/bear_cape_brown"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_kermode.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_kermode.json
index 0a0bdcba..257f15f3 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_kermode.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_cape_kermode.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bear_cape_kermode"
+ "layer0": "betteranimalsplus:item/bear_cape_kermode"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_black.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_black.json
index f5b4afd3..f94f21b1 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_black.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_black.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bear_skin_black"
+ "layer0": "betteranimalsplus:item/bear_skin_black"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_brown.json
index 77fe2344..a07d568b 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_brown.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bear_skin_brown"
+ "layer0": "betteranimalsplus:item/bear_skin_brown"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_kermode.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_kermode.json
index fd3ca0d8..acb6426d 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_kermode.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bear_skin_kermode.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bear_skin_kermode"
+ "layer0": "betteranimalsplus:item/bear_skin_kermode"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_black.json b/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_black.json
index bf9c98eb..2c471fc6 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_black.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_black.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_bear_black"
+ "layer0": "betteranimalsplus:item/head_bear_black"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_kermode.json b/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_kermode.json
index 7ec85386..60b12da4 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_kermode.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/blackbearhead_kermode.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_bear_kermode"
+ "layer0": "betteranimalsplus:item/head_bear_kermode"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/blubber.json b/common/src/main/resources/assets/betteranimalsplus/models/item/blubber.json
index 5b73a60e..56737e9e 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/blubber.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/blubber.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/blubber"
+ "layer0": "betteranimalsplus:item/blubber"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_dark_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_dark_brown.json
index 5e2c4c1f..b1792454 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_dark_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_dark_brown.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/boarhead_dark_brown"
+ "layer0": "betteranimalsplus:item/boarhead_dark_brown"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_gray.json b/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_gray.json
index 88525319..20f15ba5 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_gray.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_gray.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/boarhead_gray"
+ "layer0": "betteranimalsplus:item/boarhead_gray"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_light_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_light_brown.json
index 522b2894..30dd0afd 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_light_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/boarhead_light_brown.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/boarhead_light_brown"
+ "layer0": "betteranimalsplus:item/boarhead_light_brown"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_butterfly.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_butterfly.json
index 10b13772..f599a250 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_butterfly.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_butterfly.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bottled_butterfly"
+ "layer0": "betteranimalsplus:item/bottled_butterfly"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_dragonfly.json b/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_dragonfly.json
index 22ac6c13..65670bc6 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_dragonfly.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/bottled_dragonfly.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/bottled_dragonfly"
+ "layer0": "betteranimalsplus:item/bottled_dragonfly"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/brownbearhead_1.json b/common/src/main/resources/assets/betteranimalsplus/models/item/brownbearhead_1.json
index fa5ca394..f1a54c39 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/brownbearhead_1.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/brownbearhead_1.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_bear_brown"
+ "layer0": "betteranimalsplus:item/head_bear_brown"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_cooked.json
index 3ad50b68..d47a5114 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_cooked.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/calamari_cooked"
+ "layer0": "betteranimalsplus:item/calamari_cooked"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_raw.json
index 783ebc51..9237cefb 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/calamari_raw.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/calamari_raw"
+ "layer0": "betteranimalsplus:item/calamari_raw"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/coyotehead_1.json b/common/src/main/resources/assets/betteranimalsplus/models/item/coyotehead_1.json
index ef7feaa6..ea84adcf 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/coyotehead_1.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/coyotehead_1.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/coyotehead_1"
+ "layer0": "betteranimalsplus:item/coyotehead_1"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/crab_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/crab_bucket.json
index 7486ebe4..cf94ee44 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/crab_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/crab_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/crab"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/crab"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_cooked.json
index 8a1ea448..7e8a624e 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_cooked.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/crab_meat_cooked"
+ "layer0": "betteranimalsplus:item/crab_meat_cooked"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_raw.json
index 9b3b2d0d..9ce49fdd 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/crab_meat_raw.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/crab_meat_raw"
+ "layer0": "betteranimalsplus:item/crab_meat_raw"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_1.json b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_1.json
index 5d7a6016..875208b7 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_1.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_1.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_deer_1"
+ "layer0": "betteranimalsplus:item/head_deer_1"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_2.json b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_2.json
index 9c273e0d..b858d0bc 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_2.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_2.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_deer_2"
+ "layer0": "betteranimalsplus:item/head_deer_2"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_3.json b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_3.json
index 4626bb49..6434eb9f 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_3.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_3.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_deer_3"
+ "layer0": "betteranimalsplus:item/head_deer_3"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_4.json b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_4.json
index db0c0bc7..10c1f0b2 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_4.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/deerhead_4.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_deer_4"
+ "layer0": "betteranimalsplus:item/head_deer_4"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_freshwater_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_freshwater_bucket.json
index 81ca4b70..e0b5b36d 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_freshwater_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_freshwater_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/eel_freshwater"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/eel_freshwater"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_cooked.json
index cf086d28..4b355261 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_cooked.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/eel_meat_cooked"
+ "layer0": "betteranimalsplus:item/eel_meat_cooked"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_raw.json
index 610bc401..9fb4605b 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_meat_raw.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/eel_meat_raw"
+ "layer0": "betteranimalsplus:item/eel_meat_raw"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_saltwater_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_saltwater_bucket.json
index f1bad8ef..4f784963 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/eel_saltwater_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/eel_saltwater_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/eel_saltwater"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/eel_saltwater"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_arctic.json b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_arctic.json
index 6c20e240..682ce0a5 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_arctic.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_arctic.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/feralwolfhead_arctic"
+ "layer0": "betteranimalsplus:item/feralwolfhead_arctic"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_black.json b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_black.json
index ccd802bc..61b4e5d9 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_black.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_black.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/feralwolfhead_black"
+ "layer0": "betteranimalsplus:item/feralwolfhead_black"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_brown.json
index 78684374..e1c18ce3 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_brown.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/feralwolfhead_brown"
+ "layer0": "betteranimalsplus:item/feralwolfhead_brown"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_red.json b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_red.json
index bc1bbf19..ee378cfa 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_red.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_red.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/feralwolfhead_red"
+ "layer0": "betteranimalsplus:item/feralwolfhead_red"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_snowy.json b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_snowy.json
index 60e9476e..c55dc60c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_snowy.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_snowy.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/feralwolfhead_snowy"
+ "layer0": "betteranimalsplus:item/feralwolfhead_snowy"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_timber.json b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_timber.json
index e8551d85..f3116170 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_timber.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/feralwolfhead_timber.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/feralwolfhead_timber"
+ "layer0": "betteranimalsplus:item/feralwolfhead_timber"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket.json
index 57d4f098..fa3cc61a 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket.json
@@ -1,8 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/flying_fish"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/flying_fish"
},
"overrides": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_purple.json b/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_purple.json
index 4247168f..748c610e 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_purple.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_purple.json
@@ -1,8 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/flying_fish_purple"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/flying_fish_purple"
},
"overrides": [
{
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_yellow.json b/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_yellow.json
index 68c7bf01..c7bad206 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_yellow.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/flying_fish_bucket_yellow.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/flying_fish_yellow"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/flying_fish_yellow"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/fried_egg.json b/common/src/main/resources/assets/betteranimalsplus/models/item/fried_egg.json
index c79981b6..3df2704f 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/fried_egg.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/fried_egg.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/fried_egg"
+ "layer0": "betteranimalsplus:item/fried_egg"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/golden_goose_egg.json b/common/src/main/resources/assets/betteranimalsplus/models/item/golden_goose_egg.json
index 50c6096d..d29618c6 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/golden_goose_egg.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/golden_goose_egg.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/golden_goose_egg"
+ "layer0": "betteranimalsplus:item/golden_goose_egg"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/goose_egg.json b/common/src/main/resources/assets/betteranimalsplus/models/item/goose_egg.json
index fbb37060..e3910a1c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/goose_egg.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/goose_egg.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/goose_egg"
+ "layer0": "betteranimalsplus:item/goose_egg"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoe_crab_blood.json b/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoe_crab_blood.json
index 583b9263..72f14dff 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoe_crab_blood.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoe_crab_blood.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/horseshoe_crab_blood"
+ "layer0": "betteranimalsplus:item/horseshoe_crab_blood"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoecrab_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoecrab_bucket.json
index 182c7523..5926739d 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoecrab_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/horseshoecrab_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/horseshoecrab"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/horseshoecrab"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/jellyfish_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/jellyfish_bucket.json
index cb9fdb84..f99ca0bd 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/jellyfish_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/jellyfish_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/jellyfish"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/jellyfish"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/lamprey_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/lamprey_bucket.json
index 1f49e2b4..ac789f63 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/lamprey_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/lamprey_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/lamprey"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/lamprey"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_1.json b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_1.json
index 2f6d195b..7ebdde38 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_1.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_1.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_moose_1"
+ "layer0": "betteranimalsplus:item/head_moose_1"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_2.json b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_2.json
index 1263bd0b..330c3da4 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_2.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_2.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_moose_2"
+ "layer0": "betteranimalsplus:item/head_moose_2"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_3.json b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_3.json
index d8776c9e..5146a2a1 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_3.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_3.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_moose_3"
+ "layer0": "betteranimalsplus:item/head_moose_3"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_4.json b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_4.json
index 2e7a4603..fded0b82 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_4.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/moosehead_4.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/head_moose_4"
+ "layer0": "betteranimalsplus:item/head_moose_4"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/nautilus_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/nautilus_bucket.json
index 33039b99..c267f179 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/nautilus_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/nautilus_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/nautilus"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/nautilus"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/pheasant_egg.json b/common/src/main/resources/assets/betteranimalsplus/models/item/pheasant_egg.json
index 42062a6f..45dd8049 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/pheasant_egg.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/pheasant_egg.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/pheasant_egg"
+ "layer0": "betteranimalsplus:item/pheasant_egg"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantcooked.json b/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantcooked.json
index 5fa47ea6..510210fd 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantcooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantcooked.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/pheasant_cooked"
+ "layer0": "betteranimalsplus:item/pheasant_cooked"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantraw.json b/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantraw.json
index c0af122b..0eeb8217 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantraw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/pheasantraw.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/pheasant_raw"
+ "layer0": "betteranimalsplus:item/pheasant_raw"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/piranha_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/piranha_bucket.json
index d0b6a5ea..23cb649c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/piranha_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/piranha_bucket.json
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lower_bucket",
- "layer1": "betteranimalsplus:items/bucket_content/piranha"
+ "layer0": "betteranimalsplus:item/lower_bucket",
+ "layer1": "betteranimalsplus:item/bucket_content/piranha"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/record_crab_rave.json b/common/src/main/resources/assets/betteranimalsplus/models/item/record_crab_rave.json
index 096acc76..df69ed41 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/record_crab_rave.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/record_crab_rave.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/crab_rave"
+ "layer0": "betteranimalsplus:item/crab_rave"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/record_walrus.json b/common/src/main/resources/assets/betteranimalsplus/models/item/record_walrus.json
index 16a3f12d..a451f7c3 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/record_walrus.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/record_walrus.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/record_walrus"
+ "layer0": "betteranimalsplus:item/record_walrus"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_1.json b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_1.json
index 694518a5..3f84b1dc 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_1.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_1.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/reindeerhead"
+ "layer0": "betteranimalsplus:item/reindeerhead"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_2.json b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_2.json
index 4b06f980..075dfb64 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_2.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_2.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/reindeerhead_white"
+ "layer0": "betteranimalsplus:item/reindeerhead_white"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_3.json b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_3.json
index 694518a5..3f84b1dc 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_3.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_3.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/reindeerhead"
+ "layer0": "betteranimalsplus:item/reindeerhead"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_4.json b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_4.json
index 4b06f980..075dfb64 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_4.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/reindeerhead_4.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/reindeerhead_white"
+ "layer0": "betteranimalsplus:item/reindeerhead_white"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/saltwater_eel_bucket.json b/common/src/main/resources/assets/betteranimalsplus/models/item/saltwater_eel_bucket.json
index 76aca38d..826c9540 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/saltwater_eel_bucket.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/saltwater_eel_bucket.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/lamprey_bucket"
+ "layer0": "betteranimalsplus:item/lamprey_bucket"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/trillium.json b/common/src/main/resources/assets/betteranimalsplus/models/item/trillium.json
index 072a1ebe..5b63163c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/trillium.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/trillium.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/trillium"
+ "layer0": "betteranimalsplus:item/trillium"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_egg.json b/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_egg.json
index 65318083..75bc0576 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_egg.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_egg.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/turkey_egg"
+ "layer0": "betteranimalsplus:item/turkey_egg"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json b/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json
index 2da254b7..1250b227 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/handheld_rod",
"textures": {
- "layer0": "betteranimalsplus:items/turkey_leg_cooked"
+ "layer0": "betteranimalsplus:item/turkey_leg_cooked"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json b/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json
index 96d0dd13..3ae7c2df 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/handheld_rod",
"textures": {
- "layer0": "betteranimalsplus:items/turkey_leg_raw"
+ "layer0": "betteranimalsplus:item/turkey_leg_raw"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/venisoncooked.json b/common/src/main/resources/assets/betteranimalsplus/models/item/venisoncooked.json
index 1d13fe28..c37fa94c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/venisoncooked.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/venisoncooked.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/venison_cooked"
+ "layer0": "betteranimalsplus:item/venison_cooked"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/venisonraw.json b/common/src/main/resources/assets/betteranimalsplus/models/item/venisonraw.json
index 6f4aa983..bd65a75a 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/venisonraw.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/venisonraw.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/venison_raw"
+ "layer0": "betteranimalsplus:item/venison_raw"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_arctic.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_arctic.json
index 49ccd043..664dfe61 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_arctic.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_arctic.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_cape_arctic"
+ "layer0": "betteranimalsplus:item/wolf_cape_arctic"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_black.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_black.json
index 289c7d79..e636b78b 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_black.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_black.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_cape_black"
+ "layer0": "betteranimalsplus:item/wolf_cape_black"
}
}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_brown.json
index f6f3e1e4..9f9bdc7d 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_brown.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_cape_brown"
+ "layer0": "betteranimalsplus:item/wolf_cape_brown"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_classic.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_classic.json
index d3a3ab86..d60c7bee 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_classic.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_classic.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_cape_classic"
+ "layer0": "betteranimalsplus:item/wolf_cape_classic"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_red.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_red.json
index 83dcd64d..0f6a1b1b 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_red.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_red.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_cape_red"
+ "layer0": "betteranimalsplus:item/wolf_cape_red"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_timber.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_timber.json
index add67ced..cf0b90fb 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_timber.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_cape_timber.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_cape_timber"
+ "layer0": "betteranimalsplus:item/wolf_cape_timber"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_arctic.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_arctic.json
index 4a698259..1cc24f94 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_arctic.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_arctic.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_pelt_arctic"
+ "layer0": "betteranimalsplus:item/wolf_pelt_arctic"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_black.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_black.json
index af2d0ca9..6690b1ba 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_black.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_black.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_pelt_black"
+ "layer0": "betteranimalsplus:item/wolf_pelt_black"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_brown.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_brown.json
index ceb9153c..552d4916 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_brown.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_brown.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_pelt_brown"
+ "layer0": "betteranimalsplus:item/wolf_pelt_brown"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_red.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_red.json
index 65c4084a..4fba3a6c 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_red.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_red.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_pelt_red"
+ "layer0": "betteranimalsplus:item/wolf_pelt_red"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_snowy.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_snowy.json
index 1063b5ad..7126d734 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_snowy.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_snowy.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_pelt_snowy"
+ "layer0": "betteranimalsplus:item/wolf_pelt_snowy"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_timber.json b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_timber.json
index e098b253..7dba5793 100644
--- a/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_timber.json
+++ b/common/src/main/resources/assets/betteranimalsplus/models/item/wolf_pelt_timber.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "betteranimalsplus:items/wolf_pelt_timber"
+ "layer0": "betteranimalsplus:item/wolf_pelt_timber"
}
}
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_1_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_1_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_1_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_1_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_1_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_1_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_1_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_1_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_2_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_2_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_2_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_2_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_2_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_2_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_2_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_2_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_3_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_3_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_3_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_3_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_3_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_3_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_slice_3_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_slice_3_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_whole_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_whole_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_whole_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_whole_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_whole_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_whole_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/blocks/turkey_block_whole_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/block/turkey_block_whole_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_badger.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_badger.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_badger.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_badger.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_jellyfish.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_jellyfish.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_jellyfish.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_jellyfish.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_jellyfish_cross.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_jellyfish_cross.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_jellyfish_cross.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_jellyfish_cross.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_lamprey.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_lamprey.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_lamprey.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_lamprey.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_octopus.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_octopus.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_octopus.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_octopus.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_shark.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_shark.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_shark.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_shark.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_squirrel.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_squirrel.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_squirrel.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_squirrel.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_succening.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_succening.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/advancement_icon_succening.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/advancement_icon_succening.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/antler.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/antler.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/antler.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/antler.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bear_cape_black.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bear_cape_black.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bear_cape_black.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bear_cape_black.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bear_cape_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bear_cape_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bear_cape_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bear_cape_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bear_cape_kermode.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bear_cape_kermode.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bear_cape_kermode.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bear_cape_kermode.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bear_skin_black.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bear_skin_black.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bear_skin_black.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bear_skin_black.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bear_skin_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bear_skin_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bear_skin_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bear_skin_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bear_skin_kermode.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bear_skin_kermode.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bear_skin_kermode.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bear_skin_kermode.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/blubber.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/blubber.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/blubber.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/blubber.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_dark_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_dark_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_dark_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_dark_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_gray.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_gray.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_gray.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_gray.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_light_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_light_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_light_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_light_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_white.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_white.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/boarhead_white.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/boarhead_white.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bottled_butterfly.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bottled_butterfly.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bottled_butterfly.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bottled_butterfly.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bottled_dragonfly.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bottled_dragonfly.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bottled_dragonfly.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bottled_dragonfly.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/barracuda.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/barracuda.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/barracuda.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/barracuda.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/crab.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/crab.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/crab.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/crab.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/eel_freshwater.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/eel_freshwater.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/eel_freshwater.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/eel_freshwater.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/eel_saltwater.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/eel_saltwater.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/eel_saltwater.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/eel_saltwater.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/flying_fish.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/flying_fish.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/flying_fish.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/flying_fish.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/flying_fish_purple.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/flying_fish_purple.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/flying_fish_purple.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/flying_fish_purple.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/flying_fish_yellow.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/flying_fish_yellow.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/flying_fish_yellow.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/flying_fish_yellow.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/horseshoecrab.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/horseshoecrab.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/horseshoecrab.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/horseshoecrab.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/jellyfish.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/jellyfish.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/jellyfish.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/jellyfish.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/lamprey.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/lamprey.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/lamprey.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/lamprey.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/nautilus.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/nautilus.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/nautilus.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/nautilus.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/piranha.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/piranha.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/bucket_content/piranha.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/bucket_content/piranha.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/calamari_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/calamari_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/calamari_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/calamari_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/calamari_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/calamari_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/calamari_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/calamari_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/coyotehead_1.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/coyotehead_1.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/coyotehead_1.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/coyotehead_1.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/crab_meat_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/crab_meat_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/crab_meat_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/crab_meat_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/crab_meat_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/crab_meat_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/crab_meat_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/crab_meat_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/crab_rave.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/crab_rave.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/crab_rave.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/crab_rave.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/eel_meat_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/eel_meat_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/eel_meat_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/eel_meat_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/eel_meat_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/eel_meat_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/eel_meat_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/eel_meat_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_arctic.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_arctic.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_arctic.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_arctic.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_black.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_black.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_black.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_black.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_red.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_red.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_red.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_red.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_snowy.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_snowy.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_snowy.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_snowy.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_timber.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_timber.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/feralwolfhead_timber.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/feralwolfhead_timber.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/fried_egg.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/fried_egg.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/fried_egg.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/fried_egg.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/golden_goose_egg.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/golden_goose_egg.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/golden_goose_egg.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/golden_goose_egg.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/goose_egg.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/goose_egg.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/goose_egg.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/goose_egg.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_bear_black.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_bear_black.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_bear_black.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_bear_black.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_bear_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_bear_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_bear_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_bear_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_bear_kermode.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_bear_kermode.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_bear_kermode.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_bear_kermode.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_1.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_1.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_1.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_1.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_2.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_2.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_2.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_2.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_3.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_3.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_3.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_3.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_4.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_4.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_deer_4.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_deer_4.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_1.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_1.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_1.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_1.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_2.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_2.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_2.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_2.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_3.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_3.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_3.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_3.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_4.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_4.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/head_moose_4.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/head_moose_4.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/horseshoe_crab_blood.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/horseshoe_crab_blood.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/horseshoe_crab_blood.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/horseshoe_crab_blood.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/lower_bucket.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/lower_bucket.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/lower_bucket.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/lower_bucket.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/pheasant_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/pheasant_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/pheasant_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/pheasant_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/pheasant_egg.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/pheasant_egg.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/pheasant_egg.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/pheasant_egg.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/pheasant_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/pheasant_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/pheasant_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/pheasant_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/record_walrus.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/record_walrus.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/record_walrus.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/record_walrus.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/reindeerhead.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/reindeerhead.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/reindeerhead.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/reindeerhead.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/reindeerhead_white.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/reindeerhead_white.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/reindeerhead_white.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/reindeerhead_white.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/trillium.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/trillium.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/trillium.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/trillium.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/trillium2.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/trillium2.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/trillium2.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/trillium2.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/turkey_egg.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/turkey_egg.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/turkey_egg.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/turkey_egg.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/turkey_leg_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/turkey_leg_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/turkey_leg_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/turkey_leg_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/turkey_leg_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/turkey_leg_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/turkey_leg_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/turkey_leg_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/venison_cooked.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/venison_cooked.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/venison_cooked.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/venison_cooked.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/venison_raw.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/venison_raw.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/venison_raw.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/venison_raw.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_arctic.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_arctic.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_arctic.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_arctic.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_black.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_black.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_black.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_black.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_classic.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_classic.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_classic.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_classic.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_red.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_red.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_red.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_red.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_timber.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_timber.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_cape_timber.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_cape_timber.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_arctic.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_arctic.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_arctic.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_arctic.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_black.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_black.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_black.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_black.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_brown.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_brown.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_brown.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_brown.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_red.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_red.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_red.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_red.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_snowy.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_snowy.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_snowy.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_snowy.png
diff --git a/common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_timber.png b/common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_timber.png
similarity index 100%
rename from common/src/main/resources/assets/betteranimalsplus/textures/items/wolf_pelt_timber.png
rename to common/src/main/resources/assets/betteranimalsplus/textures/item/wolf_pelt_timber.png
diff --git a/fabric/build.gradle b/fabric/build.gradle
index af37edbd..8c9ebd97 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -29,10 +29,10 @@ dependencies {
modImplementation("curse.maven:trinkets-341284:${rootProject.trinkets_version}") {
transitive = false
}
- modRuntimeOnly("com.terraformersmc:modmenu:4.0.4") {
+ modRuntimeOnly("com.terraformersmc:modmenu:5.0.2") {
transitive = false
}
- modRuntimeOnly("curse.maven:cloth-config-348521:3871534") {
+ modRuntimeOnly("curse.maven:cloth-config-348521:4147099") {
exclude(group: "net.fabricmc")
exclude(group: "net.fabricmc.fabric-api")
}
diff --git a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/client/fabric/BetterAnimalsPlusClientFabric.java b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/client/fabric/BetterAnimalsPlusClientFabric.java
index 33422a6d..1322f156 100644
--- a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/client/fabric/BetterAnimalsPlusClientFabric.java
+++ b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/client/fabric/BetterAnimalsPlusClientFabric.java
@@ -2,7 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
import dev.emi.trinkets.api.SlotReference;
import dev.emi.trinkets.api.client.TrinketRenderer;
import dev.emi.trinkets.api.client.TrinketRendererRegistry;
@@ -108,7 +108,7 @@ public void render(ItemStack stack, SlotReference slotReference, EntityModel<? e
}
if (player.isCrouching()) {
matrixStack.translate(0.0F, 0.2F, 0.0F);
- matrixStack.mulPose(Vector3f.XP.rotationDegrees(90.0F / (float) Math.PI));
+ matrixStack.mulPose(Axis.XP.rotationDegrees(90.0F / (float) Math.PI));
}
EntityRenderer<? super LivingEntity> render = Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
if (render instanceof LivingEntityRenderer) {
diff --git a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/fabric/BetterAnimalsPlusModImpl.java b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/fabric/BetterAnimalsPlusModImpl.java
deleted file mode 100644
index 286b93f7..00000000
--- a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/fabric/BetterAnimalsPlusModImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package dev.itsmeow.betteranimalsplus.fabric;
-
-import dev.itsmeow.betteranimalsplus.BetterAnimalsPlusMod;
-import dev.itsmeow.betteranimalsplus.Ref;
-import dev.itsmeow.betteranimalsplus.init.ModEntities;
-import dev.itsmeow.betteranimalsplus.init.ModItems;
-import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
-import net.minecraft.core.NonNullList;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-
-import java.util.Iterator;
-import java.util.stream.Collectors;
-
-public class BetterAnimalsPlusModImpl {
- public static CreativeModeTab getPlatformTab() {
- return FabricItemGroupBuilder.create(new ResourceLocation(Ref.MOD_ID, "main"))
- .icon(() -> new ItemStack(ModItems.ANTLER.get()))
- .appendItems(list -> {
- NonNullList<ItemStack> tabList = NonNullList.create();
- Registry.ITEM.forEach(item -> item.fillItemCategory(BetterAnimalsPlusMod.TAB, tabList));
- list.addAll(tabList);
- list.addAll(ModEntities.getEntities().values().stream().map(cont -> new ItemStack(cont.getEggItem().get())).collect(Collectors.toList()));
- })
- .build();
- }
-}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 163f6936..f6c203ac 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -30,9 +30,9 @@
},
"depends": {
"minecraft": "1.19.x",
- "architectury": ">=5.6.21",
+ "architectury": ">=7.0.0",
"fabricloader": ">=0.12.0",
- "fabric": ">=0.32.0"
+ "fabric-api": ">=0.32.0"
},
"mixins": [
"mixin.imdlib.json",
diff --git a/forge/src/main/java/dev/itsmeow/betteranimalsplus/forge/BetterAnimalsPlusModImpl.java b/forge/src/main/java/dev/itsmeow/betteranimalsplus/forge/BetterAnimalsPlusModImpl.java
deleted file mode 100644
index 65c2ab78..00000000
--- a/forge/src/main/java/dev/itsmeow/betteranimalsplus/forge/BetterAnimalsPlusModImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package dev.itsmeow.betteranimalsplus.forge;
-
-import dev.itsmeow.betteranimalsplus.Ref;
-import dev.itsmeow.betteranimalsplus.init.ModEntities;
-import dev.itsmeow.betteranimalsplus.init.ModItems;
-import net.minecraft.core.NonNullList;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.ItemLike;
-
-public class BetterAnimalsPlusModImpl {
- public static CreativeModeTab getPlatformTab() {
- return new CreativeModeTab(Ref.MOD_ID + ".main") {
- @Override
- public ItemStack makeIcon() {
- return new ItemStack(ModItems.ANTLER.get());
- }
-
- @Override
- public void fillItemList(NonNullList<ItemStack> toDisplay) {
- super.fillItemList(toDisplay);
- ModEntities.getEntities().values().forEach(cont -> toDisplay.add(new ItemStack((ItemLike) cont.getEggItem().get())));
- }
- };
- }
-}
\ No newline at end of file
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index a7510069..2df6d95c 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
modLoader="javafml" #mandatory
-loaderVersion="[41,)" #mandatory
+loaderVersion="[44,)" #mandatory
issueTrackerURL="https://github.com/itsmeow/betteranimalsplus/issues" #optional
displayURL="https://betteranimalsplus.com/" #optional
logoFile="icon.png" #optional
@@ -17,12 +17,12 @@ Adds 35+ new animals to your world, with items, food, blocks, and armor to suppl
[[dependencies.betteranimalsplus]]
modId="forge"
mandatory=true
- versionRange="[41.0.94,)"
+ versionRange="[44.0.0,)"
ordering="NONE"
side="BOTH"
[[dependencies.betteranimalsplus]]
modId="architectury"
mandatory=true
- versionRange="[5.9.30,)"
+ versionRange="[7.0.0,)"
ordering="NONE"
side="BOTH"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 636c750d..e8eb2135 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,12 +4,12 @@
maven_group = dev.itsmeow.betteranimalsplus
# API Versions
- mc_version = 1.19.2
- forge_version = 43.2.1
- architectury_version = 6.4.62
+ mc_version = 1.19.3
+ forge_version = 44.0.37
+ architectury_version = 7.0.65
fabric_loader_version = 0.14.12
- fabric_api_version = 0.69.0+1.19.2
- imdlib_version = 1.19-2ed024e0ae3f26248be3ed95b795af058245f0ad
+ fabric_api_version = 0.69.1+1.19.3
+ imdlib_version = 1.19.3-61afa336c9598bc11e77b2014684fa06166d34a6
# Publishing
github = itsmeow/betteranimalsplus
@@ -18,8 +18,8 @@
hook_content = <@&658183075255025664>
curse_title = Better Animals Plus
curse_project_id = 303557
- curse_versions_fabric = Minecraft 1.19:1.19,Minecraft 1.19:1.19.1,Minecraft 1.19:1.19.2,Java 17,Fabric,Quilt
- curse_versions_forge = Minecraft 1.19:1.19,Minecraft 1.19:1.19.1,Minecraft 1.19:1.19.2,Java 17,Forge
+ curse_versions_fabric = Minecraft 1.19:1.19.3,Java 17,Fabric,Quilt
+ curse_versions_forge = Minecraft 1.19:1.19.3,Java 17,Forge
curse_relations_fabric = fabric-api:requiredDependency,architectury-api:requiredDependency,cloth-config:optionalDependency,modmenu:optionalDependency,trinkets:optionalDependency,fiber2cloth:embeddedLibrary
curse_relations_forge = architectury-api:requiredDependency,curios:optionalDependency
@@ -30,6 +30,6 @@
# Misc
org.gradle.jvmargs = -Xmx4G
org.gradle.daemon = true
- curios_version = 1.19.2-5.1.1.0
- # 3.4.1
- trinkets_version = 4100104
+ curios_version = 1.19.3-5.1.1.2
+ # 3.5.0
+ trinkets_version = 4167221