From 3261ce11c3d4f1af94f25cfec351f5449b72b39d Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 21 Dec 2013 11:39:32 +0800 Subject: [PATCH] Fixed wire item textures --- .../languages/en_US.properties | 14 ++++----- .../textures/blocks/wire.aluminum.png | Bin 269 -> 0 bytes .../textures/blocks/wire.copper.png | Bin 224 -> 0 bytes .../textures/blocks/wire.iron.png | Bin 2893 -> 0 bytes .../textures/blocks/wire.silver.png | Bin 269 -> 0 bytes .../textures/blocks/wire.superconductor.png | Bin 225 -> 0 bytes .../textures/blocks/wire.tin.png | Bin 224 -> 0 bytes .../textures/{blocks => items}/wire.png | Bin .../entangler/ItemQuantumEntangler.java | 2 +- .../render/RenderPartWire.java | 6 ++-- src/resonantinduction/wire/ItemPartWire.java | 28 +++++++----------- src/resonantinduction/wire/PartConductor.java | 2 +- 12 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 resources/assets/resonantinduction/textures/blocks/wire.aluminum.png delete mode 100644 resources/assets/resonantinduction/textures/blocks/wire.copper.png delete mode 100644 resources/assets/resonantinduction/textures/blocks/wire.iron.png delete mode 100644 resources/assets/resonantinduction/textures/blocks/wire.silver.png delete mode 100644 resources/assets/resonantinduction/textures/blocks/wire.superconductor.png delete mode 100644 resources/assets/resonantinduction/textures/blocks/wire.tin.png rename resources/assets/resonantinduction/textures/{blocks => items}/wire.png (100%) diff --git a/resources/assets/resonantinduction/languages/en_US.properties b/resources/assets/resonantinduction/languages/en_US.properties index f792883ac..b9403ae5c 100755 --- a/resources/assets/resonantinduction/languages/en_US.properties +++ b/resources/assets/resonantinduction/languages/en_US.properties @@ -8,15 +8,15 @@ tile.resonantinduction\:multimeter.name=Multimeter tile.resonantinduction\:contractor.name=Electromagnetic Contractor tile.resonantinduction\:battery.name=Modular Battery -tile.resonantinduction\:wire.copper.name=Copper Wire -tile.resonantinduction\:wire.tin.name=Tin Wire -tile.resonantinduction\:wire.iron.name=Iron Wire -tile.resonantinduction\:wire.aluminum.name=Aluminum Wire -tile.resonantinduction\:wire.silver.name=Silver Wire -tile.resonantinduction\:wire.superconductor.name=Superconductor Wire - ## Items item.resonantinduction\:quantumEntangler.name=Quantum Entangler item.resonantinduction\:capacitor.name=Capacitor Cell item.resonantinduction\:infiniteCapacitor.name=Infinite Capacitor Cell item.resonantinduction\:linker.name=Electrostatic Linker + +item.resonantinduction\:wire.copper.name=Copper Wire +item.resonantinduction\:wire.tin.name=Tin Wire +item.resonantinduction\:wire.iron.name=Iron Wire +item.resonantinduction\:wire.aluminum.name=Aluminum Wire +item.resonantinduction\:wire.silver.name=Silver Wire +item.resonantinduction\:wire.superconductor.name=Superconductor Wire diff --git a/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png b/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png deleted file mode 100644 index 503fdb1afb5d2d36e0b8b9ae601f0f8be2b69e17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwYnU7tUkNw)o`#>St%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dC|>C4;usQfI5|Orm6=B(vFHE)|Cg^PxpiFiVU}fD%qLNL zU;b1WhqABFn-~(3mFa0XDOO~1mZW8$l!>e1HI0hj-xPb-OqQzYobck+j}H$Y zt1RV?j`ns-TJ@MQoBx1}VU$3xRl*fUuwfbu4D|uhJQ4A`<>&kwYnU7tC)1%O-L}JhX|Nk#v zPjc(H>ccF{w3tt#^uP*cH`xPDYYuIz5T4X^YE^5x#7Vs_&#gT&?!2=WNo0%IRR7L> zqT;k@^^)WqR~Q#FFv!SDGgv?Vx*upU NgQu&X%Q~loCIEbJNHYKc diff --git a/resources/assets/resonantinduction/textures/blocks/wire.iron.png b/resources/assets/resonantinduction/textures/blocks/wire.iron.png deleted file mode 100644 index 075c52e7cd893c5737ffea4ac63a642064d7bf39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2893 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 A8~^|S diff --git a/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png b/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png deleted file mode 100644 index 73bf0e7f00b05f445aaa4ddcbc74fadae8d4f971..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwYnU7tW`=!0WJ)lsYr;B4q#Np%w307tviNv1&|NmdU zp5)eX)rVP@X)&Kf>46o@Zn6iQww$Wh_SDvzc}Vi4ewXLg9v*kzS&JmHMegkUFjH;X zN(tUWE*>SNHP7$N`M>0+S?k0ZuPP4QVm5H^5p#i?V!*|~{X|mdVt?ffpv?@Pu6{1- HoD!M<_!ddJ diff --git a/resources/assets/resonantinduction/textures/blocks/wire.tin.png b/resources/assets/resonantinduction/textures/blocks/wire.tin.png deleted file mode 100644 index 654dccfcd972a6a4fb20d4707945bdcb70e09a96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwYnU7t`(&BT0JWwdt)5S3);&5_;1S>O-L}JhX|Nk#v zPjc(H>ccF{w3tt#^uP*cH`xPDYYw@d-aauT