Unify creative tabs

This commit is contained in:
Prospector 2018-06-12 15:42:20 -07:00
parent ac9c01555f
commit 6d3b415ddd
108 changed files with 157 additions and 203 deletions

View file

@ -47,7 +47,7 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack;
import org.apache.commons.lang3.Validate;
import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;

View file

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

View file

@ -29,7 +29,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
@ -48,7 +48,7 @@ public class ItemDusts extends ItemTR {
public ItemDusts() {
setUnlocalizedName("techreborn.dust");
setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}

View file

@ -28,7 +28,7 @@ import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
@ -48,7 +48,7 @@ public class ItemDustsSmall extends ItemTR {
public ItemDustsSmall() {
setUnlocalizedName("techreborn.dustsmall");
setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}

View file

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

View file

@ -28,7 +28,7 @@ import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
@ -36,10 +36,10 @@ import java.security.InvalidParameterException;
public class ItemGems extends ItemTR {
public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet" };
public static final String[] types = new String[] { "ruby", "sapphire", "peridot", "red_garnet", "yellow_garnet", "refined_diamond" };
public ItemGems() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.gem");
setHasSubtypes(true);
TRRecipeHandler.hideEntry(this);

View file

@ -29,7 +29,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
@ -42,7 +42,7 @@ public class ItemIngots extends ItemTR {
"iridium_alloy" };
public ItemIngots() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.ingot");
TRRecipeHandler.hideEntry(this);

View file

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

View file

@ -28,7 +28,7 @@ import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
@ -42,7 +42,7 @@ public class ItemNuggets extends ItemTR {
ModItems.META_PLACEHOLDER, "iron", "diamond" };
public ItemNuggets() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.nuggets");
TRRecipeHandler.hideEntry(this);

View file

@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModItems;
import java.security.InvalidParameterException;

View file

@ -29,7 +29,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import reborncore.common.util.OreUtil;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
@ -45,7 +45,7 @@ public class ItemPlates extends ItemTR {
public ItemPlates() {
setUnlocalizedName("techreborn.plate");
setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}

View file

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

View file

@ -25,7 +25,7 @@
package techreborn.items;
import net.minecraft.item.Item;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTR extends Item {

View file

@ -24,12 +24,12 @@
package techreborn.items;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
public class ItemUUmatter extends ItemTR {
public ItemUUmatter() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.uuMatter");
}
}

View file

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

View file

@ -42,7 +42,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;

View file

@ -43,7 +43,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;

View file

@ -28,7 +28,7 @@ import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
/**
@ -53,13 +53,13 @@ public class ItemTRArmour extends ItemArmor {
setUnlocalizedName(material.name().toLowerCase() + "Leggings");
if (slot == EntityEquipmentSlot.FEET)
setUnlocalizedName(material.name().toLowerCase() + "Boots");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
if(toRepair.getItem() == this && !repairOreDict.isEmpty()){
if (toRepair.getItem() == this && !repairOreDict.isEmpty()) {
return ItemUtils.isInputEqual(repairOreDict, repair, false, false, true);
}
return super.getIsRepairable(toRepair, repair);

View file

@ -45,7 +45,7 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
import java.util.Random;

View file

@ -46,7 +46,7 @@ import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.ItemUtils;
import techreborn.api.Reference;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.items.armor.ItemTRArmour;

View file

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

View file

@ -40,7 +40,7 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
import java.util.Random;

View file

@ -47,7 +47,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.compat.CompatManager;
import techreborn.init.ModItems;
import techreborn.items.ItemTR;

View file

@ -41,7 +41,7 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.utils.OreDictUtils;
import javax.annotation.Nullable;

View file

@ -54,7 +54,7 @@ import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.MessageIDs;

View file

@ -48,7 +48,7 @@ import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import reborncore.common.util.ItemUtils;
import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;

View file

@ -47,7 +47,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;

View file

@ -27,7 +27,7 @@ package techreborn.items.tools;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
public class ItemTRAxe extends ItemAxe {
@ -42,13 +42,13 @@ public class ItemTRAxe extends ItemAxe {
super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F);
this.repairOreDict = repairOreDict;
setUnlocalizedName(material.name().toLowerCase() + "Axe");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
if(toRepair.getItem() == this && !repairOreDict.isEmpty()){
if (toRepair.getItem() == this && !repairOreDict.isEmpty()) {
return ItemUtils.isInputEqual(repairOreDict, repair, false, false, true);
}
return super.getIsRepairable(toRepair, repair);

View file

@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
public class ItemTRHoe extends ItemHoe {
@ -44,7 +44,7 @@ public class ItemTRHoe extends ItemHoe {
super(material);
this.repairOreDict = repairOreDict;
setUnlocalizedName(material.name().toLowerCase() + "Hoe");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}
@ -56,7 +56,7 @@ public class ItemTRHoe extends ItemHoe {
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
if(toRepair.getItem() == this && !repairOreDict.isEmpty()){
if (toRepair.getItem() == this && !repairOreDict.isEmpty()) {
return ItemUtils.isInputEqual(repairOreDict, repair, false, false, true);
}
return super.getIsRepairable(toRepair, repair);

View file

@ -27,14 +27,13 @@ package techreborn.items.tools;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
public class ItemTRPickaxe extends ItemPickaxe {
String repairOreDict = "";
public ItemTRPickaxe(ToolMaterial material) {
this(material, "");
}
@ -43,13 +42,13 @@ public class ItemTRPickaxe extends ItemPickaxe {
super(material);
this.repairOreDict = repairOreDict;
setUnlocalizedName(material.name().toLowerCase() + "Pickaxe");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
if(toRepair.getItem() == this && !repairOreDict.isEmpty()){
if (toRepair.getItem() == this && !repairOreDict.isEmpty()) {
return ItemUtils.isInputEqual(repairOreDict, repair, true, false, true);
}
return super.getIsRepairable(toRepair, repair);

View file

@ -27,7 +27,7 @@ package techreborn.items.tools;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
public class ItemTRSpade extends ItemSpade {
@ -42,13 +42,13 @@ public class ItemTRSpade extends ItemSpade {
super(material);
this.repairOreDict = repairOreDict;
setUnlocalizedName(material.name().toLowerCase() + "Spade");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
if(toRepair.getItem() == this && !repairOreDict.isEmpty()){
if (toRepair.getItem() == this && !repairOreDict.isEmpty()) {
return ItemUtils.isInputEqual(repairOreDict, repair, false, false, true);
}
return super.getIsRepairable(toRepair, repair);

View file

@ -27,7 +27,7 @@ package techreborn.items.tools;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import reborncore.common.util.ItemUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
public class ItemTRSword extends ItemSword {
@ -42,13 +42,13 @@ public class ItemTRSword extends ItemSword {
super(material);
this.repairOreDict = repairOreDict;
setUnlocalizedName(material.name().toLowerCase() + "Sword");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
TRRecipeHandler.hideEntry(this);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
if(toRepair.getItem() == this && !repairOreDict.isEmpty()){
if (toRepair.getItem() == this && !repairOreDict.isEmpty()) {
return ItemUtils.isInputEqual(repairOreDict, repair, false, false, true);
}
return super.getIsRepairable(toRepair, repair);

View file

@ -32,7 +32,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.items.ItemTR;
public class ItemTechManual extends ItemTR {

View file

@ -35,7 +35,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.compat.CompatManager;
import techreborn.events.TRRecipeHandler;
import techreborn.items.ItemTR;

View file

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