From cb098bdcd95723ee8a60ae28ca826c80295fcf6d Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Mon, 6 Nov 2017 05:19:58 +1000
Subject: $ Fixed a small issue with the Sulfuric acid potion. + Added a
 throwable HF potion, which is far nastier. + Added Fluid canner recipes for
 HF potions. % Rebalanced fluid amount gained from extracting raisins. $ Fixed
 raisin juice not having a proper recipe.

---
 .../core/item/general/ItemSulfuricAcidPotion.java  | 33 ----------------------
 .../throwables/ItemHydrofluoricAcidPotion.java     | 28 ++++++++++++++++++
 .../general/throwables/ItemSulfuricAcidPotion.java | 28 ++++++++++++++++++
 3 files changed, 56 insertions(+), 33 deletions(-)
 delete mode 100644 src/Java/gtPlusPlus/core/item/general/ItemSulfuricAcidPotion.java
 create mode 100644 src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
 create mode 100644 src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java

(limited to 'src/Java/gtPlusPlus/core/item/general')

diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSulfuricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/ItemSulfuricAcidPotion.java
deleted file mode 100644
index bd730448c8..0000000000
--- a/src/Java/gtPlusPlus/core/item/general/ItemSulfuricAcidPotion.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gtPlusPlus.core.item.general;
-
-import gregtech.api.enums.GT_Values;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.ItemUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-public class ItemSulfuricAcidPotion extends CoreItem {
-
-	public ItemSulfuricAcidPotion(String unlocalizedName, String displayName, String description) {
-		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null);
-	}
-	
-	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
-		if (!player.capabilities.isCreativeMode) {
-			--item.stackSize;
-		}
-		world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
-		if (!world.isRemote) {
-			world.spawnEntityInWorld(new EntitySulfuricAcidPotion(world, player));
-		}
-		return item;
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
new file mode 100644
index 0000000000..1ed49760c0
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.core.item.general.throwables;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion;
+import gtPlusPlus.core.item.base.CoreItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+public class ItemHydrofluoricAcidPotion extends CoreItem {
+
+	public ItemHydrofluoricAcidPotion(String unlocalizedName, String displayName, String description) {
+		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null);
+	}
+	
+	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
+		if (!player.capabilities.isCreativeMode) {
+			--item.stackSize;
+		}
+		world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+		if (!world.isRemote) {
+			world.spawnEntityInWorld(new EntityHydrofluoricAcidPotion(world, player));
+		}
+		return item;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
new file mode 100644
index 0000000000..60e3550b5c
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.core.item.general.throwables;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
+import gtPlusPlus.core.item.base.CoreItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+public class ItemSulfuricAcidPotion extends CoreItem {
+
+	public ItemSulfuricAcidPotion(String unlocalizedName, String displayName, String description) {
+		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null);
+	}
+	
+	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
+		if (!player.capabilities.isCreativeMode) {
+			--item.stackSize;
+		}
+		world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+		if (!world.isRemote) {
+			world.spawnEntityInWorld(new EntitySulfuricAcidPotion(world, player));
+		}
+		return item;
+	}
+}
\ No newline at end of file
-- 
cgit