From 101e23bc1e6e92917fc390cb7359e0268595ea32 Mon Sep 17 00:00:00 2001
From: pjht <pjht@users.noreply.github.com>
Date: Sun, 18 Mar 2018 18:22:59 -0500
Subject: [PATCH] Change way clorine is obtained

---
 src/main/java/com/pjht/ssspcore/SSSPCore.java     |   1 -
 .../java/com/pjht/ssspcore/item/ModItems.java     |   1 -
 .../assets/ssspcore/models/item/brine_bucket.json |   6 ------
 .../assets/ssspcore/recipes/brine_bucket.json     |   1 -
 .../assets/ssspcore/recipes/clorine_bottle.json   |   2 +-
 .../ssspcore/textures/items/brine_bucket.png      | Bin 429 -> 0 bytes
 6 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 src/main/resources/assets/ssspcore/models/item/brine_bucket.json
 delete mode 100644 src/main/resources/assets/ssspcore/recipes/brine_bucket.json
 delete mode 100644 src/main/resources/assets/ssspcore/textures/items/brine_bucket.png

diff --git a/src/main/java/com/pjht/ssspcore/SSSPCore.java b/src/main/java/com/pjht/ssspcore/SSSPCore.java
index e710606..cd6641c 100644
--- a/src/main/java/com/pjht/ssspcore/SSSPCore.java
+++ b/src/main/java/com/pjht/ssspcore/SSSPCore.java
@@ -47,7 +47,6 @@ public class SSSPCore {
 
 	@Mod.EventHandler
 	public void postInit(FMLPostInitializationEvent event) {
-		Items.WATER_BUCKET.setContainerItem(null);
 	}
 
 	@Mod.EventBusSubscriber
diff --git a/src/main/java/com/pjht/ssspcore/item/ModItems.java b/src/main/java/com/pjht/ssspcore/item/ModItems.java
index 92a92fb..07af2ee 100644
--- a/src/main/java/com/pjht/ssspcore/item/ModItems.java
+++ b/src/main/java/com/pjht/ssspcore/item/ModItems.java
@@ -24,7 +24,6 @@ public class ModItems {
 		registerItem("phosphoric_acid");
 		registerItem("salt");
 		registerItem("boron");
-		registerItem("brine_bucket");
 		registerItem("hydrogen_bottle");
 		registerItem("clorine_bottle");
 		registerItem("hydrocloric_acid");
diff --git a/src/main/resources/assets/ssspcore/models/item/brine_bucket.json b/src/main/resources/assets/ssspcore/models/item/brine_bucket.json
deleted file mode 100644
index 18911c0..0000000
--- a/src/main/resources/assets/ssspcore/models/item/brine_bucket.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "ssspcore:items/brine_bucket"
-  }
-}
diff --git a/src/main/resources/assets/ssspcore/recipes/brine_bucket.json b/src/main/resources/assets/ssspcore/recipes/brine_bucket.json
deleted file mode 100644
index 14338ed..0000000
--- a/src/main/resources/assets/ssspcore/recipes/brine_bucket.json
+++ /dev/null
@@ -1 +0,0 @@
-{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"ssspcore:salt"},{"item":"minecraft:water_bucket"}],"result":{"item":"ssspcore:brine_bucket"}}
\ No newline at end of file
diff --git a/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json b/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json
index d891a49..c2058e5 100644
--- a/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json
+++ b/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json
@@ -1 +1 @@
-{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"ssspcore:brine_bucket"},{"item":"minecraft:redstone"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"}],"result":{"item":"ssspcore:clorine_bottle","count":4}}
+{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"ssspcore:salt"},{"item":"minecraft:redstone"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"}],"result":{"item":"ssspcore:clorine_bottle","count":4}}
diff --git a/src/main/resources/assets/ssspcore/textures/items/brine_bucket.png b/src/main/resources/assets/ssspcore/textures/items/brine_bucket.png
deleted file mode 100644
index 8adf7e2b4e9211b72a5a306d99ced16352937a93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$XGugsR5%gEQaet=KoEU4E+~)?1qe|3v}s&Mh$GNZkOpxEP|_iOBH{>18Xv$H
zKyFe-9Khf*5{MAjj-B0QXVI)SA5qXSQnYX8&AffHG4S8vtuqjYq2hY2R%3`bj#v5v
z%WA-b`Q0r<SwPJSe3Wyjat0IyP5>k93RwXf{=B+`m`)I=O1BC?dhja&DYc05@p5(w
zG072*$7(bh88<#VAgg<iU7hNBC4o|3CgzaP0z$#lW%-rkus`4tb6Nq)qA0>aZ-CwF
z8(?b_D$ukL@aGcyy}sd^&E|rDU4g44LeXlqxMa?0_W|YW8<6Us6DtD5)$4V<U!3D<
zd&jnRH0tP8GF$lpb_IIbcDrrq=c8kb3DE6XmSH#?f*+9TR)7+YG);|*Mx$X$d7hiw
znRm~%0&WB2`wjE2aca*60e1~@;Rfx$Y@hfA0Uk(_gdxcOZ?V=Ff6~i??&B?Uf6l)F
Xy&jMX?&n~600000NkvXXu0mjf$jG{(