From c19b79296086d16f53d9ffaf0527e64f9f37f6ce Mon Sep 17 00:00:00 2001 From: TheDoctorSoda Date: Sun, 6 Mar 2016 18:37:10 -0800 Subject: [PATCH] [TEXTURES] Cables and refined iron --- src/main/java/techreborn/items/ItemUUmatter.java | 3 ++- .../java/techreborn/parts/CableMultipart.java | 7 ++++++- src/main/java/techreborn/parts/EnumCableType.java | 12 ++++++------ .../resources/assets/techreborn/lang/en_US.lang | 13 ++++++++----- .../cables/{insulatedcopper.png => ICOPPER.png} | Bin .../items/cables/{insulatedgold.png => IGOLD.png} | Bin .../items/cables/{insulatedhv.png => IHV.png} | Bin .../textures/items/ingot/refinedIronIngot.png | Bin 0 -> 305 bytes 8 files changed, 22 insertions(+), 13 deletions(-) rename src/main/resources/assets/techreborn/textures/items/cables/{insulatedcopper.png => ICOPPER.png} (100%) rename src/main/resources/assets/techreborn/textures/items/cables/{insulatedgold.png => IGOLD.png} (100%) rename src/main/resources/assets/techreborn/textures/items/cables/{insulatedhv.png => IHV.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/ingot/refinedIronIngot.png diff --git a/src/main/java/techreborn/items/ItemUUmatter.java b/src/main/java/techreborn/items/ItemUUmatter.java index 2ebf928dd..3f640ef12 100644 --- a/src/main/java/techreborn/items/ItemUUmatter.java +++ b/src/main/java/techreborn/items/ItemUUmatter.java @@ -1,8 +1,9 @@ package techreborn.items; +import me.modmuss50.jsonDestroyer.api.ITexturedItem; import techreborn.client.TechRebornCreativeTabMisc; -public class ItemUUmatter extends ItemTextureBase { +public class ItemUUmatter extends ItemTR implements ITexturedItem { public ItemUUmatter() { setCreativeTab(TechRebornCreativeTabMisc.instance); diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 5c1e0ec3d..959c4a57e 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -5,6 +5,7 @@ import mcmultipart.microblock.IMicroblock; import mcmultipart.multipart.*; import mcmultipart.raytrace.PartMOP; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; @@ -265,7 +266,11 @@ public abstract class CableMultipart extends Multipart implements IOccludingPart @Override public float getHardness(PartMOP hit) { - return 1F; + return 0.5F; + } + + public Material getMaterial() { + return Material.cloth; } @Override diff --git a/src/main/java/techreborn/parts/EnumCableType.java b/src/main/java/techreborn/parts/EnumCableType.java index df6c727f5..1d9521324 100644 --- a/src/main/java/techreborn/parts/EnumCableType.java +++ b/src/main/java/techreborn/parts/EnumCableType.java @@ -5,13 +5,13 @@ import techreborn.parts.types.*; public enum EnumCableType implements IStringSerializable { COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, CopperCable.class), - TIN("tin", "minecraft:blocks/iron_block", 32, 4.0, true, TinCable.class), - GOLD("gold", "minecraft:blocks/iron_block", 512, 3.0, true, GoldCable.class), - HV("hv", "minecraft:blocks/iron_block", 2048, 6.0, true, HVCable.class), - GLASSFIBER("glassfiber", "minecraft:blocks/iron_block", 8192, 4.0, false, GlassFiberCable.class), + TIN("tin", "techreborn:blocks/cables/tin_cable", 32, 12.0, true, TinCable.class), + GOLD("gold", "techreborn:blocks/cables/gold_cable", 512, 12.0, true, GoldCable.class), + HV("hv", "techreborn:blocks/cables/hv_cable", 2048, 12.0, true, HVCable.class), + GLASSFIBER("glassfiber", "techreborn:blocks/cables/glass_fiber_cable", 8192, 12.0, false, GlassFiberCable.class), ICOPPER("insulatedcopper", "techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false, InsulatedCopperCable.class), - IGOLD("insulatedgold", "minecraft:blocks/iron_block", 512, 6.0, false, InsulatedGoldCable.class), - IHV("insulatedhv", "minecraft:blocks/iron_block", 2048, 10.0, false, InsulatedHVCable.class); + IGOLD("insulatedgold", "techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, false, InsulatedGoldCable.class), + IHV("insulatedhv", "techreborn:blocks/cables/hv_insulated_cable", 2048, 10.0, false, InsulatedHVCable.class); private String friendlyName; public String textureName = "minecraft:blocks/iron_block"; diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index ded69ee6c..0e1ee27f0 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -271,7 +271,7 @@ item.techreborn.dust.greenSapphire.name=Green Sapphire Dust item.techreborn.dust.sawDust.name=Saw Dust item.techreborn.lapotroncrystal.name=Lapotron Crystal item.techreborn.energycrystal.name=Energy Crystal -item.techreborn.ingot.refinediron.name=Refined Iron +item.techreborn.ingot.refinediron.name=Refined Iron Ingot item.techreborn.wrench.name=Wrench item.techreborn.cable.COPPER.name=Copper Cable item.techreborn.cable.TIN.name=Tin Cable @@ -962,10 +962,10 @@ tile.techreborn.blastfurnace.description=This Machine needs a 3x4x3 of machine c keys.techreborn.category=TechReborn Category keys.techreborn.config=Config -achievement.TechReborn:ore_Pickup=New ore! -achievement.TechReborn:ore_Pickup.desc=Mine a techreborn ore -achievement.TechReborn:centrifuge_Craft=Time to spin -achievement.TechReborn:thermalgen_Craft=Time to heat +achievement.TechReborn:ore_PickUp=New Ore! +achievement.TechReborn:ore_PickUp.desc=Mine a TechReborn ore +achievement.TechReborn:centrifuge_Craft=Time to Spin +achievement.TechReborn:thermalgen_Craft=Time to Heat # JEI Integration techreborn.jei.recipe.start.cost=Start: %sEU @@ -974,3 +974,6 @@ techreborn.jei.recipe.processing.time.1=Time: %s ticks techreborn.jei.recipe.processing.time.2=(%s seconds) techreborn.jei.category.alloy.furnace=Alloy Furnace + +#Death Messages +death.attack.shock=%s was electrocuted \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png b/src/main/resources/assets/techreborn/textures/items/cables/ICOPPER.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png rename to src/main/resources/assets/techreborn/textures/items/cables/ICOPPER.png diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png b/src/main/resources/assets/techreborn/textures/items/cables/IGOLD.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png rename to src/main/resources/assets/techreborn/textures/items/cables/IGOLD.png diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png b/src/main/resources/assets/techreborn/textures/items/cables/IHV.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png rename to src/main/resources/assets/techreborn/textures/items/cables/IHV.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/refinedIronIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/refinedIronIngot.png new file mode 100644 index 0000000000000000000000000000000000000000..4aad75999aaf608e213e7dc08e9a099c41a4c972 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONP@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM z&oalj&JU<&k*AAeh=qT$gq6c#<&X9p&O47V&QKGWw;@MgLfC{QR+wYXu3sE|8>O0j zg*gmeNCxrn*KHOGB8e1Y%yuPqL3`Y?9i3i_TVzh zp@ph{6L`!S(xgx1dw$*gA