diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index b2c46a84f..9eca2eae7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.material; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -23,6 +24,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -38,6 +40,7 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -158,7 +161,14 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelHandler.registerItemMetas(this, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]); + for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { + if (!"UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i])) { + ModelLoader.setCustomModelResourceLocation( + this, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i], "inventory") + ); + } + } } } diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_base.png b/src/main/resources/assets/botania/textures/items/waterbowl_base.png new file mode 100644 index 000000000..63d16ad6b Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/waterbowl_base.png differ diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_cover.png b/src/main/resources/assets/botania/textures/items/waterbowl_cover.png new file mode 100644 index 000000000..2bdfc5719 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/waterbowl_cover.png differ diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png b/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png new file mode 100644 index 000000000..524fb39be Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png index adf3ae5ed..a0fd952eb 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png index 3d3f5055c..3f802f238 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png index c8765746a..a60aa2495 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png index 5b3498b1a..874290ec9 100644 Binary files a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png and b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png differ