Removed excessive setCreativeTab from blocks

This commit is contained in:
drcrazy 2018-09-25 13:56:59 +03:00
parent f600432f05
commit 1e9cfa07b6
69 changed files with 15 additions and 169 deletions

View file

@ -51,8 +51,6 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.tiles.TileAlarm; import techreborn.tiles.TileAlarm;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@ -63,10 +61,8 @@ public class BlockAlarm extends BaseTileBlock {
public BlockAlarm() { public BlockAlarm() {
super(Material.ROCK); super(Material.ROCK);
setTranslationKey("techreborn.alarm");
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false)); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false));
this.bbs = GenBoundingBoxes(0.19, 0.81); this.bbs = GenBoundingBoxes(0.19, 0.81);
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting"));
BlockWrenchEventHandler.wrenableBlocks.add(this); BlockWrenchEventHandler.wrenableBlocks.add(this);
} }

View file

@ -41,14 +41,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab;
public class BlockComputerCube extends BlockMachineBase { public class BlockComputerCube extends BlockMachineBase {
public BlockComputerCube() { public BlockComputerCube() {
super(); super();
this.setTranslationKey("techreborn.computercube");
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

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

View file

@ -26,13 +26,11 @@ package techreborn.blocks;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.utils.TechRebornCreativeTab;
public class BlockMachineFrame extends BaseBlock { public class BlockMachineFrame extends BaseBlock {
public BlockMachineFrame() { public BlockMachineFrame() {
super(Material.IRON); super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(1f); setHardness(1f);
} }
} }

View file

@ -45,7 +45,6 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.entities.EntityNukePrimed; import techreborn.entities.EntityNukePrimed;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Created by Mark on 13/03/2016. * Created by Mark on 13/03/2016.
@ -56,7 +55,7 @@ public class BlockNuke extends BaseBlock {
public BlockNuke() { public BlockNuke() {
super(Material.TNT); super(Material.TNT);
setTranslationKey("techreborn.nuke"); setTranslationKey("techreborn.nuke");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false)); this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false));
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
} }

View file

@ -36,8 +36,6 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.OreDrop; import reborncore.common.util.OreDrop;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Random; import java.util.Random;
@RebornRegister(modID = TechReborn.MOD_ID) @RebornRegister(modID = TechReborn.MOD_ID)
@ -70,7 +68,6 @@ public class BlockOre extends Block {
public BlockOre() { public BlockOre() {
super(Material.ROCK); super(Material.ROCK);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0f); setHardness(2.0f);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);
} }

View file

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

View file

@ -34,15 +34,13 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.models.ModelCompound; import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Random; import java.util.Random;
public class BlockReinforcedGlass extends BlockGlass { public class BlockReinforcedGlass extends BlockGlass {
public BlockReinforcedGlass() { public BlockReinforcedGlass() {
super(Material.GLASS, false); super(Material.GLASS, false);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
setSoundType(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(4.0F); setHardness(4.0F);
setResistance(60F); setResistance(60F);

View file

@ -42,8 +42,6 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -51,7 +49,7 @@ public class BlockRubberLeaves extends BlockLeaves {
public BlockRubberLeaves() { public BlockRubberLeaves() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
.withProperty(DECAYABLE, true)); .withProperty(DECAYABLE, true));
Blocks.FIRE.setFireInfo(this, 30, 60); Blocks.FIRE.setFireInfo(this, 30, 60);

View file

@ -52,8 +52,6 @@ import techreborn.init.ModSounds;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.items.tool.basic.ItemElectricTreetap; import techreborn.items.tool.basic.ItemElectricTreetap;
import techreborn.items.tool.ItemTreeTap; import techreborn.items.tool.ItemTreeTap;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -68,7 +66,7 @@ public class BlockRubberLog extends Block {
public BlockRubberLog() { public BlockRubberLog() {
super(Material.WOOD); super(Material.WOOD);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
this.setHardness(2.0F); this.setHardness(2.0F);
this.setDefaultState( this.setDefaultState(
this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false)); this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false));

View file

@ -31,7 +31,6 @@ import net.minecraft.init.Blocks;
import reborncore.client.models.ModelCompound; import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Created by modmuss50 on 20/02/2016. * Created by modmuss50 on 20/02/2016.
@ -40,7 +39,7 @@ public class BlockRubberPlank extends Block {
public BlockRubberPlank() { public BlockRubberPlank() {
super(Material.WOOD); super(Material.WOOD);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
this.setHardness(2.0F); this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD); this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 20); Blocks.FIRE.setFireInfo(this, 5, 20);

View file

@ -42,8 +42,6 @@ import net.minecraft.world.World;
import reborncore.client.models.ModelCompound; import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Random; import java.util.Random;
//Thanks @Prospector you saved me me some time :) //Thanks @Prospector you saved me me some time :)
@ -60,7 +58,7 @@ public abstract class BlockRubberPlankSlab extends BlockSlab {
iblockstate = iblockstate.withProperty(HALF, EnumBlockHalf.BOTTOM); iblockstate = iblockstate.withProperty(HALF, EnumBlockHalf.BOTTOM);
halfslab = this; halfslab = this;
} }
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
setHarvestLevel("axe", 0); setHarvestLevel("axe", 0);
setHardness(2.0F); setHardness(2.0F);
setResistance(15); setResistance(15);

View file

@ -29,13 +29,12 @@ import net.minecraft.block.state.IBlockState;
import reborncore.client.models.ModelCompound; import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRubberPlankStair extends BlockStairs { public class BlockRubberPlankStair extends BlockStairs {
public BlockRubberPlankStair(IBlockState modelState, String name) { public BlockRubberPlankStair(IBlockState modelState, String name) {
super(modelState); super(modelState);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
useNeighborBrightness = true; useNeighborBrightness = true;
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
} }

View file

@ -35,7 +35,6 @@ import net.minecraft.world.World;
import reborncore.client.models.ModelCompound; import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.world.RubberTreeGenerator; import techreborn.world.RubberTreeGenerator;
import java.util.Random; import java.util.Random;
@ -46,7 +45,7 @@ import java.util.Random;
public class BlockRubberSapling extends BlockSapling { public class BlockRubberSapling extends BlockSapling {
public BlockRubberSapling() { public BlockRubberSapling() {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechReborn.TAB);
this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0)); this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0));
setSoundType(SoundType.PLANT); setSoundType(SoundType.PLANT);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));

View file

@ -27,13 +27,11 @@ package techreborn.blocks;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.utils.TechRebornCreativeTab;
public class BlockStorage extends BaseBlock { public class BlockStorage extends BaseBlock {
public BlockStorage() { public BlockStorage() {
super(Material.IRON); super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f); setHardness(2f);
setSoundType(SoundType.METAL); setSoundType(SoundType.METAL);
} }

View file

@ -31,15 +31,13 @@ import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler; import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
public class BlockSupercondensator extends BlockMachineBase { public class BlockSupercondensator extends BlockMachineBase {
public BlockSupercondensator(Material material) { public BlockSupercondensator(Material material) {
super(); super();
setTranslationKey("techreborn.supercondensator"); setTranslationKey("techreborn.supercondensator");
setCreativeTab(TechRebornCreativeTab.instance); // setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override @Override

View file

@ -52,7 +52,6 @@ import techreborn.TechReborn;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.tiles.cable.TileCable; import techreborn.tiles.cable.TileCable;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.utils.damageSources.ElectrialShockSource; import techreborn.utils.damageSources.ElectrialShockSource;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -86,7 +85,6 @@ public class BlockCable extends BlockContainer {
this.type = type; this.type = type;
setHardness(1F); setHardness(1F);
setResistance(8F); setResistance(8F);
setCreativeTab(TechRebornCreativeTab.instance);
setDefaultState(getDefaultState().withProperty(EAST, false).withProperty(WEST, false).withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(UP, false).withProperty(DOWN, false)); setDefaultState(getDefaultState().withProperty(EAST, false).withProperty(WEST, false).withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(UP, false).withProperty(DOWN, false));
BlockWrenchEventHandler.wrenableBlocks.add(this); BlockWrenchEventHandler.wrenableBlocks.add(this);
} }

View file

@ -33,7 +33,6 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileDieselGenerator; import techreborn.tiles.generator.advanced.TileDieselGenerator;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Block for Diesel Generator * Block for Diesel Generator
@ -42,7 +41,6 @@ public class BlockDieselGenerator extends BlockMachineBase {
public BlockDieselGenerator() { public BlockDieselGenerator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -32,13 +32,11 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.tiles.generator.advanced.TileDragonEggSyphon; import techreborn.tiles.generator.advanced.TileDragonEggSyphon;
import techreborn.utils.TechRebornCreativeTab;
public class BlockDragonEggSyphon extends BlockMachineBase { public class BlockDragonEggSyphon extends BlockMachineBase {
public BlockDragonEggSyphon() { public BlockDragonEggSyphon() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -44,8 +44,6 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@ -55,7 +53,6 @@ public class BlockFusionCoil extends Block {
super(Material.IRON); super(Material.IRON);
setHardness(2f); setHardness(2f);
setSoundType(SoundType.METAL); setSoundType(SoundType.METAL);
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -42,7 +42,6 @@ import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.utils.damageSources.FusionDamageSource; import techreborn.utils.damageSources.FusionDamageSource;
import java.util.List; import java.util.List;
@ -51,7 +50,6 @@ public class BlockFusionControlComputer extends BlockMachineBase {
public BlockFusionControlComputer() { public BlockFusionControlComputer() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileGasTurbine; import techreborn.tiles.generator.advanced.TileGasTurbine;
import techreborn.utils.TechRebornCreativeTab;
public class BlockGasTurbine extends BlockMachineBase { public class BlockGasTurbine extends BlockMachineBase {
public BlockGasTurbine() { public BlockGasTurbine() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -32,13 +32,11 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.tiles.generator.TileLightningRod; import techreborn.tiles.generator.TileLightningRod;
import techreborn.utils.TechRebornCreativeTab;
public class BlockLightningRod extends BlockMachineBase { public class BlockLightningRod extends BlockMachineBase {
public BlockLightningRod() { public BlockLightningRod() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,15 +33,12 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
public class BlockMagicEnergyAbsorber extends BlockMachineBase { public class BlockMagicEnergyAbsorber extends BlockMachineBase {
public BlockMagicEnergyAbsorber() { public BlockMagicEnergyAbsorber() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,15 +33,12 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
public class BlockMagicEnergyConverter extends BlockMachineBase { public class BlockMagicEnergyConverter extends BlockMachineBase {
public BlockMagicEnergyConverter() { public BlockMagicEnergyConverter() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,7 +33,6 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.generator.TilePlasmaGenerator; import techreborn.tiles.generator.TilePlasmaGenerator;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Block for Plasma Generator * Block for Plasma Generator
@ -42,7 +41,6 @@ public class BlockPlasmaGenerator extends BlockMachineBase {
public BlockPlasmaGenerator() { public BlockPlasmaGenerator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator; import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockSemiFluidGenerator extends BlockMachineBase { public class BlockSemiFluidGenerator extends BlockMachineBase {
public BlockSemiFluidGenerator() { public BlockSemiFluidGenerator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,7 +33,6 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRContent.SolarPanels; import techreborn.init.TRContent.SolarPanels;
import techreborn.tiles.generator.TileSolarPanel; import techreborn.tiles.generator.TileSolarPanel;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
@ -45,7 +44,6 @@ public class BlockSolarPanel extends BlockMachineBase {
public BlockSolarPanel(SolarPanels panel) { public BlockSolarPanel(SolarPanels panel) {
super(); super();
this.panelType = panel; this.panelType = panel;
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator; import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockSolidFuelGenerator extends BlockMachineBase { public class BlockSolidFuelGenerator extends BlockMachineBase {
public BlockSolidFuelGenerator() { public BlockSolidFuelGenerator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileThermalGenerator; import techreborn.tiles.generator.advanced.TileThermalGenerator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockThermalGenerator extends BlockMachineBase { public class BlockThermalGenerator extends BlockMachineBase {
public BlockThermalGenerator() { public BlockThermalGenerator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -32,7 +32,6 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.tiles.generator.basic.TileWaterMill; import techreborn.tiles.generator.basic.TileWaterMill;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
@ -41,7 +40,6 @@ public class BlockWaterMill extends BlockMachineBase {
public BlockWaterMill() { public BlockWaterMill() {
super(false); super(false);
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -32,7 +32,6 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.tiles.generator.basic.TileWindMill; import techreborn.tiles.generator.basic.TileWindMill;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
@ -41,7 +40,6 @@ public class BlockWindMill extends BlockMachineBase {
public BlockWindMill() { public BlockWindMill() {
super(false); super(false);
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
} }

View file

@ -49,7 +49,6 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.tiles.lighting.TileLamp; import techreborn.tiles.lighting.TileLamp;
import techreborn.utils.TechRebornCreativeTab;
public class BlockLamp extends BaseTileBlock { public class BlockLamp extends BaseTileBlock {
@ -62,7 +61,6 @@ public class BlockLamp extends BaseTileBlock {
public BlockLamp(int brightness, int cost, double depth, double width) { public BlockLamp(int brightness, int cost, double depth, double width) {
super(Material.REDSTONE_LIGHT); super(Material.REDSTONE_LIGHT);
this.setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false)); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false));
this.bbs = GenBoundingBoxes(depth, width); this.bbs = GenBoundingBoxes(depth, width);
this.cost = cost; this.cost = cost;

View file

@ -46,8 +46,6 @@ import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Iterator; import java.util.Iterator;
import java.util.Random; import java.util.Random;
@ -62,7 +60,6 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
public BlockEnergyStorage(String name, int guiID) { public BlockEnergyStorage(String name, int guiID) {
super(Material.IRON); super(Material.IRON);
setHardness(2f); setHardness(2f);
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
this.name = name; this.name = name;
this.guiID = guiID; this.guiID = guiID;

View file

@ -47,7 +47,6 @@ import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.tiles.storage.lesu.TileLSUStorage; import techreborn.tiles.storage.lesu.TileLSUStorage;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Energy storage block for LESU * Energy storage block for LESU
@ -56,7 +55,6 @@ public class BlockLSUStorage extends BaseTileBlock {
public BlockLSUStorage() { public BlockLSUStorage() {
super(Material.IRON); super(Material.IRON);
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
BlockWrenchEventHandler.wrenableBlocks.add(this); BlockWrenchEventHandler.wrenableBlocks.add(this);
} }

View file

@ -37,8 +37,6 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace; import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -46,7 +44,6 @@ public class BlockIronAlloyFurnace extends BlockMachineBase {
public BlockIronAlloyFurnace() { public BlockIronAlloyFurnace() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines"));
} }

View file

@ -41,8 +41,6 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.iron.TileIronFurnace; import techreborn.tiles.machine.iron.TileIronFurnace;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -51,7 +49,6 @@ public class BlockIronFurnace extends BlockMachineBase {
public BlockIronFurnace() { public BlockIronFurnace() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileAlloySmelter; import techreborn.tiles.machine.tier1.TileAlloySmelter;
import techreborn.utils.TechRebornCreativeTab;
public class BlockAlloySmelter extends BlockMachineBase { public class BlockAlloySmelter extends BlockMachineBase {
public BlockAlloySmelter() { public BlockAlloySmelter() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileAssemblingMachine; import techreborn.tiles.machine.tier1.TileAssemblingMachine;
import techreborn.utils.TechRebornCreativeTab;
public class BlockAssemblingMachine extends BlockMachineBase { public class BlockAssemblingMachine extends BlockMachineBase {
public BlockAssemblingMachine() { public BlockAssemblingMachine() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -35,14 +35,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable; import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import techreborn.utils.TechRebornCreativeTab;
public class BlockAutoCraftingTable extends BlockMachineBase { public class BlockAutoCraftingTable extends BlockMachineBase {
public BlockAutoCraftingTable() { public BlockAutoCraftingTable() {
super(true); super(true);
setTranslationKey("techreborn.electriccraftingtable");
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileCompressor; import techreborn.tiles.machine.tier1.TileCompressor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockCompressor extends BlockMachineBase { public class BlockCompressor extends BlockMachineBase {
public BlockCompressor() { public BlockCompressor() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileElectricFurnace; import techreborn.tiles.machine.tier1.TileElectricFurnace;
import techreborn.utils.TechRebornCreativeTab;
public class BlockElectricFurnace extends BlockMachineBase { public class BlockElectricFurnace extends BlockMachineBase {
public BlockElectricFurnace() { public BlockElectricFurnace() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileExtractor; import techreborn.tiles.machine.tier1.TileExtractor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockExtractor extends BlockMachineBase { public class BlockExtractor extends BlockMachineBase {
public BlockExtractor() { public BlockExtractor() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileGrinder; import techreborn.tiles.machine.tier1.TileGrinder;
import techreborn.utils.TechRebornCreativeTab;
public class BlockGrinder extends BlockMachineBase { public class BlockGrinder extends BlockMachineBase {
public BlockGrinder() { public BlockGrinder() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -59,8 +59,6 @@ import reborncore.common.util.StringUtils;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.MessageIDs; import techreborn.utils.MessageIDs;
import techreborn.tiles.machine.tier1.TilePlayerDectector; import techreborn.tiles.machine.tier1.TilePlayerDectector;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -72,7 +70,6 @@ public class BlockPlayerDetector extends BlockMachineBase {
public BlockPlayerDetector() { public BlockPlayerDetector() {
super(true); super(true);
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getStateFromMeta(0)); this.setDefaultState(this.getStateFromMeta(0));
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i])); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileRecycler; import techreborn.tiles.machine.tier1.TileRecycler;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRecycler extends BlockMachineBase { public class BlockRecycler extends BlockMachineBase {
public BlockRecycler() { public BlockRecycler() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileRollingMachine; import techreborn.tiles.machine.tier1.TileRollingMachine;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRollingMachine extends BlockMachineBase { public class BlockRollingMachine extends BlockMachineBase {
public BlockRollingMachine() { public BlockRollingMachine() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileScrapboxinator; import techreborn.tiles.machine.tier1.TileScrapboxinator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockScrapboxinator extends BlockMachineBase { public class BlockScrapboxinator extends BlockMachineBase {
public BlockScrapboxinator() { public BlockScrapboxinator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileChargeOMat; import techreborn.tiles.TileChargeOMat;
import techreborn.utils.TechRebornCreativeTab;
public class BlockChargeOMat extends BlockMachineBase { public class BlockChargeOMat extends BlockMachineBase {
public BlockChargeOMat() { public BlockChargeOMat() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileChemicalReactor; import techreborn.tiles.machine.tier1.TileChemicalReactor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockChemicalReactor extends BlockMachineBase { public class BlockChemicalReactor extends BlockMachineBase {
public BlockChemicalReactor() { public BlockChemicalReactor() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -38,16 +38,12 @@ import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileDigitalChest; import techreborn.tiles.TileDigitalChest;
import techreborn.tiles.TileTechStorageBase; import techreborn.tiles.TileTechStorageBase;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
public class BlockDigitalChest extends BlockMachineBase { public class BlockDigitalChest extends BlockMachineBase {
public BlockDigitalChest() { public BlockDigitalChest() {
super(); super();
this.setTranslationKey("techreborn.digitalChest");
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileDistillationTower; import techreborn.tiles.machine.multiblock.TileDistillationTower;
import techreborn.utils.TechRebornCreativeTab;
public class BlockDistillationTower extends BlockMachineBase { public class BlockDistillationTower extends BlockMachineBase {
public BlockDistillationTower() { public BlockDistillationTower() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileImplosionCompressor; import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockImplosionCompressor extends BlockMachineBase { public class BlockImplosionCompressor extends BlockMachineBase {
public BlockImplosionCompressor() { public BlockImplosionCompressor() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace; import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialBlastFurnace extends BlockMachineBase { public class BlockIndustrialBlastFurnace extends BlockMachineBase {
public BlockIndustrialBlastFurnace() { public BlockIndustrialBlastFurnace() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileIndustrialCentrifuge; import techreborn.tiles.TileIndustrialCentrifuge;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialCentrifuge extends BlockMachineBase { public class BlockIndustrialCentrifuge extends BlockMachineBase {
public BlockIndustrialCentrifuge() { public BlockIndustrialCentrifuge() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer; import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialElectrolyzer extends BlockMachineBase { public class BlockIndustrialElectrolyzer extends BlockMachineBase {
public BlockIndustrialElectrolyzer() { public BlockIndustrialElectrolyzer() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder; import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialGrinder extends BlockMachineBase { public class BlockIndustrialGrinder extends BlockMachineBase {
public BlockIndustrialGrinder() { public BlockIndustrialGrinder() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill; import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialSawmill extends BlockMachineBase { public class BlockIndustrialSawmill extends BlockMachineBase {
public BlockIndustrialSawmill() { public BlockIndustrialSawmill() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileVacuumFreezer; import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
import techreborn.utils.TechRebornCreativeTab;
public class BlockVacuumFreezer extends BlockMachineBase { public class BlockVacuumFreezer extends BlockMachineBase {
public BlockVacuumFreezer() { public BlockVacuumFreezer() {
super(); super();
this.setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileChunkLoader; import techreborn.tiles.TileChunkLoader;
import techreborn.utils.TechRebornCreativeTab;
public class BlockChunkLoader extends BlockMachineBase { public class BlockChunkLoader extends BlockMachineBase {
public BlockChunkLoader() { public BlockChunkLoader() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -36,14 +36,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileCreativeQuantumChest; import techreborn.tiles.TileCreativeQuantumChest;
import techreborn.utils.TechRebornCreativeTab;
public class BlockCreativeQuantumChest extends BlockMachineBase { public class BlockCreativeQuantumChest extends BlockMachineBase {
public BlockCreativeQuantumChest() { public BlockCreativeQuantumChest() {
super(); super();
this.setTranslationKey("techreborn.creativeQuantumChest");
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileCreativeQuantumTank; import techreborn.tiles.TileCreativeQuantumTank;
import techreborn.utils.TechRebornCreativeTab;
public class BlockCreativeQuantumTank extends BlockMachineBase { public class BlockCreativeQuantumTank extends BlockMachineBase {
public BlockCreativeQuantumTank() { public BlockCreativeQuantumTank() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileFluidReplicator; import techreborn.tiles.machine.multiblock.TileFluidReplicator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockFluidReplicator extends BlockMachineBase { public class BlockFluidReplicator extends BlockMachineBase {
public BlockFluidReplicator() { public BlockFluidReplicator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileMatterFabricator; import techreborn.tiles.TileMatterFabricator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockMatterFabricator extends BlockMachineBase { public class BlockMatterFabricator extends BlockMachineBase {
public BlockMatterFabricator() { public BlockMatterFabricator() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -38,16 +38,12 @@ import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileTechStorageBase; import techreborn.tiles.TileTechStorageBase;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List; import java.util.List;
public class BlockQuantumChest extends BlockMachineBase { public class BlockQuantumChest extends BlockMachineBase {
public BlockQuantumChest() { public BlockQuantumChest() {
super(); super();
this.setTranslationKey("techreborn.quantumChest");
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -33,13 +33,11 @@ import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileQuantumTank;
import techreborn.utils.TechRebornCreativeTab;
public class BlockQuantumTank extends BlockMachineBase { public class BlockQuantumTank extends BlockMachineBase {
public BlockQuantumTank() { public BlockQuantumTank() {
super(); super();
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
} }

View file

@ -46,8 +46,6 @@ import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Iterator; import java.util.Iterator;
import java.util.Random; import java.util.Random;
@ -61,7 +59,6 @@ public abstract class BlockTransformer extends BaseTileBlock {
public BlockTransformer(String name) { public BlockTransformer(String name) {
super(Material.IRON); super(Material.IRON);
setHardness(2f); setHardness(2f);
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
this.name = name; this.name = name;
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));

View file

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

View file

@ -1,9 +0,0 @@
package techreborn.utils;
import net.minecraft.creativetab.CreativeTabs;
import techreborn.TechReborn;
public class TechRebornCreativeTab {
//todo: remove
public static CreativeTabs instance = TechReborn.TAB;
}