diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 85f21e032..1b4dd68b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -28,6 +28,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; +import net.minecraftforge.fml.common.registry.GameData; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -141,7 +143,8 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || Potion.potionTypes[brew.getPotionEffects(stack).get(0).getPotionID()].isInstant()) + FMLControlledNamespacedRegistry potionRegistry = GameData.getPotionRegistry(); + if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || potionRegistry.getObjectById(brew.getPotionEffects(stack).get(0).getPotionID()).isInstant()) return null; ItemStack brewStack = new ItemStack(this); diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png new file mode 100644 index 000000000..a3a1d26ad Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_sides.png new file mode 100644 index 000000000..e161b8a45 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_sides.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png new file mode 100644 index 000000000..a3a1d26ad Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_bottom.png new file mode 100644 index 000000000..781548367 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png new file mode 100644 index 000000000..f12545dff Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_top.png new file mode 100644 index 000000000..781548367 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_top.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png new file mode 100644 index 000000000..f5269c16b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png new file mode 100644 index 000000000..ac1dd433c Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_top.png new file mode 100644 index 000000000..f5269c16b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_top.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png new file mode 100644 index 000000000..4bd0ec9be Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png new file mode 100644 index 000000000..21357a3eb Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_bottom.png new file mode 100644 index 000000000..082cf4c31 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png new file mode 100644 index 000000000..0b1c547a0 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png new file mode 100644 index 000000000..c1931da93 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png new file mode 100644 index 000000000..82a9d99a6 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png new file mode 100644 index 000000000..163b2b90a Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWall.png new file mode 100644 index 000000000..b87afe102 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altar/default/kelkWall.png differ diff --git a/src/main/resources/assets/botania/textures/model/cocoon_bottom.png b/src/main/resources/assets/botania/textures/model/cocoon_bottom.png new file mode 100644 index 000000000..26c610309 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cocoon_bottom.png differ diff --git a/src/main/resources/assets/botania/textures/model/cocoon_east.png b/src/main/resources/assets/botania/textures/model/cocoon_east.png new file mode 100644 index 000000000..cf7d849a7 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cocoon_east.png differ diff --git a/src/main/resources/assets/botania/textures/model/cocoon_north.png b/src/main/resources/assets/botania/textures/model/cocoon_north.png new file mode 100644 index 000000000..f81aa88bf Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cocoon_north.png differ diff --git a/src/main/resources/assets/botania/textures/model/cocoon_south.png b/src/main/resources/assets/botania/textures/model/cocoon_south.png new file mode 100644 index 000000000..3ec44e528 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cocoon_south.png differ diff --git a/src/main/resources/assets/botania/textures/model/cocoon_top.png b/src/main/resources/assets/botania/textures/model/cocoon_top.png new file mode 100644 index 000000000..68d8b97ac Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cocoon_top.png differ diff --git a/src/main/resources/assets/botania/textures/model/cocoon_west.png b/src/main/resources/assets/botania/textures/model/cocoon_west.png new file mode 100644 index 000000000..06edf85a5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/cocoon_west.png differ