diff --git a/build.gradle b/build.gradle index 03fe41a95..afe56bbc7 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ dependencies { // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' deobfCompile 'RebornCore:RebornCore-1.8.9:1.4.4.+:universal' deobfCompile "mezz.jei:jei_1.8.9:2.27.+" - deobfCompile 'MCMultiPart:MCMultiPart:1.0.6:universal' + deobfCompile 'MCMultiPart:MCMultiPart:1.0.8:universal' println("Downloading dependencies that have no maven :/") //This is done becuase diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 18b57d32f..5c1e0ec3d 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -11,12 +11,10 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -25,13 +23,14 @@ import net.minecraftforge.common.property.Properties; import reborncore.api.power.IEnergyInterfaceTile; import reborncore.common.misc.Functions; import reborncore.common.misc.vecmath.Vecs3dCube; +import techreborn.utils.damageSources.ElectrialShockSource; import java.util.*; /** * Created by mark on 02/03/2016. */ -public abstract class CableMultipart extends Multipart implements IOccludingPart, ISlottedPart, ITickable, ICableType { +public abstract class CableMultipart extends Multipart implements IOccludingPart, ISlottedPart, ITickable, ICableType, ICollidableMultipart { public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14]; public float center = 0.6F; @@ -277,4 +276,17 @@ public abstract class CableMultipart extends Multipart implements IOccludingPart } + @Override + public void onEntityCollided(Entity entity) { + if(getCableType().canKill && entity instanceof EntityLivingBase){ + entity.attackEntityFrom(new ElectrialShockSource(), 1F); + getWorld().playSoundAtEntity(entity, "techreborn:cable_shock", 0.6F, 1F); + getWorld().spawnParticle(EnumParticleTypes.CRIT, entity.posX, entity.posY, entity.posZ, 0, 0,0); + } + } + + @Override + public void onEntityStanding(Entity entity) { + + } } diff --git a/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java b/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java new file mode 100644 index 000000000..325877c6c --- /dev/null +++ b/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java @@ -0,0 +1,12 @@ +package techreborn.utils.damageSources; + +import net.minecraft.util.DamageSource; + +/** + * Created by mark on 06/03/2016. + */ +public class ElectrialShockSource extends DamageSource { + public ElectrialShockSource() { + super("shock"); + } +} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 41d97b5ca..edb33d97d 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -64,7 +64,7 @@ tile.techreborn.ore2.copper.name=Copper Ore tile.techreborn.ore2.tin.name=Tin Ore tile.techreborn.storage2.copper.name=Copper Block tile.techreborn.storage2.tin.name=Tin Block -tile.techreborn.solarpanel.name=Solar panel +tile.techreborn.solarpanel.name=Solar Panel tile.techreborn.watermill.name=Water Mill tile.techreborn.windmill.name=Wind Mill tile.techreborn.ironfurnace.name=Iron Furnace diff --git a/src/main/resources/assets/techreborn/sounds.json b/src/main/resources/assets/techreborn/sounds.json index 744cf2902..058d87ef0 100644 --- a/src/main/resources/assets/techreborn/sounds.json +++ b/src/main/resources/assets/techreborn/sounds.json @@ -1,4 +1,5 @@ { "sap_extract": { "category": "block", "sounds":["sap_extract"] }, - "block_dismantle": { "category": "block", "sounds":["block_dismantle"] } + "block_dismantle": { "category": "block", "sounds":["block_dismantle"] }, + "cable_shock": { "category": "block", "sounds":["cable_shock"] } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/sounds/cable_shock.ogg b/src/main/resources/assets/techreborn/sounds/cable_shock.ogg new file mode 100644 index 000000000..d23d5b3ed Binary files /dev/null and b/src/main/resources/assets/techreborn/sounds/cable_shock.ogg differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png index bc8da6e1a..b5dec84a7 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png index ea6ca6f9d..407eaa2ac 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png new file mode 100644 index 000000000..6053105fb Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png new file mode 100644 index 000000000..964172c2e Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png new file mode 100644 index 000000000..9ccdf70d7 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png new file mode 100644 index 000000000..530d44234 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png new file mode 100644 index 000000000..1b7f2f737 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png new file mode 100644 index 000000000..1ed546578 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png b/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png new file mode 100644 index 000000000..81acb06e1 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/hv.png b/src/main/resources/assets/techreborn/textures/items/cables/hv.png new file mode 100644 index 000000000..5930de11b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/cables/hv.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png index 856e6501d..7e1d323f5 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png and b/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png new file mode 100644 index 000000000..8d295f901 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png new file mode 100644 index 000000000..b44707d70 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/tin.png b/src/main/resources/assets/techreborn/textures/items/cables/tin.png index 4c6438dcb..b6f890534 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/tin.png and b/src/main/resources/assets/techreborn/textures/items/cables/tin.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_off.png b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_off.png new file mode 100644 index 000000000..86c5a5479 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_off.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png new file mode 100644 index 000000000..a400527b5 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png differ