Renamed ModBlocks to TRBlocks

This commit is contained in:
drcrazy 2018-09-23 23:21:19 +03:00
parent f02b24f813
commit bf7f7ba871
86 changed files with 307 additions and 298 deletions

View file

@ -39,7 +39,7 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds;
import techreborn.utils.TechRebornCreativeTab;
@ -65,7 +65,7 @@ public class BlockComputerCube extends BlockMachineBase {
if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) {
if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) {
if (playerIn.isSneaking()) {
ItemStack drop = new ItemStack(ModBlocks.COMPUTER_CUBE, 1);
ItemStack drop = new ItemStack(TRBlocks.COMPUTER_CUBE, 1);
spawnAsEntity(worldIn, pos, drop);
worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE,
SoundCategory.BLOCKS, 0.6F, 1F);

View file

@ -43,7 +43,7 @@ import reborncore.api.ToolManager;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds;
import techreborn.utils.TechRebornCreativeTab;
@ -68,7 +68,7 @@ public class BlockFusionCoil extends Block {
if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) {
if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) {
if (playerIn.isSneaking()) {
ItemStack drop = new ItemStack(ModBlocks.FUSION_COIL, 1);
ItemStack drop = new ItemStack(TRBlocks.FUSION_COIL, 1);
spawnAsEntity(worldIn, pos, drop);
worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE,
SoundCategory.BLOCKS, 0.6F, 1F);

View file

@ -40,7 +40,7 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.Torus;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.utils.damageSources.FusionDamageSource;
@ -60,7 +60,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
final EntityPlayer player, final EnumHand hand, final EnumFacing side,
final float hitX, final float hitY, final float hitZ) {
final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world.getTileEntity(pos);
if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(ModBlocks.FUSION_COIL)){
if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(TRBlocks.FUSION_COIL)){
List<BlockPos> coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size);
boolean placed = false;
for(BlockPos coil : coils){
@ -68,7 +68,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
return true;
}
if(world.isAirBlock(coil) && !tileFusionControlComputer.isCoil(coil)){
world.setBlockState(coil, ModBlocks.FUSION_COIL.getDefaultState());
world.setBlockState(coil, TRBlocks.FUSION_COIL.getDefaultState());
if(!player.isCreative()){
player.getHeldItem(hand).shrink(1);
}

View file

@ -41,7 +41,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List;
@ -126,7 +126,7 @@ public class BlockRubberLeaves extends BlockLeaves {
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(ModBlocks.RUBBER_SAPLING);
return Item.getItemFromBlock(TRBlocks.RUBBER_SAPLING);
}
@Override

View file

@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.storage.TileAdjustableSU;
public class BlockAdjustableSU extends BlockEnergyStorage {
@ -50,7 +50,7 @@ public class BlockAdjustableSU extends BlockEnergyStorage {
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
drops.add(new ItemStack(TRContent.MachineBlocks.INDUSTRIAL.getFrame()));
} else {
super.getDrops(drops, world, pos, state, fortune);
}

View file

@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.storage.TileHighVoltageSU;
/**
@ -53,7 +53,7 @@ public class BlockHighVoltageSU extends BlockEnergyStorage {
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
} else {
super.getDrops(drops, world, pos, state, fortune);
}

View file

@ -35,7 +35,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
public class BlockInterdimensionalSU extends BlockEnergyStorage {
@ -71,7 +71,7 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage {
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
} else {
super.getDrops(drops, world, pos, state, fortune);
}

View file

@ -45,7 +45,7 @@ import reborncore.common.RebornCoreConfig;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.storage.lesu.TileLSUStorage;
import techreborn.utils.TechRebornCreativeTab;
@ -113,7 +113,7 @@ public class BlockLSUStorage extends BaseTileBlock {
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()));
} else {
super.getDrops(drops, world, pos, state, fortune);
}

View file

@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
public class BlockLapotronicSU extends BlockEnergyStorage {
@ -50,7 +50,7 @@ public class BlockLapotronicSU extends BlockEnergyStorage {
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
} else {
super.getDrops(drops, world, pos, state, fortune);
}

View file

@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.storage.TileMediumVoltageSU;
/**
@ -53,7 +53,7 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage {
@Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
if (RebornCoreConfig.wrenchRequired) {
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()));
} else {
super.getDrops(drops, world, pos, state, fortune);
}

View file

@ -57,7 +57,7 @@ import reborncore.common.util.ArrayUtils;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.TRBlocks;
import techreborn.utils.MessageIDs;
import techreborn.tiles.machine.tier1.TilePlayerDectector;
import techreborn.utils.TechRebornCreativeTab;
@ -176,7 +176,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
// Block
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
return new ItemStack(TRBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
}
@Override

View file

@ -32,7 +32,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.transformers.TileHVTransformer;
/**
@ -52,7 +52,7 @@ public class BlockHVTransformer extends BlockTransformer {
@Override
public void getDrops(NonNullList<ItemStack> drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) {
if (RebornCoreConfig.wrenchRequired){
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED));
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
}
else {
drops.add(new ItemStack(this));

View file

@ -32,7 +32,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.init.ModBlocks;
import techreborn.init.TRContent;
import techreborn.tiles.transformers.TileMVTransformer;
/**
@ -52,7 +52,7 @@ public class BlockMVTransformer extends BlockTransformer {
@Override
public void getDrops(NonNullList<ItemStack> drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) {
if (RebornCoreConfig.wrenchRequired){
drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()));
}
else {
drops.add(new ItemStack(this));