From 849f68bc946532463d5d87603ec77ab9b2e94627 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 14 Mar 2016 07:55:54 +0000 Subject: [PATCH] Trying to fix git part 1 --- .../techreborn/blocks/storage/BlockAesu.java | 65 ----------------- .../techreborn/blocks/storage/BlockLESU.java | 61 ---------------- .../blocks/storage/BlockLesuStorage.java | 72 ------------------- .../{BlockAESU.java => Block_AESU.java} | 6 +- .../{BlockIDSU.java => Block_IDSU.java} | 4 +- .../{BlockLesu.java => Block_LESU.java} | 4 +- ...ESUStorage.java => Block_LESUStorage.java} | 4 +- src/main/java/techreborn/init/ModBlocks.java | 16 ++--- 8 files changed, 16 insertions(+), 216 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/storage/BlockAesu.java delete mode 100644 src/main/java/techreborn/blocks/storage/BlockLESU.java delete mode 100644 src/main/java/techreborn/blocks/storage/BlockLesuStorage.java rename src/main/java/techreborn/blocks/storage/{BlockAESU.java => Block_AESU.java} (92%) rename src/main/java/techreborn/blocks/storage/{BlockIDSU.java => Block_IDSU.java} (94%) rename src/main/java/techreborn/blocks/storage/{BlockLesu.java => Block_LESU.java} (92%) rename src/main/java/techreborn/blocks/storage/{BlockLESUStorage.java => Block_LESUStorage.java} (93%) diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java deleted file mode 100644 index 84be46267..000000000 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ /dev/null @@ -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"; - } - -} diff --git a/src/main/java/techreborn/blocks/storage/BlockLESU.java b/src/main/java/techreborn/blocks/storage/BlockLESU.java deleted file mode 100644 index 820364b69..000000000 --- a/src/main/java/techreborn/blocks/storage/BlockLESU.java +++ /dev/null @@ -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"; - } - -} diff --git a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java deleted file mode 100644 index 52bddec5b..000000000 --- a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java +++ /dev/null @@ -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"; - } -} diff --git a/src/main/java/techreborn/blocks/storage/BlockAESU.java b/src/main/java/techreborn/blocks/storage/Block_AESU.java similarity index 92% rename from src/main/java/techreborn/blocks/storage/BlockAESU.java rename to src/main/java/techreborn/blocks/storage/Block_AESU.java index 84be46267..4aff1ef38 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAESU.java +++ b/src/main/java/techreborn/blocks/storage/Block_AESU.java @@ -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); diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/Block_IDSU.java similarity index 94% rename from src/main/java/techreborn/blocks/storage/BlockIDSU.java rename to src/main/java/techreborn/blocks/storage/Block_IDSU.java index 4e686e1d2..be6148979 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/Block_IDSU.java @@ -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); diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/Block_LESU.java similarity index 92% rename from src/main/java/techreborn/blocks/storage/BlockLesu.java rename to src/main/java/techreborn/blocks/storage/Block_LESU.java index 820364b69..6dcc61b89 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/Block_LESU.java @@ -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); diff --git a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java b/src/main/java/techreborn/blocks/storage/Block_LESUStorage.java similarity index 93% rename from src/main/java/techreborn/blocks/storage/BlockLESUStorage.java rename to src/main/java/techreborn/blocks/storage/Block_LESUStorage.java index 52bddec5b..556f1fc1b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java +++ b/src/main/java/techreborn/blocks/storage/Block_LESUStorage.java @@ -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); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 03f89b6c5..fc2082a9d 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -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");