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

@ -79,6 +79,8 @@ import java.io.File;
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCIES, acceptedMinecraftVersions = "[1.12,1.12.2]", certificateFingerprint = "8727a3141c8ec7f173b87aa78b9b9807867c4e6b", guiFactory = "techreborn.client.TechRebornGuiFactory")
public class Core {
//enable dev featues with -Dtechreborn.devFeatues=true
public static final boolean DEV_FEATURES = Boolean.parseBoolean(System.getProperty("techreborn.devFeatues", "false"));
@SidedProxy(clientSide = ModInfo.CLIENT_PROXY_CLASS, serverSide = ModInfo.SERVER_PROXY_CLASS)
public static CommonProxy proxy;
@Mod.Instance
@ -86,8 +88,6 @@ public class Core {
public static LogHelper logHelper = new LogHelper(new ModInfo());
public static TechRebornWorldGen worldGen;
public static File configDir;
//enable dev featues with -Dtechreborn.devFeatues=true
public static final boolean DEV_FEATURES = Boolean.parseBoolean(System.getProperty("techreborn.devFeatues", "false"));
public Core() {
//Forge says to call it here, so yeah
@ -134,12 +134,11 @@ public class Core {
}
@SubscribeEvent(priority = EventPriority.LOW)//LOW is used as we want it to load as late as possible, but before crafttweaker
public void registerRecipes(RegistryEvent.Register<IRecipe> event){
public void registerRecipes(RegistryEvent.Register<IRecipe> event) {
//Register ModRecipes
ModRecipes.init();
}
@Mod.EventHandler
public void init(FMLInitializationEvent event) throws IllegalAccessException, InstantiationException {
// Registers Chest Loot
@ -155,7 +154,7 @@ public class Core {
// WorldGen
worldGen.load();
GameRegistry.registerWorldGenerator(worldGen, 0);
GameRegistry.registerWorldGenerator(new OilLakeGenerator(), 0);
GameRegistry.registerWorldGenerator(new OilLakeGenerator(), 0);
// Register Gui Handler
NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler());
// Event busses

View file

@ -46,7 +46,7 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileAlarm;

View file

@ -38,7 +38,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.ToolManager;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.init.ModSounds;
import techreborn.lib.ModInfo;

View file

@ -41,7 +41,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.tiles.TileEntityFlare;
import java.util.List;
@ -57,7 +57,7 @@ public class BlockFlare extends BlockContainer {
public BlockFlare() {
super(Material.REDSTONE_LIGHT);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.flare");
this.setDefaultState(this.blockState.getBaseState().withProperty(COLOR, EnumDyeColor.WHITE));
}

View file

@ -42,7 +42,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.ToolManager;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.init.ModSounds;
import techreborn.lib.ModInfo;

View file

@ -39,7 +39,7 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.Torus;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;

View file

@ -42,7 +42,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.PropertyString;
import reborncore.common.multiblock.BlockMultiblockBase;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileMachineCasing;

View file

@ -39,7 +39,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;

View file

@ -41,7 +41,7 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.entities.EntityNukePrimed;
import techreborn.lib.ModInfo;
@ -54,7 +54,7 @@ public class BlockNuke extends BaseBlock {
public BlockNuke() {
super(Material.TNT);
setUnlocalizedName("techreborn.nuke");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}

View file

@ -48,7 +48,7 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.ArrayUtils;
import reborncore.common.util.OreDrop;
import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModBlocks;
import techreborn.items.ItemDusts;
@ -96,7 +96,7 @@ public class BlockOre extends Block implements IOreNameProvider {
public BlockOre() {
super(Material.ROCK);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0f);
setHarvestLevel("pickaxe", 2);
this.setDefaultState(this.getStateFromMeta(0));

View file

@ -43,7 +43,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@ -60,7 +60,7 @@ public class BlockOre2 extends Block implements IOreNameProvider {
public BlockOre2() {
super(Material.ROCK);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0f);
setHarvestLevel("pickaxe", 1);
this.setDefaultState(this.getStateFromMeta(0));

View file

@ -27,13 +27,13 @@ package techreborn.blocks;
import net.minecraft.block.BlockFence;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.material.Material;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRefinedIronFence extends BlockFence {
public BlockRefinedIronFence() {
super(Material.IRON, BlockPlanks.EnumType.OAK.getMapColor());
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);
setHarvestLevel("pickaxe", 2);
//ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));

View file

@ -33,7 +33,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import java.util.Random;
@ -42,7 +42,7 @@ public class BlockReinforcedGlass extends BlockGlass {
public BlockReinforcedGlass() {
super(Material.GLASS, false);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setSoundType(SoundType.STONE);
setHardness(4.0F);
setResistance(60F);

View file

@ -41,7 +41,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.Core;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@ -52,7 +52,7 @@ public class BlockRubberLeaves extends BlockLeaves {
public BlockRubberLeaves() {
super();
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
.withProperty(DECAYABLE, true));
Blocks.FIRE.setFireInfo(this, 30, 60);

View file

@ -46,13 +46,13 @@ import net.minecraftforge.energy.IEnergyStorage;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.util.WorldUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModSounds;
import techreborn.items.ItemParts;
import techreborn.items.tools.ItemElectricTreetap;
import techreborn.items.tools.ItemTreeTap;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList;
import java.util.List;
@ -68,7 +68,7 @@ public class BlockRubberLog extends Block {
public BlockRubberLog() {
super(Material.WOOD);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
this.setHardness(2.0F);
this.setDefaultState(
this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false));
@ -164,7 +164,7 @@ public class BlockRubberLog extends Block {
@Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ);
ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND);
if (stack.isEmpty()) {
@ -177,9 +177,9 @@ public class BlockRubberLog extends Block {
if ((capEnergy != null && capEnergy.getEnergyStored() > 20) || stack.getItem() instanceof ItemTreeTap) {
if (state.getValue(HAS_SAP) && state.getValue(SAP_SIDE) == side) {
worldIn.setBlockState(pos,
state.withProperty(HAS_SAP, false).withProperty(SAP_SIDE, EnumFacing.getHorizontal(0)));
state.withProperty(HAS_SAP, false).withProperty(SAP_SIDE, EnumFacing.getHorizontal(0)));
worldIn.playSound(null, pos.getX(), pos.getY(), pos.getZ(), ModSounds.SAP_EXTRACT, SoundCategory.BLOCKS,
0.6F, 1F);
0.6F, 1F);
if (!worldIn.isRemote) {
if (capEnergy != null) {
capEnergy.extractEnergy(20, false);

View file

@ -30,7 +30,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
/**
@ -40,7 +40,7 @@ public class BlockRubberPlank extends Block {
public BlockRubberPlank() {
super(Material.WOOD);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 20);

View file

@ -41,8 +41,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Random;
@ -60,7 +60,7 @@ public abstract class BlockRubberPlankSlab extends BlockSlab {
iblockstate = iblockstate.withProperty(HALF, EnumBlockHalf.BOTTOM);
halfslab = this;
}
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHarvestLevel("axe", 0);
setHardness(2.0F);
setResistance(15);

View file

@ -28,14 +28,14 @@ import net.minecraft.block.BlockStairs;
import net.minecraft.block.state.IBlockState;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRubberPlankStair extends BlockStairs {
public BlockRubberPlankStair(IBlockState modelState, String name) {
super(modelState);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
useNeighborBrightness = true;
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}

View file

@ -34,7 +34,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.world.RubberTreeGenerator;
@ -46,7 +46,7 @@ import java.util.Random;
public class BlockRubberSapling extends BlockSapling {
public BlockRubberSapling() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0));
setSoundType(SoundType.PLANT);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));

View file

@ -39,7 +39,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@ -56,7 +56,7 @@ public class BlockStorage extends BaseBlock {
public BlockStorage() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "silver"));
for (int i = 0; i < types.length; i++) {

View file

@ -44,7 +44,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@ -64,7 +64,7 @@ public class BlockStorage2 extends BaseBlock {
public BlockStorage2() {
super(Material.IRON);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "tungstensteel"));
for (int i = 0; i < types.length; i++) {

View file

@ -31,7 +31,7 @@ import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List;

View file

@ -50,7 +50,7 @@ import net.minecraftforge.energy.CapabilityEnergy;
import reborncore.api.ToolManager;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.init.ModSounds;
import techreborn.lib.ModInfo;

View file

@ -30,7 +30,7 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileCreativeSolarPanel;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileDieselGenerator;

View file

@ -30,7 +30,7 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileDragonEggSyphon;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileGasTurbine;

View file

@ -30,7 +30,7 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileLightningRod;

View file

@ -32,7 +32,7 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import java.util.List;

View file

@ -32,7 +32,7 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import java.util.List;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TilePlasmaGenerator;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSemiFluidGenerator;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSolidFuelGenerator;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileThermalGenerator;

View file

@ -30,7 +30,7 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileWaterMill;

View file

@ -30,7 +30,7 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileWindMill;

View file

@ -45,7 +45,7 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSolarPanel;

View file

@ -42,7 +42,7 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.lighting.TileLamp;

View file

@ -54,7 +54,7 @@ import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WorldUtils;
import techreborn.Core;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModSounds;
import techreborn.lib.ModInfo;

View file

@ -38,7 +38,7 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.lesu.TileLSUStorage;

View file

@ -35,7 +35,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier0.TileIronAlloyFurnace;

View file

@ -39,7 +39,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier0.TileIronFurnace;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileAlloySmelter;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileAssemblingMachine;

View file

@ -33,7 +33,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileAutoCraftingTable;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileCompressor;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileElectricFurnace;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileExtractor;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileGrinder;

View file

@ -56,7 +56,7 @@ import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import techreborn.lib.MessageIDs;
import techreborn.lib.ModInfo;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileRecycler;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileRollingMachine;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileScrapboxinator;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileChargeOMat;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileChemicalReactor;

View file

@ -37,7 +37,7 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.WorldUtils;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileDigitalChest;
import techreborn.tiles.TileTechStorageBase;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileDistillationTower;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileImplosionCompressor;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileIndustrialCentrifuge;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileIndustrialElectrolyzer;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialGrinder;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialSawmill;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileVacuumFreezer;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileChunkLoader;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileFluidReplicator;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileMatterFabricator;

View file

@ -37,7 +37,7 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.WorldUtils;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileTechStorageBase;

View file

@ -31,7 +31,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileQuantumTank;

View file

@ -51,7 +51,7 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.IToolDrop;
import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModSounds;
import techreborn.lib.ModInfo;

View file

@ -1,44 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.client;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import techreborn.init.ModItems;
public class TechRebornCreativeTabMisc extends CreativeTabs {
public static TechRebornCreativeTabMisc instance = new TechRebornCreativeTabMisc();
public TechRebornCreativeTabMisc() {
super("techreborn");
}
@Override
public ItemStack getTabIconItem() {
return new ItemStack(ModItems.CELL);
}
}

View file

@ -26,7 +26,7 @@ package techreborn.itemblocks;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.utils.TechRebornCreativeTab;
/**
* Created by modmuss50 on 20/02/2016.
@ -35,7 +35,7 @@ public class ItemBlockRubberSapling extends ItemBlock {
public ItemBlockRubberSapling(Block block) {
super(block);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.rubberSapling");
}
}

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);

Some files were not shown because too many files have changed in this diff Show more