From 7176dcbb2c3fc8eedf25de2522a763e27ce42d4c Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 20 Dec 2015 22:37:33 +0100
Subject: [PATCH] Fix things appearing on creative tabs they shouldn't appear
 on

---
 .../ellpeck/actuallyadditions/blocks/base/BlockBase.java     | 3 +++
 .../ellpeck/actuallyadditions/blocks/base/BlockBushBase.java | 3 +++
 .../actuallyadditions/blocks/base/BlockContainerBase.java    | 3 +++
 .../actuallyadditions/blocks/base/BlockFluidFlowing.java     | 5 ++++-
 .../ellpeck/actuallyadditions/blocks/base/BlockPlant.java    | 3 +++
 .../ellpeck/actuallyadditions/blocks/base/BlockStair.java    | 3 +++
 .../ellpeck/actuallyadditions/blocks/base/BlockWallAA.java   | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemAllToolAA.java  | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemArmorAA.java    | 3 +++
 .../java/ellpeck/actuallyadditions/items/base/ItemAxeAA.java | 3 +++
 .../java/ellpeck/actuallyadditions/items/base/ItemBase.java  | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemBucketAA.java   | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemEnergy.java     | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemFoodBase.java   | 3 +++
 .../java/ellpeck/actuallyadditions/items/base/ItemHoeAA.java | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java  | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemShovelAA.java   | 3 +++
 .../ellpeck/actuallyadditions/items/base/ItemSwordAA.java    | 3 +++
 18 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBase.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBase.java
index 9491e8a41..72e94b645 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBase.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBase.java
@@ -35,6 +35,9 @@ public class BlockBase extends Block{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java
index 8babb693d..a7b9167ef 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockBushBase.java
@@ -34,6 +34,9 @@ public class BlockBushBase extends BlockBush{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java
index 2f46b405e..deaef2561 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockContainerBase.java
@@ -51,6 +51,9 @@ public abstract class BlockContainerBase extends BlockContainer{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java
index 2f6fedd19..1464fda5f 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockFluidFlowing.java
@@ -49,6 +49,9 @@ public class BlockFluidFlowing extends BlockFluidClassic{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
@@ -60,7 +63,7 @@ public class BlockFluidFlowing extends BlockFluidClassic{
     }
 
     public boolean shouldAddCreative(){
-        return true;
+        return false;
     }
 
     @Override
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockPlant.java
index f8d1e7563..5148327eb 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockPlant.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockPlant.java
@@ -54,6 +54,9 @@ public class BlockPlant extends BlockCrops{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockStair.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockStair.java
index 2eac6e3f2..fe10b44f4 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockStair.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockStair.java
@@ -41,6 +41,9 @@ public class BlockStair extends BlockStairs{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java
index 37314a490..6a0dc9fae 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java
@@ -50,6 +50,9 @@ public class BlockWallAA extends BlockWall{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java
index 8f79a2898..2a8579661 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java
@@ -66,6 +66,9 @@ public class ItemAllToolAA extends ItemTool{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemArmorAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemArmorAA.java
index 8322f8609..004530257 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemArmorAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemArmorAA.java
@@ -48,6 +48,9 @@ public class ItemArmorAA extends ItemArmor{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemAxeAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemAxeAA.java
index 0d5e2119c..39d7425e1 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemAxeAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemAxeAA.java
@@ -46,6 +46,9 @@ public class ItemAxeAA extends ItemAxe{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemBase.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemBase.java
index 0552d96cd..5d393a5d9 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemBase.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemBase.java
@@ -32,6 +32,9 @@ public class ItemBase extends Item{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemBucketAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemBucketAA.java
index 78d9fbbc1..b118045ea 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemBucketAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemBucketAA.java
@@ -41,6 +41,9 @@ public class ItemBucketAA extends ItemBucket{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemEnergy.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemEnergy.java
index b35ed894e..a186103b2 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemEnergy.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemEnergy.java
@@ -44,6 +44,9 @@ public abstract class ItemEnergy extends ItemEnergyContainer{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemFoodBase.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemFoodBase.java
index ac9b644e0..5bb6a71b6 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemFoodBase.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemFoodBase.java
@@ -33,6 +33,9 @@ public class ItemFoodBase extends ItemFood{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemHoeAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemHoeAA.java
index 8e1ef1ede..69afe2539 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemHoeAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemHoeAA.java
@@ -47,6 +47,9 @@ public class ItemHoeAA extends ItemHoe{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java
index 9cf898b4d..c89c04c14 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java
@@ -46,6 +46,9 @@ public class ItemPickaxeAA extends ItemPickaxe{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemShovelAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemShovelAA.java
index 745f72315..0810854e9 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemShovelAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemShovelAA.java
@@ -47,6 +47,9 @@ public class ItemShovelAA extends ItemSpade{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){
diff --git a/src/main/java/ellpeck/actuallyadditions/items/base/ItemSwordAA.java b/src/main/java/ellpeck/actuallyadditions/items/base/ItemSwordAA.java
index 6227a2c9b..8a3dd5e5c 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/base/ItemSwordAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/base/ItemSwordAA.java
@@ -47,6 +47,9 @@ public class ItemSwordAA extends ItemSword{
         if(this.shouldAddCreative()){
             this.setCreativeTab(CreativeTab.instance);
         }
+        else{
+            this.setCreativeTab(null);
+        }
     }
 
     protected String getBaseName(){