Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9

This commit is contained in:
modmuss50 2016-03-16 17:09:34 +00:00
commit e319398bc9
17 changed files with 272 additions and 11 deletions

View file

@ -134,6 +134,12 @@ public abstract class CableMultipart extends Multipart implements IOccludingPart
public void onRemoved() {
super.onRemoved();
removeFromNetwork();
for(EnumFacing dir : EnumFacing.VALUES){
CableMultipart multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if(multipart != null){
multipart.nearByChange();
}
}
}
@Override

View file

@ -66,7 +66,7 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock {
public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) {
super.onBlockAdded(worldIn, pos, state);
if (worldIn.isBlockPowered(pos)) {
this.onBlockDestroyedByPlayer(worldIn, pos, state);
this.explode(worldIn, pos, state, null);
worldIn.setBlockToAir(pos);
}
}
@ -76,16 +76,11 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock {
*/
public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) {
if (worldIn.isBlockPowered(pos)) {
this.onBlockDestroyedByPlayer(worldIn, pos, state);
this.explode(worldIn, pos, state, null);
worldIn.setBlockToAir(pos);
}
}
public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state)
{
this.explode(worldIn, pos, state, (EntityLivingBase)null);
}
@Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
return false;

View file

@ -0,0 +1,51 @@
package techreborn.blocks.transformers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import techreborn.blocks.storage.BlockBatBox;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.transformers.TileHVTransformer;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class BlockHVTransformer extends BlockLVTransformer {
public BlockHVTransformer() {
super();
setUnlocalizedName("techreborn.hvt");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileHVTransformer();
}
@Override
public String getFrontOff() {
return prefix + "hv_transformer_front";
}
@Override
public String getFrontOn() {
return prefix + "hv_transformer_front";
}
@Override
public String getSide() {
return prefix + "hv_transformer_side";
}
@Override
public String getTop() {
return prefix + "hv_transformer_side";
}
@Override
public String getBottom() {
return prefix + "hv_transformer_bottom";
}
}

View file

@ -0,0 +1,50 @@
package techreborn.blocks.transformers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import techreborn.blocks.storage.BlockBatBox;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.transformers.TileLVTransformer;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class BlockLVTransformer extends BlockBatBox {
public BlockLVTransformer() {
super();
setUnlocalizedName("techreborn.lvt");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileLVTransformer();
}
@Override
public String getFrontOff() {
return prefix + "lv_transformer_front";
}
@Override
public String getFrontOn() {
return prefix + "lv_transformer_front";
}
@Override
public String getSide() {
return prefix + "lv_transformer_side";
}
@Override
public String getTop() {
return prefix + "lv_transformer_side";
}
@Override
public String getBottom() {
return prefix + "lv_transformer_side";
}
}

View file

@ -0,0 +1,50 @@
package techreborn.blocks.transformers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import techreborn.blocks.storage.BlockBatBox;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.transformers.TileMVTransformer;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class BlockMVTransformer extends BlockLVTransformer {
public BlockMVTransformer() {
super();
setUnlocalizedName("techreborn.mvt");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileMVTransformer();
}
@Override
public String getFrontOff() {
return prefix + "mv_transformer_front";
}
@Override
public String getFrontOn() {
return prefix + "mv_transformer_front";
}
@Override
public String getSide() {
return prefix + "mv_transformer_side";
}
@Override
public String getTop() {
return prefix + "mv_transformer_side";
}
@Override
public String getBottom() {
return prefix + "mv_transformer_side";
}
}

View file

@ -16,6 +16,9 @@ import techreborn.blocks.iron_machines.BlockIronFurnace;
import techreborn.blocks.machine.*;
import techreborn.blocks.storage.*;
import techreborn.blocks.tier1.*;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.itemblocks.*;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
@ -27,6 +30,9 @@ import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.teir1.*;
import techreborn.tiles.transformers.TileHVTransformer;
import techreborn.tiles.transformers.TileLVTransformer;
import techreborn.tiles.transformers.TileMVTransformer;
public class ModBlocks {
@ -84,6 +90,9 @@ public class ModBlocks {
public static Block mfe;
public static Block mfsu;
public static Block scrapboxinator;
public static Block lvt;
public static Block mvt;
public static Block hvt;
public static BlockOre ore;
public static BlockOre2 ore2;
@ -339,6 +348,18 @@ public class ModBlocks {
GameRegistry.registerBlock(mfsu, "mfsu");
GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU");
lvt = new BlockLVTransformer();
GameRegistry.registerBlock(lvt, "lvt");
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformer");
mvt = new BlockMVTransformer();
GameRegistry.registerBlock(mvt, "mvt");
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformer");
hvt = new BlockHVTransformer();
GameRegistry.registerBlock(hvt, "hvt");
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer");
ironFurnace = new BlockIronFurnace();
GameRegistry.registerBlock(ironFurnace, "ironfurnace");
GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR");

View file

@ -57,9 +57,9 @@ public class RecipeCompact implements IRecipeCompact {
recipes.put("pump", ItemParts.getPartByName("pump"));
recipes.put("teleporter", ItemParts.getPartByName("teleporter"));
recipes.put("advancedAlloy", ItemParts.getPartByName("advancedAlloy"));
recipes.put("lvTransformer", ItemParts.getPartByName("lvTransformer"));
recipes.put("mvTransformer", ItemParts.getPartByName("mvTransformer"));
recipes.put("hvTransformer", ItemParts.getPartByName("hvTransformer"));
recipes.put("lvTransformer", new ItemStack(ModBlocks.lvt));
recipes.put("mvTransformer", new ItemStack(ModBlocks.mvt));
recipes.put("hvTransformer", new ItemStack(ModBlocks.hvt));
recipes.put("windMill", new ItemStack(ModBlocks.windMill));
recipes.put("energyCrystal", new ItemStack(ModItems.energyCrystal));
// recipes.put("lapotronCrystal", new ItemStack(ModItems.lapotronCrystal));

View file

@ -39,7 +39,7 @@ public class ItemParts extends ItemTextureBase {
"thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell",
"quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor"
, "machineParts", "thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit"
, "rubberSap", "rubber", "scrap", "pump", "teleporter", "advancedAlloy", "lvTransformer", "mvTransformer", "hvTransformer"};
, "rubberSap", "rubber", "scrap", "pump", "teleporter", "advancedAlloy"};
public ItemParts() {

View file

@ -0,0 +1,24 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileHVTransformer extends TileLVTransformer {
@Override
public double getMaxOutput() {
return 512;
}
@Override
public double getMaxInput() {
return 2048;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.EXTREME;
}
}

View file

@ -0,0 +1,40 @@
package techreborn.tiles.transformers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
import techreborn.tiles.storage.TileBatBox;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileLVTransformer extends TileBatBox {
@Override
public double getMaxOutput() {
return 32;
}
@Override
public double getMaxInput() {
return 128;
}
@Override
//Can take medium power in
public EnumPowerTier getTier() {
return EnumPowerTier.MEDIUM;
}
@Override
public double getMaxPower() {
return getMaxInput() * 2;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(worldObj.getBlockState(pos).getBlock());
}
}

View file

@ -0,0 +1,24 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileMVTransformer extends TileLVTransformer {
@Override
public double getMaxOutput() {
return 128;
}
@Override
public double getMaxInput() {
return 512;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.HIGH;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 804 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B