From 6d3b415ddd0f876f24cf06bf29c547d51c12c509 Mon Sep 17 00:00:00 2001 From: Prospector Date: Tue, 12 Jun 2018 15:42:20 -0700 Subject: [PATCH] Unify creative tabs --- src/main/java/techreborn/Core.java | 9 ++-- .../java/techreborn/blocks/BlockAlarm.java | 2 +- .../techreborn/blocks/BlockComputerCube.java | 2 +- .../java/techreborn/blocks/BlockFlare.java | 4 +- .../techreborn/blocks/BlockFusionCoil.java | 2 +- .../blocks/BlockFusionControlComputer.java | 2 +- .../techreborn/blocks/BlockMachineCasing.java | 2 +- .../techreborn/blocks/BlockMachineFrames.java | 2 +- .../java/techreborn/blocks/BlockNuke.java | 4 +- src/main/java/techreborn/blocks/BlockOre.java | 4 +- .../java/techreborn/blocks/BlockOre2.java | 4 +- .../blocks/BlockRefinedIronFence.java | 4 +- .../blocks/BlockReinforcedGlass.java | 4 +- .../techreborn/blocks/BlockRubberLeaves.java | 4 +- .../techreborn/blocks/BlockRubberLog.java | 10 ++--- .../techreborn/blocks/BlockRubberPlank.java | 4 +- .../blocks/BlockRubberPlankSlab.java | 4 +- .../blocks/BlockRubberPlankStair.java | 4 +- .../techreborn/blocks/BlockRubberSapling.java | 4 +- .../java/techreborn/blocks/BlockStorage.java | 4 +- .../java/techreborn/blocks/BlockStorage2.java | 4 +- .../blocks/BlockSupercondensator.java | 2 +- .../techreborn/blocks/cable/BlockCable.java | 2 +- .../generator/BlockCreativeSolarPanel.java | 2 +- .../generator/BlockDieselGenerator.java | 2 +- .../generator/BlockDragonEggSyphon.java | 2 +- .../blocks/generator/BlockGasTurbine.java | 2 +- .../blocks/generator/BlockLightningRod.java | 2 +- .../generator/BlockMagicEnergyAbsorber.java | 2 +- .../generator/BlockMagicEnergyConverter.java | 2 +- .../generator/BlockPlasmaGenerator.java | 2 +- .../generator/BlockSemiFluidGenerator.java | 2 +- .../generator/BlockSolidFuelGenerator.java | 2 +- .../generator/BlockThermalGenerator.java | 2 +- .../blocks/generator/BlockWaterMill.java | 2 +- .../blocks/generator/BlockWindMill.java | 2 +- .../generator/solarpanel/BlockSolarPanel.java | 2 +- .../techreborn/blocks/lighting/BlockLamp.java | 2 +- .../blocks/storage/BlockEnergyStorage.java | 2 +- .../blocks/storage/BlockLSUStorage.java | 2 +- .../blocks/tier0/BlockIronAlloyFurnace.java | 2 +- .../blocks/tier0/BlockIronFurnace.java | 2 +- .../blocks/tier1/BlockAlloySmelter.java | 2 +- .../blocks/tier1/BlockAssemblingMachine.java | 2 +- .../blocks/tier1/BlockAutoCraftingTable.java | 2 +- .../blocks/tier1/BlockCompressor.java | 2 +- .../blocks/tier1/BlockElectricFurnace.java | 2 +- .../blocks/tier1/BlockExtractor.java | 2 +- .../techreborn/blocks/tier1/BlockGrinder.java | 2 +- .../blocks/tier1/BlockPlayerDetector.java | 2 +- .../blocks/tier1/BlockRecycler.java | 2 +- .../blocks/tier1/BlockRollingMachine.java | 2 +- .../blocks/tier1/BlockScrapboxinator.java | 2 +- .../blocks/tier2/BlockChargeOMat.java | 2 +- .../blocks/tier2/BlockChemicalReactor.java | 2 +- .../blocks/tier2/BlockDigitalChest.java | 2 +- .../blocks/tier2/BlockDistillationTower.java | 2 +- .../tier2/BlockImplosionCompressor.java | 2 +- .../tier2/BlockIndustrialBlastFurnace.java | 2 +- .../tier2/BlockIndustrialCentrifuge.java | 2 +- .../tier2/BlockIndustrialElectrolyzer.java | 2 +- .../blocks/tier2/BlockIndustrialGrinder.java | 2 +- .../blocks/tier2/BlockIndustrialSawmill.java | 2 +- .../blocks/tier2/BlockVacuumFreezer.java | 2 +- .../blocks/tier3/BlockChunkLoader.java | 2 +- .../blocks/tier3/BlockFluidReplicator.java | 2 +- .../blocks/tier3/BlockMatterFabricator.java | 2 +- .../blocks/tier3/BlockQuantumChest.java | 2 +- .../blocks/tier3/BlockQuantumTank.java | 2 +- .../blocks/transformers/BlockTransformer.java | 2 +- .../client/TechRebornCreativeTabMisc.java | 44 ------------------- .../itemblocks/ItemBlockRubberSapling.java | 4 +- .../java/techreborn/items/DynamicCell.java | 2 +- .../techreborn/items/ItemDestructopack.java | 4 +- src/main/java/techreborn/items/ItemDusts.java | 4 +- .../java/techreborn/items/ItemDustsSmall.java | 4 +- .../items/ItemFrequencyTransmitter.java | 4 +- src/main/java/techreborn/items/ItemGems.java | 6 +-- .../java/techreborn/items/ItemIngots.java | 4 +- .../techreborn/items/ItemMissingRecipe.java | 4 +- .../java/techreborn/items/ItemNuggets.java | 4 +- src/main/java/techreborn/items/ItemParts.java | 2 +- .../java/techreborn/items/ItemPlates.java | 4 +- .../java/techreborn/items/ItemScrapBox.java | 4 +- src/main/java/techreborn/items/ItemTR.java | 2 +- .../java/techreborn/items/ItemUUmatter.java | 4 +- .../java/techreborn/items/ItemUpgrades.java | 4 +- .../items/armor/ItemLapotronPack.java | 2 +- .../items/armor/ItemLithiumBatpack.java | 2 +- .../techreborn/items/armor/ItemTRArmour.java | 6 +-- .../techreborn/items/tools/ItemChainsaw.java | 2 +- .../items/tools/ItemCloakingDevice.java | 2 +- .../techreborn/items/tools/ItemDebugTool.java | 4 +- .../techreborn/items/tools/ItemDrill.java | 2 +- .../items/tools/ItemElectricTreetap.java | 2 +- .../items/tools/ItemJackhammer.java | 2 +- .../techreborn/items/tools/ItemNanosaber.java | 2 +- .../techreborn/items/tools/ItemOmniTool.java | 2 +- .../items/tools/ItemRockCutter.java | 2 +- .../techreborn/items/tools/ItemTRAxe.java | 6 +-- .../techreborn/items/tools/ItemTRHoe.java | 6 +-- .../techreborn/items/tools/ItemTRPickaxe.java | 7 ++- .../techreborn/items/tools/ItemTRSpade.java | 6 +-- .../techreborn/items/tools/ItemTRSword.java | 6 +-- .../items/tools/ItemTechManual.java | 2 +- .../techreborn/items/tools/ItemTreeTap.java | 2 +- .../techreborn/items/tools/ItemWrench.java | 4 +- .../TechRebornCreativeTab.java | 6 +-- 108 files changed, 157 insertions(+), 203 deletions(-) delete mode 100644 src/main/java/techreborn/client/TechRebornCreativeTabMisc.java rename src/main/java/techreborn/{client => utils}/TechRebornCreativeTab.java (93%) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index abecba381..decb01703 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -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 event){ + public void registerRecipes(RegistryEvent.Register 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 diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index ed4cd74ae..cc222db78 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -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; diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 58dc9e2f9..03f574eb7 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -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; diff --git a/src/main/java/techreborn/blocks/BlockFlare.java b/src/main/java/techreborn/blocks/BlockFlare.java index 48a893a9c..cef52eb09 100644 --- a/src/main/java/techreborn/blocks/BlockFlare.java +++ b/src/main/java/techreborn/blocks/BlockFlare.java @@ -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)); } diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index ef1f1f015..a03838ac2 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -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; diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 8c4993738..39ffc83dd 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -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; diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index a93f782fe..b82c06acd 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -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; diff --git a/src/main/java/techreborn/blocks/BlockMachineFrames.java b/src/main/java/techreborn/blocks/BlockMachineFrames.java index f61a52761..7d4d7d654 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrames.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrames.java @@ -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; diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index ed0b919ba..6cfe59809 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -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)); } diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 13328ee9d..f0af9993c 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -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)); diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 82824b6e9..a886ce717 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -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)); diff --git a/src/main/java/techreborn/blocks/BlockRefinedIronFence.java b/src/main/java/techreborn/blocks/BlockRefinedIronFence.java index c9bf3676a..c4703b1e1 100644 --- a/src/main/java/techreborn/blocks/BlockRefinedIronFence.java +++ b/src/main/java/techreborn/blocks/BlockRefinedIronFence.java @@ -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)); diff --git a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java index 5135e25bd..6094d6df9 100644 --- a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java +++ b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java @@ -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); diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index ef1105aa8..4bb4a69a7 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -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); diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 0e295fd6f..0d08f4340 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -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); diff --git a/src/main/java/techreborn/blocks/BlockRubberPlank.java b/src/main/java/techreborn/blocks/BlockRubberPlank.java index 524e302d9..4484d4578 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlank.java @@ -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); diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java index 377236d9c..263066fdf 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java @@ -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); diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankStair.java b/src/main/java/techreborn/blocks/BlockRubberPlankStair.java index 82c6ba4c6..082a976e4 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankStair.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankStair.java @@ -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)); } diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 442863e72..1026cd56c 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -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)); diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index d40a32a64..b07fdebf4 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -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++) { diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index 8c86907a0..9b16f0155 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -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++) { diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index e4fdf6514..5ea6e9a4d 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index ab8bfa8fa..59dffc50b 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java index 841a0090a..7ae51d69e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 226539319..0757843f2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index 29b6ec89e..7a3e9ece4 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index d05fefc26..ef096b782 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index f5741b89a..7ac4fb29e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 0caabd783..33f50b208 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 5ecf4349f..344dd1b40 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 29d2404af..a22736a79 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index a65db793d..bf9285a6d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index beeff0722..b87865197 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 842baf476..bb1a43240 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index 8ae0790bc..6a6f637d0 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index d20b4db97..6b3ac7b2b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -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; diff --git a/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java index e7dfa02a0..568bb3717 100644 --- a/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java @@ -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; diff --git a/src/main/java/techreborn/blocks/lighting/BlockLamp.java b/src/main/java/techreborn/blocks/lighting/BlockLamp.java index d607b9cb3..078ccc589 100644 --- a/src/main/java/techreborn/blocks/lighting/BlockLamp.java +++ b/src/main/java/techreborn/blocks/lighting/BlockLamp.java @@ -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; diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index edd2e7f4a..4a4bbf0db 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -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; diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index 6842cbcc7..3de88c60f 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java index 7d92568ba..3115567bc 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index 8aae22c45..51aca7101 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 0a0b139b6..8fa11b8fe 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java index 7b21a911c..70704d1d9 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java index c48d71417..ded6d49b2 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index d65ed3791..876b2ac09 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index ef99c894b..d730251ce 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index 14943dbb2..d77650dee 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index 243c46643..fd9bd235f 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 725ac2b17..cc4fe99f9 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index fca22667d..c4ce814cf 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java index 3401abe2f..fbd8a903f 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java index 95823b08d..3916cd6ab 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java index 1e1f18ed2..6c6f2f7a1 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java index 6012fd18e..9d00288d5 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java index b82687b23..749b95dee 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java index d3795478a..4a1006431 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java index 660db7845..7a36aab40 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java index 62f885fcf..936418fd6 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java index 0e85b106b..23a39a20c 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java index 61be1becc..e838a84e8 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java index d016743f3..13129712e 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java index 1ca208d20..826628f36 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java index e9ebeb3e0..80a6e9156 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java index 60fb63f18..1070fdffd 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java index b21097d16..d4d7634e9 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java index 9a9b54760..e95983837 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 9baa0bbbf..edaa8b89c 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -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; diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java index d9b4357d0..34981fce1 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java @@ -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; diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 4822d69f7..a33cfadd9 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -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; diff --git a/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java b/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java deleted file mode 100644 index 617d7ccc7..000000000 --- a/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java +++ /dev/null @@ -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); - } - -} diff --git a/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java b/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java index 5ace50907..336f577c4 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java @@ -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"); } } diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index 9c2b2dc39..034d8d3b8 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -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; diff --git a/src/main/java/techreborn/items/ItemDestructopack.java b/src/main/java/techreborn/items/ItemDestructopack.java index 89e9a642c..54a560b65 100644 --- a/src/main/java/techreborn/items/ItemDestructopack.java +++ b/src/main/java/techreborn/items/ItemDestructopack.java @@ -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 diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index e2fa4cd69..05c8fc192 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -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); } diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index eafc83538..937cf0342 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -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); } diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index de50097ca..264682d7c 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -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 diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index c5b991304..f5c3cb7c4 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -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); diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index 6623b9904..0be299bf3 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -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); diff --git a/src/main/java/techreborn/items/ItemMissingRecipe.java b/src/main/java/techreborn/items/ItemMissingRecipe.java index 5c2d78a7d..41fceee9b 100644 --- a/src/main/java/techreborn/items/ItemMissingRecipe.java +++ b/src/main/java/techreborn/items/ItemMissingRecipe.java @@ -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); } diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index 3e0f74bd0..355aa816e 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -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); diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index a065f237c..94aab29bf 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -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; diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 29109099c..b3e77e333 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -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); } diff --git a/src/main/java/techreborn/items/ItemScrapBox.java b/src/main/java/techreborn/items/ItemScrapBox.java index 3ccdf1549..80422e4af 100644 --- a/src/main/java/techreborn/items/ItemScrapBox.java +++ b/src/main/java/techreborn/items/ItemScrapBox.java @@ -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 diff --git a/src/main/java/techreborn/items/ItemTR.java b/src/main/java/techreborn/items/ItemTR.java index ad3664b3b..67a8d8c5d 100644 --- a/src/main/java/techreborn/items/ItemTR.java +++ b/src/main/java/techreborn/items/ItemTR.java @@ -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 { diff --git a/src/main/java/techreborn/items/ItemUUmatter.java b/src/main/java/techreborn/items/ItemUUmatter.java index 68319c13f..fcb4c2f83 100644 --- a/src/main/java/techreborn/items/ItemUUmatter.java +++ b/src/main/java/techreborn/items/ItemUUmatter.java @@ -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"); } } diff --git a/src/main/java/techreborn/items/ItemUpgrades.java b/src/main/java/techreborn/items/ItemUpgrades.java index c9ccc0a36..cc872ffa9 100644 --- a/src/main/java/techreborn/items/ItemUpgrades.java +++ b/src/main/java/techreborn/items/ItemUpgrades.java @@ -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); } diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index a1f70e2e9..ba9bc662c 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -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; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 24f683204..f9a57cc6f 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -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; diff --git a/src/main/java/techreborn/items/armor/ItemTRArmour.java b/src/main/java/techreborn/items/armor/ItemTRArmour.java index 64546bcd0..6eafe6c0a 100644 --- a/src/main/java/techreborn/items/armor/ItemTRArmour.java +++ b/src/main/java/techreborn/items/armor/ItemTRArmour.java @@ -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); diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 02b864eb1..f18d39efd 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 4f11e5721..308b014ea 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemDebugTool.java b/src/main/java/techreborn/items/tools/ItemDebugTool.java index 38767d42c..122b1f9e6 100644 --- a/src/main/java/techreborn/items/tools/ItemDebugTool.java +++ b/src/main/java/techreborn/items/tools/ItemDebugTool.java @@ -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"); } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 86f06c889..f6c65d663 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index 6befcb0e5..2b5a458aa 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index d4dc934fb..2c87e1ef7 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 81a1f4bd7..63f93eb9f 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index dbb9b7419..78f9e812b 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 8477480e6..16622548e 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index 79e753918..4a14f713b 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -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); diff --git a/src/main/java/techreborn/items/tools/ItemTRHoe.java b/src/main/java/techreborn/items/tools/ItemTRHoe.java index 5d41ea98f..5edec43fe 100644 --- a/src/main/java/techreborn/items/tools/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tools/ItemTRHoe.java @@ -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); diff --git a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java index 9fa36ecfe..e5b0fb09e 100644 --- a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java @@ -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); diff --git a/src/main/java/techreborn/items/tools/ItemTRSpade.java b/src/main/java/techreborn/items/tools/ItemTRSpade.java index 5e413ce5a..5fb0fe3fe 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tools/ItemTRSpade.java @@ -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); diff --git a/src/main/java/techreborn/items/tools/ItemTRSword.java b/src/main/java/techreborn/items/tools/ItemTRSword.java index 426b2f787..1becd59a8 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSword.java +++ b/src/main/java/techreborn/items/tools/ItemTRSword.java @@ -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); diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index e559f8e49..717a2783c 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -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 { diff --git a/src/main/java/techreborn/items/tools/ItemTreeTap.java b/src/main/java/techreborn/items/tools/ItemTreeTap.java index 9006a6b65..ecac7fe0f 100644 --- a/src/main/java/techreborn/items/tools/ItemTreeTap.java +++ b/src/main/java/techreborn/items/tools/ItemTreeTap.java @@ -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; diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 125cf53c3..52d109e21 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -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); } diff --git a/src/main/java/techreborn/client/TechRebornCreativeTab.java b/src/main/java/techreborn/utils/TechRebornCreativeTab.java similarity index 93% rename from src/main/java/techreborn/client/TechRebornCreativeTab.java rename to src/main/java/techreborn/utils/TechRebornCreativeTab.java index fcd2b7a8e..42a4a5d37 100644 --- a/src/main/java/techreborn/client/TechRebornCreativeTab.java +++ b/src/main/java/techreborn/utils/TechRebornCreativeTab.java @@ -22,11 +22,11 @@ * SOFTWARE. */ -package techreborn.client; +package techreborn.utils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import techreborn.init.ModBlocks; +import techreborn.items.ItemParts; public class TechRebornCreativeTab extends CreativeTabs { @@ -38,6 +38,6 @@ public class TechRebornCreativeTab extends CreativeTabs { @Override public ItemStack getTabIconItem() { - return new ItemStack(ModBlocks.THERMAL_GENERATOR); + return ItemParts.getPartByName("machine_parts"); } }