Organized items. MOved creative tab setter to parent.

src/main/java/techreborn/blocks/BlockOre.java

@@ -51,8 +51,8 @@ import reborncore.common.util.StringUtils;
 import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModBlocks;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
-import techreborn.items.ItemGems;
+import techreborn.items.ingredients.ItemGems;
 import techreborn.lib.ModInfo;
 import techreborn.world.config.IOreNameProvider;
 

src/main/java/techreborn/blocks/BlockRubberLog.java

@@ -48,7 +48,7 @@ import prospector.shootingstar.model.ModelCompound;
 import reborncore.common.util.WorldUtils;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModSounds;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 import techreborn.items.tools.ItemElectricTreetap;
 import techreborn.items.tools.ItemTreeTap;
 import techreborn.lib.ModInfo;

src/main/java/techreborn/client/RegisterItemJsons.java

@@ -39,6 +39,13 @@ import techreborn.config.ConfigTechReborn;
 import techreborn.init.ModBlocks;
 import techreborn.init.ModItems;
 import techreborn.items.*;
+import techreborn.items.ingredients.ItemDusts;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemGems;
+import techreborn.items.ingredients.ItemIngots;
+import techreborn.items.ingredients.ItemNuggets;
+import techreborn.items.ingredients.ItemParts;
+import techreborn.items.ingredients.ItemPlates;
 
 import java.util.Map;
 

src/main/java/techreborn/client/gui/GuiManual.java

@@ -30,7 +30,7 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
-import techreborn.items.tools.ItemTechManual;
+import techreborn.items.ItemTechManual;
 
 import java.awt.*;
 

src/main/java/techreborn/compat/ic2/RecipesIC2.java

@@ -45,7 +45,7 @@ import techreborn.compat.ICompatModule;
 import techreborn.init.ModBlocks;
 import techreborn.init.ModItems;
 import techreborn.init.recipes.RecipeMethods;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java

@@ -110,7 +110,7 @@ import techreborn.init.IC2Duplicates;
 import techreborn.init.ModBlocks;
 import techreborn.init.ModFluids;
 import techreborn.init.ModItems;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/techreborn/compat/thermalexpansion/RecipeThermalExpansion.java

@@ -41,8 +41,8 @@ import techreborn.api.generator.GeneratorRecipeHelper;
 import techreborn.compat.ICompatModule;
 import techreborn.init.ModItems;
 import techreborn.init.recipes.RecipeMethods;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
-import techreborn.items.ItemPlates;
+import techreborn.items.ingredients.ItemPlates;
 
 /**
  * Created by modmuss50 on 06/07/2017.

src/main/java/techreborn/events/BlockBreakHandler.java

@@ -37,8 +37,8 @@ import reborncore.common.registration.RebornRegistry;
 import reborncore.common.registration.impl.ConfigRegistry;
 import reborncore.common.util.OreDrop;
 import techreborn.init.ModItems;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
-import techreborn.items.ItemGems;
+import techreborn.items.ingredients.ItemGems;
 import techreborn.lib.ModInfo;
 import techreborn.utils.OreDictUtils;
 

src/main/java/techreborn/init/IC2Dict.java

@@ -40,7 +40,7 @@ import reborncore.api.recipe.RecipeHandler;
 import reborncore.common.util.OreUtil;
 import techreborn.Core;
 import techreborn.api.recipe.machines.ExtractorRecipe;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 
 /**
  * Created by modmuss50 on 16/07/2016.

src/main/java/techreborn/init/IC2Duplicates.java

@@ -28,8 +28,8 @@ import net.minecraft.item.ItemStack;
 import techreborn.blocks.cable.EnumCableType;
 import techreborn.compat.CompatManager;
 import techreborn.config.ConfigTechReborn;
-import techreborn.items.ItemIngots;
+import techreborn.items.ingredients.ItemIngots;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 
 /**
  * Created by Mark on 18/12/2016.

src/main/java/techreborn/init/ModItems.java

@@ -36,53 +36,77 @@ import techreborn.api.Reference;
 import techreborn.blocks.BlockMachineFrames;
 import techreborn.config.ConfigTechReborn;
 import techreborn.items.*;
+import techreborn.items.armor.ItemCloakingDevice;
 import techreborn.items.armor.ItemLapotronPack;
 import techreborn.items.armor.ItemLithiumBatpack;
 import techreborn.items.armor.ItemTRArmour;
 import techreborn.items.battery.*;
+import techreborn.items.ingredients.ItemDusts;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemGems;
+import techreborn.items.ingredients.ItemIngots;
+import techreborn.items.ingredients.ItemNuggets;
+import techreborn.items.ingredients.ItemParts;
+import techreborn.items.ingredients.ItemPlates;
+import techreborn.items.ingredients.ItemUUmatter;
 import techreborn.items.tools.*;
 
 import javax.annotation.Nullable;
 
 public class ModItems {
-
 	public static final String META_PLACEHOLDER = "PLACEHOLDER_ITEM";
+	
+	// Ingredients
+	public static Item DUSTS;
 	public static Item GEMS;
 	public static Item INGOTS;
 	public static Item NUGGETS;
-	public static Item DUSTS;
-	public static Item SMALL_DUSTS;
 	public static Item PARTS;
-	public static Item ROCK_CUTTER;
-	public static Item LITHIUM_BATTERY_PACK;
-	public static Item LAPOTRONIC_ORB_PACK;
-	public static Item LITHIUM_BATTERY;
-	public static Item OMNI_TOOL;
-	public static Item LAPOTRONIC_ORB;
-	public static Item MANUAL;
-	public static Item UU_MATTER;
 	public static Item PLATES;
+	public static Item SMALL_DUSTS;
+	public static Item UU_MATTER;
+	
+	// Armor
 	public static Item CLOAKING_DEVICE;
-	public static Item RE_BATTERY;
+	public static Item LAPOTRONIC_ORB_PACK;
-	public static Item TREE_TAP;
+	public static Item LITHIUM_BATTERY_PACK;
-	public static Item ELECTRIC_TREE_TAP;
+	
-	public static Item STEEL_DRILL;
+	// Battery
-	public static Item DIAMOND_DRILL;
-	public static Item ADVANCED_DRILL;
-	public static Item STEEL_CHAINSAW;
-	public static Item DIAMOND_CHAINSAW;
-	public static Item ADVANCED_CHAINSAW;
-	public static Item STEEL_JACKHAMMER;
-	public static Item DIAMOND_JACKHAMMER;
-	public static Item ADVANCED_JACKHAMMER;
-	public static Item NANOSABER;
-	public static Item WRENCH;
-	public static Item LAPOTRONIC_CRYSTAL;
 	public static Item ENERGY_CRYSTAL;
-	public static Item SCRAP_BOX;
+	public static Item LAPOTRONIC_CRYSTAL;
+	public static Item LAPOTRONIC_ORB;
+	public static Item LITHIUM_BATTERY;
+	public static Item RE_BATTERY;
+	
+	// Tools
+	public static Item ADVANCED_CHAINSAW;
+	public static Item ADVANCED_DRILL;
+	public static Item ADVANCED_JACKHAMMER;
+	public static Item DEBUG;
+	public static Item DIAMOND_CHAINSAW;
+	public static Item DIAMOND_DRILL;
+	public static Item DIAMOND_JACKHAMMER;
+	public static Item ELECTRIC_TREE_TAP;
+	public static Item NANOSABER;
+	public static Item OMNI_TOOL;
+	public static Item ROCK_CUTTER;
+	public static Item STEEL_CHAINSAW;
+	public static Item STEEL_DRILL;
+	public static Item STEEL_JACKHAMMER;
+	public static Item TREE_TAP;
+	public static Item WRENCH;
+	
+	// Other
+	public static DynamicCell CELL;
 	public static Item FREQUENCY_TRANSMITTER;
-	public static @Nullable
+	public static Item MANUAL;
-	Item BRONZE_SWORD;
+	public static Item MISSING_RECIPE_PLACEHOLDER;
+	public static Item SCRAP_BOX;
+	public static Item UPGRADES;
+
+	// Gem armor&tools
+	@Nullable
+	public static Item BRONZE_SWORD;
 	@Nullable
 	public static Item BRONZE_PICKAXE;
 	@Nullable
@@ -153,78 +177,94 @@ public class ModItems {
 	public static Item PERIDOT_LEGGINGS;
 	@Nullable
 	public static Item PERIDOT_BOOTS;
-	public static Item UPGRADES;
-	public static Item MISSING_RECIPE_PLACEHOLDER;
-	public static Item DEBUG;
-	public static DynamicCell CELL;
 
 	public static void init() throws InstantiationException, IllegalAccessException {
+		// Ingredients
+		DUSTS = new ItemDusts();
+		registerItem(DUSTS, "dust");
 		GEMS = new ItemGems();
 		registerItem(GEMS, "gem");
 		INGOTS = new ItemIngots();
 		registerItem(INGOTS, "ingot");
-		DUSTS = new ItemDusts();
-		registerItem(DUSTS, "dust");
-		SMALL_DUSTS = new ItemDustsSmall();
-		registerItem(SMALL_DUSTS, "smallDust");
-		PLATES = new ItemPlates();
-		registerItem(PLATES, "plates");
 		NUGGETS = new ItemNuggets();
 		registerItem(NUGGETS, "nuggets");
-		// purifiedCrushedOre = new ItemPurifiedCrushedOre();
-		// registerItem(purifiedCrushedOre, "purifiedCrushedOre");
 		PARTS = new ItemParts();
 		registerItem(PARTS, "part");
+		PLATES = new ItemPlates();
+		registerItem(PLATES, "plates");		
+		SMALL_DUSTS = new ItemDustsSmall();
+		registerItem(SMALL_DUSTS, "smallDust");
+		UU_MATTER = new ItemUUmatter();
+		registerItem(UU_MATTER, "uumatter");
 
-		ROCK_CUTTER = new ItemRockCutter();
+		// Armor
-		registerItem(ROCK_CUTTER, "rockCutter");
+		CLOAKING_DEVICE = new ItemCloakingDevice();
-		LITHIUM_BATTERY_PACK = new ItemLithiumBatpack();
+		registerItem(CLOAKING_DEVICE, "cloakingdevice");
-		registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack");
 		LAPOTRONIC_ORB_PACK = new ItemLapotronPack();
 		registerItem(LAPOTRONIC_ORB_PACK, "lapotronPack");
-		LITHIUM_BATTERY = new ItemLithiumBattery();
+		LITHIUM_BATTERY_PACK = new ItemLithiumBatpack();
-		registerItem(LITHIUM_BATTERY, "lithiumBattery");
+		registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack");
-		LAPOTRONIC_ORB = new ItemLapotronicOrb();
+		
-		registerItem(LAPOTRONIC_ORB, "lapotronicOrb");
+		// Battery
-		OMNI_TOOL = new ItemOmniTool();
-		registerItem(OMNI_TOOL, "omniTool");
 		ENERGY_CRYSTAL = new ItemEnergyCrystal();
 		registerItem(ENERGY_CRYSTAL, "energycrystal");
 		LAPOTRONIC_CRYSTAL = new ItemLapotronCrystal();
-		registerItem(LAPOTRONIC_CRYSTAL, "lapotroncrystal");
+		registerItem(LAPOTRONIC_CRYSTAL, "lapotroncrystal");		
-
+		LAPOTRONIC_ORB = new ItemLapotronicOrb();
-		MANUAL = new ItemTechManual();
+		registerItem(LAPOTRONIC_ORB, "lapotronicOrb");		
-		registerItem(MANUAL, "techmanuel");
+		LITHIUM_BATTERY = new ItemLithiumBattery();
-		UU_MATTER = new ItemUUmatter();
+		registerItem(LITHIUM_BATTERY, "lithiumBattery");
-		registerItem(UU_MATTER, "uumatter");
 		RE_BATTERY = new ItemReBattery();
-		registerItem(RE_BATTERY, "rebattery");
+		registerItem(RE_BATTERY, "rebattery");		
-		TREE_TAP = new ItemTreeTap();
+		
-		registerItem(TREE_TAP, "treetap");
+		// Tools
-
-		ELECTRIC_TREE_TAP = new ItemElectricTreetap();
-		registerItem(ELECTRIC_TREE_TAP, "electricTreetap");
-
-		STEEL_DRILL = new ItemSteelDrill();
-		registerItem(STEEL_DRILL, "irondrill");
-		DIAMOND_DRILL = new ItemDiamondDrill();
-		registerItem(DIAMOND_DRILL, "diamonddrill");
-		ADVANCED_DRILL = new ItemAdvancedDrill();
-		registerItem(ADVANCED_DRILL, "advanceddrill");
-
-		STEEL_CHAINSAW = new ItemSteelChainsaw();
-		registerItem(STEEL_CHAINSAW, "ironchainsaw");
-		DIAMOND_CHAINSAW = new ItemDiamondChainsaw();
-		registerItem(DIAMOND_CHAINSAW, "diamondchainsaw");
 		ADVANCED_CHAINSAW = new ItemAdvancedChainsaw();
-		registerItem(ADVANCED_CHAINSAW, "advancedchainsaw");
+		registerItem(ADVANCED_CHAINSAW, "advancedchainsaw");		
-
+		ADVANCED_DRILL = new ItemAdvancedDrill();
-		STEEL_JACKHAMMER = new ItemSteelJackhammer();
+		registerItem(ADVANCED_DRILL, "advanceddrill");		
-		registerItem(STEEL_JACKHAMMER, "steeljackhammer");
+		ADVANCED_JACKHAMMER = new ItemAdvancedJackhammer();
+		registerItem(ADVANCED_JACKHAMMER, "ironjackhammer");		
+		DEBUG = new ItemDebugTool();
+		registerItem(DEBUG, "debug");		
+		DIAMOND_CHAINSAW = new ItemDiamondChainsaw();
+		registerItem(DIAMOND_CHAINSAW, "diamondchainsaw");		
+		DIAMOND_DRILL = new ItemDiamondDrill();
+		registerItem(DIAMOND_DRILL, "diamonddrill");		
 		DIAMOND_JACKHAMMER = new ItemDiamondJackhammer();
 		registerItem(DIAMOND_JACKHAMMER, "diamondjackhammer");
-		ADVANCED_JACKHAMMER = new ItemAdvancedJackhammer();
+		ELECTRIC_TREE_TAP = new ItemElectricTreetap();
-		registerItem(ADVANCED_JACKHAMMER, "ironjackhammer");
+		registerItem(ELECTRIC_TREE_TAP, "electricTreetap");	
+		NANOSABER = new ItemNanosaber();
+		registerItem(NANOSABER, "nanosaber");
+		OMNI_TOOL = new ItemOmniTool();
+		registerItem(OMNI_TOOL, "omniTool");		
+		ROCK_CUTTER = new ItemRockCutter();
+		registerItem(ROCK_CUTTER, "rockCutter");
+		STEEL_CHAINSAW = new ItemSteelChainsaw();
+		registerItem(STEEL_CHAINSAW, "ironchainsaw");		
+		STEEL_DRILL = new ItemSteelDrill();
+		registerItem(STEEL_DRILL, "irondrill");	
+		STEEL_JACKHAMMER = new ItemSteelJackhammer();
+		registerItem(STEEL_JACKHAMMER, "steeljackhammer");
+		TREE_TAP = new ItemTreeTap();
+		registerItem(TREE_TAP, "treetap");		
+		WRENCH = new ItemWrench();
+		registerItem(WRENCH, "wrench");
+		
+		// Other
+		CELL = new DynamicCell();
+		registerItem(CELL, "dynamicCell");
+		MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);		
+		FREQUENCY_TRANSMITTER = new ItemFrequencyTransmitter();
+		registerItem(FREQUENCY_TRANSMITTER, "frequencyTransmitter");
+		MANUAL = new ItemTechManual();
+		registerItem(MANUAL, "techmanuel");
+		MISSING_RECIPE_PLACEHOLDER = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
+		registerItem(MISSING_RECIPE_PLACEHOLDER, "missingRecipe");
+		SCRAP_BOX = new ItemScrapBox();
+		registerItem(SCRAP_BOX, "scrapbox");
+		UPGRADES = new ItemUpgrades();
+		registerItem(UPGRADES, "upgrades");
 
 		if (ConfigTechReborn.enableGemArmorAndTools) {
 			BRONZE_SWORD = new ItemTRSword(Reference.BRONZE, "ingotBronze");
@@ -308,35 +348,6 @@ public class ModItems {
 			registerItem(PERIDOT_BOOTS, "peridotBoots");
 		}
 
-		WRENCH = new ItemWrench();
-		registerItem(WRENCH, "wrench");
-
-		NANOSABER = new ItemNanosaber();
-		registerItem(NANOSABER, "nanosaber");
-
-		SCRAP_BOX = new ItemScrapBox();
-		registerItem(SCRAP_BOX, "scrapbox");
-
-		FREQUENCY_TRANSMITTER = new ItemFrequencyTransmitter();
-		registerItem(FREQUENCY_TRANSMITTER, "frequencyTransmitter");
-
-		UPGRADES = new ItemUpgrades();
-		registerItem(UPGRADES, "upgrades");
-
-		CLOAKING_DEVICE = new ItemCloakingDevice();
-		registerItem(CLOAKING_DEVICE, "cloakingdevice");
-
-		MISSING_RECIPE_PLACEHOLDER = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
-		registerItem(MISSING_RECIPE_PLACEHOLDER, "missingRecipe");
-
-		DEBUG = new ItemDebugTool();
-		registerItem(DEBUG, "debug");
-
-		CELL = new DynamicCell();
-		registerItem(CELL, "dynamicCell");
-
-		MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
-
 		Core.logHelper.info("TechReborns Items Loaded");
 
 		BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1);
@@ -349,5 +360,4 @@ public class ModItems {
 		item.setRegistryName(name);
 		RebornRegistry.registerItem(item);
 	}
-
 }

src/main/java/techreborn/init/ModRecipes.java

@@ -48,6 +48,10 @@ import techreborn.compat.CompatManager;
 import techreborn.config.ConfigTechReborn;
 import techreborn.init.recipes.*;
 import techreborn.items.*;
+import techreborn.items.ingredients.ItemDusts;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemIngots;
+import techreborn.items.ingredients.ItemPlates;
 import techreborn.lib.ModInfo;
 
 import java.security.InvalidParameterException;

src/main/java/techreborn/init/OreDict.java

@@ -34,7 +34,13 @@ import reborncore.common.util.OreUtil;
 import techreborn.Core;
 import techreborn.blocks.BlockMachineFrames;
 import techreborn.blocks.cable.BlockCable;
-import techreborn.items.*;
+import techreborn.items.ingredients.ItemDusts;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemGems;
+import techreborn.items.ingredients.ItemIngots;
+import techreborn.items.ingredients.ItemNuggets;
+import techreborn.items.ingredients.ItemParts;
+import techreborn.items.ingredients.ItemPlates;
 
 public class OreDict {
 

src/main/java/techreborn/init/SubItemRetriever.java

@@ -29,6 +29,13 @@ import techreborn.api.ISubItemRetriever;
 import techreborn.blocks.BlockOre;
 import techreborn.blocks.BlockStorage;
 import techreborn.items.*;
+import techreborn.items.ingredients.ItemDusts;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemGems;
+import techreborn.items.ingredients.ItemIngots;
+import techreborn.items.ingredients.ItemNuggets;
+import techreborn.items.ingredients.ItemParts;
+import techreborn.items.ingredients.ItemPlates;
 
 /**
  * Created by Mark on 03/04/2016.

src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java

@@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack;
 import reborncore.api.recipe.RecipeHandler;
 import reborncore.common.util.OreUtil;
 import techreborn.api.recipe.machines.AlloySmelterRecipe;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
-import techreborn.items.ItemIngots;
+import techreborn.items.ingredients.ItemIngots;
 
 /**
  * @author drcrazy

src/main/java/techreborn/init/recipes/CraftingTableRecipes.java

@@ -42,6 +42,9 @@ import techreborn.init.IC2Duplicates;
 import techreborn.init.ModBlocks;
 import techreborn.init.ModItems;
 import techreborn.items.*;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemNuggets;
+import techreborn.items.ingredients.ItemParts;
 
 /**
  * Created by Prospector

src/main/java/techreborn/init/recipes/FusionReactorRecipes.java

@@ -28,7 +28,7 @@ import techreborn.api.reactor.FusionReactorRecipe;
 import techreborn.api.reactor.FusionReactorRecipeHelper;
 import techreborn.blocks.BlockOre;
 import techreborn.items.ItemCells;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
 
 /**
  * @author drcrazy

src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java

@@ -39,7 +39,7 @@ import reborncore.common.registration.RebornRegistry;
 import reborncore.common.registration.impl.ConfigRegistry;
 import reborncore.common.util.ItemUtils;
 import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
 import techreborn.lib.ModInfo;
 
 import javax.annotation.Nonnull;

src/main/java/techreborn/init/recipes/RecipeMethods.java

@@ -37,6 +37,13 @@ import techreborn.blocks.BlockOre;
 import techreborn.blocks.cable.BlockCable;
 import techreborn.init.IC2Duplicates;
 import techreborn.items.*;
+import techreborn.items.ingredients.ItemDusts;
+import techreborn.items.ingredients.ItemDustsSmall;
+import techreborn.items.ingredients.ItemGems;
+import techreborn.items.ingredients.ItemIngots;
+import techreborn.items.ingredients.ItemNuggets;
+import techreborn.items.ingredients.ItemParts;
+import techreborn.items.ingredients.ItemPlates;
 
 /**
  * Created by Prospector

src/main/java/techreborn/init/recipes/ScrapboxRecipes.java

@@ -34,9 +34,9 @@ import techreborn.api.recipe.machines.ScrapboxRecipe;
 import techreborn.init.ModBlocks;
 import techreborn.init.ModItems;
 import techreborn.items.DynamicCell;
-import techreborn.items.ItemDusts;
+import techreborn.items.ingredients.ItemDusts;
-import techreborn.items.ItemGems;
+import techreborn.items.ingredients.ItemGems;
-import techreborn.items.ItemNuggets;
+import techreborn.items.ingredients.ItemNuggets;
 import techreborn.utils.StackWIPHandler;
 
 /**

src/main/java/techreborn/items/ItemDestructopack.java

@@ -32,13 +32,11 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import techreborn.Core;
 import techreborn.client.EGui;
-import techreborn.utils.TechRebornCreativeTab;
 
 public class ItemDestructopack extends ItemTR {
 
 	public ItemDestructopack() {
 		this.setUnlocalizedName("techreborn.destructopack");
-		this.setCreativeTab(TechRebornCreativeTab.instance);
 	}
 
 	@Override

src/main/java/techreborn/items/ItemFrequencyTransmitter.java

@@ -41,7 +41,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import reborncore.client.hud.StackInfoElement;
 import reborncore.common.util.ChatUtils;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.init.ModItems;
 import techreborn.lib.MessageIDs;
 
@@ -52,7 +51,6 @@ public class ItemFrequencyTransmitter extends ItemTR {
 
 	public ItemFrequencyTransmitter() {
 		setUnlocalizedName("techreborn.frequencyTransmitter");
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setMaxStackSize(1);
 		this.addPropertyOverride(new ResourceLocation("techreborn:coords"), new IItemPropertyGetter() {
 			@Override

src/main/java/techreborn/items/ItemMissingRecipe.java

@@ -24,12 +24,10 @@
 
 package techreborn.items;
 
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 
 public class ItemMissingRecipe extends ItemTR {
 	public ItemMissingRecipe() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setUnlocalizedName("techreborn.missingrecipe");
 		TRRecipeHandler.hideEntry(this);
 	}

src/main/java/techreborn/items/ItemScrapBox.java

@@ -34,7 +34,6 @@ import reborncore.api.recipe.IBaseRecipeType;
 import reborncore.api.recipe.RecipeHandler;
 import reborncore.common.util.WorldUtils;
 import techreborn.api.Reference;
-import techreborn.utils.TechRebornCreativeTab;
 
 import java.util.List;
 
@@ -42,7 +41,6 @@ public class ItemScrapBox extends ItemTR {
 
 	public ItemScrapBox() {
 		setUnlocalizedName("techreborn.scrapbox");
-		setCreativeTab(TechRebornCreativeTab.instance);
 	}
 
 	@Override

src/main/java/techreborn/items/ItemTechManual.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package techreborn.items.tools;
+package techreborn.items;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -32,13 +32,10 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import techreborn.Core;
 import techreborn.client.EGui;
-import techreborn.utils.TechRebornCreativeTab;
-import techreborn.items.ItemTR;
 
 public class ItemTechManual extends ItemTR {
 
 	public ItemTechManual() {
-		this.setCreativeTab(TechRebornCreativeTab.instance);
 		this.setUnlocalizedName("techreborn.manual");
 		this.setMaxStackSize(1);
 	}

src/main/java/techreborn/items/ItemUpgrades.java

@@ -43,7 +43,6 @@ import reborncore.common.registration.impl.ConfigRegistry;
 import reborncore.common.tile.TileLegacyMachineBase;
 import reborncore.common.util.ItemNBTHelper;
 import techreborn.Core;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.client.container.builder.BuiltContainer;
 import techreborn.client.container.builder.ContainerBuilder;
 import techreborn.init.ModItems;
@@ -71,7 +70,6 @@ public class ItemUpgrades extends ItemTR implements IUpgrade {
 	public ItemUpgrades() {
 		setUnlocalizedName("techreborn.upgrade");
 		setHasSubtypes(true);
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setMaxStackSize(16);
 	}
 

src/main/java/techreborn/items/armor/ItemCloakingDevice.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package techreborn.items.tools;
+package techreborn.items.armor;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -49,7 +49,6 @@ import techreborn.api.Reference;
 import techreborn.utils.TechRebornCreativeTab;
 import techreborn.config.ConfigTechReborn;
 import techreborn.init.ModItems;
-import techreborn.items.armor.ItemTRArmour;
 import techreborn.lib.ModInfo;
 
 import javax.annotation.Nullable;

src/main/java/techreborn/items/ingredients/ItemDusts.java

@@ -22,16 +22,16 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModItems;
+import techreborn.items.ItemTR;
 
 import java.security.InvalidParameterException;
 
@@ -48,7 +48,6 @@ public class ItemDusts extends ItemTR {
 	public ItemDusts() {
 		setUnlocalizedName("techreborn.dust");
 		setHasSubtypes(true);
-		setCreativeTab(TechRebornCreativeTab.instance);
 		TRRecipeHandler.hideEntry(this);
 	}
 

src/main/java/techreborn/items/ingredients/ItemDustsSmall.java

@@ -22,15 +22,15 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModItems;
+import techreborn.items.ItemTR;
 
 import java.security.InvalidParameterException;
 
@@ -48,7 +48,6 @@ public class ItemDustsSmall extends ItemTR {
 	public ItemDustsSmall() {
 		setUnlocalizedName("techreborn.dustsmall");
 		setHasSubtypes(true);
-		setCreativeTab(TechRebornCreativeTab.instance);
 		TRRecipeHandler.hideEntry(this);
 	}
 

src/main/java/techreborn/items/ingredients/ItemGems.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
@@ -30,8 +30,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModItems;
-import techreborn.utils.TechRebornCreativeTab;
+import techreborn.items.ItemTR;
-
 import java.security.InvalidParameterException;
 
 public class ItemGems extends ItemTR {
@@ -39,7 +38,6 @@ public class ItemGems extends ItemTR {
 	public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet" };
 
 	public ItemGems() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setUnlocalizedName("techreborn.gem");
 		setHasSubtypes(true);
 		TRRecipeHandler.hideEntry(this);

src/main/java/techreborn/items/ingredients/ItemIngots.java

@@ -22,16 +22,16 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModItems;
+import techreborn.items.ItemTR;
 
 import java.security.InvalidParameterException;
 
@@ -42,7 +42,6 @@ public class ItemIngots extends ItemTR {
 		"iridium_alloy" };
 
 	public ItemIngots() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setHasSubtypes(true);
 		setUnlocalizedName("techreborn.ingot");
 		TRRecipeHandler.hideEntry(this);

src/main/java/techreborn/items/ingredients/ItemNuggets.java

@@ -22,15 +22,15 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModItems;
+import techreborn.items.ItemTR;
 
 import java.security.InvalidParameterException;
 
@@ -42,7 +42,6 @@ public class ItemNuggets extends ItemTR {
 		ModItems.META_PLACEHOLDER, "iron", "diamond" };
 
 	public ItemNuggets() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setHasSubtypes(true);
 		setUnlocalizedName("techreborn.nuggets");
 		TRRecipeHandler.hideEntry(this);

src/main/java/techreborn/items/ingredients/ItemParts.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
@@ -34,6 +34,7 @@ import techreborn.Core;
 import techreborn.client.EGui;
 import techreborn.utils.TechRebornCreativeTab;
 import techreborn.init.ModItems;
+import techreborn.items.ItemTR;
 
 import java.security.InvalidParameterException;
 

src/main/java/techreborn/items/ingredients/ItemPlates.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
 import com.google.common.base.CaseFormat;
 import net.minecraft.creativetab.CreativeTabs;
@@ -32,6 +32,7 @@ import reborncore.common.util.OreUtil;
 import techreborn.utils.TechRebornCreativeTab;
 import techreborn.events.TRRecipeHandler;
 import techreborn.init.ModItems;
+import techreborn.items.ItemTR;
 
 import java.security.InvalidParameterException;
 

src/main/java/techreborn/items/ingredients/ItemUUmatter.java

@@ -22,14 +22,13 @@
  * SOFTWARE.
  */
 
-package techreborn.items;
+package techreborn.items.ingredients;
 
-import techreborn.utils.TechRebornCreativeTab;
+import techreborn.items.ItemTR;
 
 public class ItemUUmatter extends ItemTR {
 
 	public ItemUUmatter() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setUnlocalizedName("techreborn.uuMatter");
 	}
 }

src/main/java/techreborn/items/tools/ItemDebugTool.java

@@ -36,7 +36,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.energy.CapabilityEnergy;
 import reborncore.api.power.IEnergyInterfaceTile;
 import reborncore.common.powerSystem.PowerSystem;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.items.ItemTR;
 
 /**
@@ -45,7 +44,6 @@ import techreborn.items.ItemTR;
 public class ItemDebugTool extends ItemTR {
 
 	public ItemDebugTool() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setUnlocalizedName("techreborn.debug");
 	}
 

src/main/java/techreborn/items/tools/ItemElectricTreetap.java

@@ -47,7 +47,6 @@ import reborncore.common.powerSystem.PowerSystem;
 import reborncore.common.powerSystem.PoweredItemContainerProvider;
 import reborncore.common.powerSystem.forge.ForgePowerItemManager;
 import reborncore.common.util.ItemUtils;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.compat.CompatManager;
 import techreborn.init.ModItems;
 import techreborn.items.ItemTR;
@@ -65,7 +64,6 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
 
 	public ItemElectricTreetap() {
 		setUnlocalizedName("techreborn.electric_treetap");
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setMaxStackSize(1);
 	}
 

src/main/java/techreborn/items/tools/ItemTreeTap.java

@@ -35,7 +35,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.compat.CompatManager;
 import techreborn.events.TRRecipeHandler;
 import techreborn.items.ItemTR;
@@ -46,7 +45,6 @@ public class ItemTreeTap extends ItemTR {
 		setMaxStackSize(1);
 		setMaxDamage(20);
 		setUnlocalizedName("techreborn.treetap");
-		setCreativeTab(TechRebornCreativeTab.instance);
 	}
 
 	@Override

src/main/java/techreborn/items/tools/ItemWrench.java

@@ -37,7 +37,6 @@ import net.minecraftforge.server.permission.PermissionAPI;
 import net.minecraftforge.server.permission.context.BlockPosContext;
 import reborncore.api.IToolHandler;
 import reborncore.common.util.RebornPermissions;
-import techreborn.utils.TechRebornCreativeTab;
 import techreborn.compat.CompatManager;
 import techreborn.items.ItemTR;
 import techreborn.utils.IC2WrenchHelper;
@@ -48,7 +47,6 @@ import techreborn.utils.IC2WrenchHelper;
 public class ItemWrench extends ItemTR implements IToolHandler {
 
 	public ItemWrench() {
-		setCreativeTab(TechRebornCreativeTab.instance);
 		setUnlocalizedName("techreborn.wrench");
 		setMaxStackSize(1);
 	}

src/main/java/techreborn/tiles/TileMatterFabricator.java

@@ -40,7 +40,7 @@ import techreborn.client.container.builder.ContainerBuilder;
 import techreborn.init.IC2Duplicates;
 import techreborn.init.ModBlocks;
 import techreborn.init.ModItems;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 import techreborn.lib.ModInfo;
 
 @RebornRegistry(modID = ModInfo.MOD_ID)

src/main/java/techreborn/tiles/tier1/TileRecycler.java

@@ -39,7 +39,7 @@ import techreborn.client.container.IContainerProvider;
 import techreborn.client.container.builder.BuiltContainer;
 import techreborn.client.container.builder.ContainerBuilder;
 import techreborn.init.ModBlocks;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 import techreborn.lib.ModInfo;
 
 @RebornRegistry(modID = ModInfo.MOD_ID)

src/main/java/techreborn/utils/TechRebornCreativeTab.java

@@ -26,7 +26,7 @@ package techreborn.utils;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
-import techreborn.items.ItemParts;
+import techreborn.items.ingredients.ItemParts;
 
 public class TechRebornCreativeTab extends CreativeTabs {