Blocks moved to TRContent

This commit is contained in:
drcrazy 2018-09-24 15:45:48 +03:00
parent 9f9595f955
commit dd94ff31c9
69 changed files with 614 additions and 603 deletions

View file

@ -39,8 +39,8 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab;
public class BlockComputerCube extends BlockMachineBase {
@ -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(TRBlocks.COMPUTER_CUBE, 1);
ItemStack drop = new ItemStack(TRContent.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,8 +43,8 @@ import reborncore.api.ToolManager;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
@ -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(TRBlocks.FUSION_COIL, 1);
ItemStack drop = new ItemStack(TRContent.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.TRBlocks;
import techreborn.init.TRContent;
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(TRBlocks.FUSION_COIL)){
if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(TRContent.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, TRBlocks.FUSION_COIL.getDefaultState());
world.setBlockState(coil, TRContent.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.TRBlocks;
import techreborn.init.TRContent;
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(TRBlocks.RUBBER_SAPLING);
return Item.getItemFromBlock(TRContent.RUBBER_SAPLING);
}
@Override

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.TRBlocks;
import techreborn.init.TRContent;
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(TRBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
return new ItemStack(TRContent.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
}
@Override