Trying to fix git part 1

This commit is contained in:
modmuss50 2016-03-14 07:55:54 +00:00
parent 4cf4be51c8
commit 849f68bc94
8 changed files with 16 additions and 216 deletions

View file

@ -1,65 +0,0 @@
package techreborn.blocks.storage;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAesu;
public class BlockAESU extends BlockMachineBase implements IRotationTexture {
public BlockAESU(Material material) {
super();
setUnlocalizedName("techreborn.aesu");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileAesu();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.aesuID, world, x, y,
z);
return true;
}
private final String prefix = "techreborn:blocks/machine/storage/";
@Override
public String getFrontOff() {
return prefix + "aesu_front";
}
@Override
public String getFrontOn() {
return prefix + "aesu_front";
}
@Override
public String getSide() {
return prefix + "aesu_side";
}
@Override
public String getTop() {
return prefix + "aesu_side";
}
@Override
public String getBottom() {
return prefix + "aesu_side";
}
}

View file

@ -1,61 +0,0 @@
package techreborn.blocks.storage;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesu;
public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLESU(Material material) {
super();
setUnlocalizedName("techreborn.lesu");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileLesu();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.lesuID, world, x, y,
z);
return true;
}
private final String prefix = "techreborn:blocks/machine/storage/";
@Override
public String getFront(boolean isActive) {
return prefix + "lesu_front";
}
@Override
public String getSide(boolean isActive) {
return prefix + "lesu_side" ;
}
@Override
public String getTop(boolean isActive) {
return prefix + "lesu_side";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "lesu_side";
}
}

View file

@ -1,72 +0,0 @@
package techreborn.blocks.storage;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesuStorage;
public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLESUStorage(Material material) {
super();
setUnlocalizedName("techreborn.lesustorage");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemstack) {
super.onBlockPlacedBy(world, x, y, z, player, itemstack);
if (world.getTileEntity(new BlockPos(x, y, z)) instanceof TileLesuStorage) {
((TileLesuStorage) world.getTileEntity(new BlockPos(x, y, z))).rebuildNetwork();
}
}
@Override
public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
if (world.getTileEntity(new BlockPos(x, y, z)) instanceof TileLesuStorage) {
((TileLesuStorage) world.getTileEntity(new BlockPos(x, y, z))).removeFromNetwork();
}
super.breakBlock(world, x, y, z, block, meta);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileLesuStorage();
}
public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) {
return block == (Block) this;
}
private final String prefix = "techreborn:blocks/machine/storage/";
@Override
public String getFront(boolean isActive) {
return prefix + "lesu_block";
}
@Override
public String getSide(boolean isActive) {
return prefix + "lesu_block" ;
}
@Override
public String getTop(boolean isActive) {
return prefix + "lesu_block";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "lesu_block";
}
}

View file

@ -11,11 +11,9 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAesu;
public class BlockAESU extends BlockMachineBase implements IRotationTexture {
public class Block_AESU extends BlockMachineBase implements IRotationTexture {
public BlockAESU(Material material) {
public Block_AESU(Material material) {
super();
setUnlocalizedName("techreborn.aesu");
setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -14,10 +14,10 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.idsu.TileIDSU;
public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationTexture {
public class Block_IDSU extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockIDSU(Material material) {
public Block_IDSU(Material material) {
super();
setUnlocalizedName("techreborn.idsu");
setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -11,10 +11,10 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesu;
public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture {
public class Block_LESU extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLESU(Material material) {
public Block_LESU(Material material) {
super();
setUnlocalizedName("techreborn.lesu");
setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -13,9 +13,9 @@ import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesuStorage;
public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotationTexture {
public class Block_LESUStorage extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLESUStorage(Material material) {
public Block_LESUStorage(Material material) {
super();
setUnlocalizedName("techreborn.lesustorage");
setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -27,10 +27,10 @@ import techreborn.blocks.generator.BlockWindMill;
import techreborn.blocks.iron_machines.BlockAlloyFurnace;
import techreborn.blocks.iron_machines.BlockIronFurnace;
import techreborn.blocks.machine.*;
import techreborn.blocks.storage.BlockAESU;
import techreborn.blocks.storage.BlockIDSU;
import techreborn.blocks.storage.BlockLESU;
import techreborn.blocks.storage.BlockLESUStorage;
import techreborn.blocks.storage.Block_AESU;
import techreborn.blocks.storage.Block_IDSU;
import techreborn.blocks.storage.Block_LESU;
import techreborn.blocks.storage.Block_LESUStorage;
import techreborn.blocks.tier1.*;
import techreborn.itemblocks.ItemBlockAesu;
import techreborn.itemblocks.ItemBlockDigitalChest;
@ -269,22 +269,22 @@ public class ModBlocks {
GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor");
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
Idsu = new BlockIDSU(Material.rock);
Idsu = new Block_IDSU(Material.rock);
GameRegistry.registerBlock(Idsu, "idsu");
GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR");
Aesu = new BlockAESU(Material.rock);
Aesu = new Block_AESU(Material.rock);
GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu");
GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR");
Lesu = new BlockLESU(Material.rock);
Lesu = new Block_LESU(Material.rock);
GameRegistry.registerBlock(Lesu, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
Supercondensator = new BlockSupercondensator(Material.rock);
GameRegistry.registerBlock(Supercondensator, "supercondensator");
LesuStorage = new BlockLESUStorage(Material.rock);
LesuStorage = new Block_LESUStorage(Material.rock);
GameRegistry.registerBlock(LesuStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");