From 3f2128a7762f984a9f39c3d7b574e5818e1d3c20 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Mon, 4 Mar 2024 00:12:19 -0500 Subject: [PATCH] added diamond drill, added texture layers for it --- .../main/java/trinsdar/gt4r/data/GT4RData.java | 3 ++- .../trinsdar/gt4r/items/ItemElectricTool.java | 2 +- .../overlay/{diamond_drill.png => drill_1.png} | Bin .../gt4r/textures/item/tool/overlay/drill_2.png | Bin 0 -> 4272 bytes .../item/tool/overlay/electric_wrench_alt.png | Bin 0 -> 4437 bytes 5 files changed, 3 insertions(+), 2 deletions(-) rename common/src/main/resources/assets/gt4r/textures/item/tool/overlay/{diamond_drill.png => drill_1.png} (100%) create mode 100644 common/src/main/resources/assets/gt4r/textures/item/tool/overlay/drill_2.png create mode 100644 common/src/main/resources/assets/gt4r/textures/item/tool/overlay/electric_wrench_alt.png diff --git a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java index 54758ca5..e5b76c0d 100644 --- a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java +++ b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java @@ -136,7 +136,8 @@ private static Block.Properties prepareProperties() { public static ItemBasic MachineParts = new ItemBasic<>(GT4RRef.ID, "machine_parts"); public static ItemBasic StorageDataOrb = new ItemStorageOrb(GT4RRef.ID, "storage_data_orb").tip("A High Capacity Data Storage"); - public static ItemElectricTool DRILL = new ItemElectricTool("drill", GTCoreTools.DRILL, 6.0f, 6.5f, 2, 1); + public static ItemElectricTool DRILL = new ItemElectricTool("drill", GTCoreTools.DRILL, 6.0f, 5.5f, 2, 1); + public static ItemElectricTool DIAMOND_DRILL = new ItemElectricTool("diamond_drill", GTCoreTools.DRILL, 8.0f, 6.0f, 3, 1); public static ItemBasic ZPM = new ItemBattery(GT4RRef.ID, "zpm", Tier.ZPM, 100000000000L, false); //public static ItemBasic BatteryEnergyOrbCluster = new ItemBasic<>(Ref.ID, "battery_energy_orb_cluster"); diff --git a/common/src/main/java/trinsdar/gt4r/items/ItemElectricTool.java b/common/src/main/java/trinsdar/gt4r/items/ItemElectricTool.java index 408f660e..ce4d49bb 100644 --- a/common/src/main/java/trinsdar/gt4r/items/ItemElectricTool.java +++ b/common/src/main/java/trinsdar/gt4r/items/ItemElectricTool.java @@ -302,7 +302,7 @@ public int getItemColor(ItemStack stack, @Nullable Block block, int i) { @Override public Texture[] getTextures() { List textures = new ObjectArrayList<>(); - int layers = getAntimatterToolType().getOverlayLayers(); + int layers = getId().contains("diamond") ? 2 : getAntimatterToolType().getOverlayLayers(); textures.add(new Texture(getTextureDomain(), "item/tool/".concat(getAntimatterToolType().getId()))); if (layers == 1) textures.add(new Texture(getTextureDomain(), "item/tool/overlay/".concat(getAntimatterToolType().getId()))); diff --git a/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/diamond_drill.png b/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/drill_1.png similarity index 100% rename from common/src/main/resources/assets/gt4r/textures/item/tool/overlay/diamond_drill.png rename to common/src/main/resources/assets/gt4r/textures/item/tool/overlay/drill_1.png diff --git a/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/drill_2.png b/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/drill_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a2205838089bde5bbfc139709d00583d2bd617c5 GIT binary patch literal 4272 zcmeHKe{2(V6u&aYkHK{4f^(?cNW5a0t^7LX1qN3`N0r*RI=?#4M5j*51o+%7>1?0OI#H&XJ})_H26Dz=sFM6akSd)ce@v3GvEO% z4O20LW&^`8MxJ6w!BRli3gb4AH5+YY8&dVT4di(Vc?-z*C2TYwvtbIB4)b;xG{~7S z?}H(2i0{<{vi6ywf4d(MJ)vBG6nmfHINEXiNu?*Fa!y$fed`#LY2`0LQ? zujHPXx?@p(@Z6itgPntC8gt%@t+f00pLd^C&fZg;o%xja@Pp@UecNuk`jG#~Hg{WE z@pB)Prq8nm_uF3`d^#HVs&nD@1rMLwHIUv{S@*>|zwWI%xur9(XRE2}+4YNFGrrW? zoBg(!o3ZulxqS+iXKW0t!(K3az(|` z4-4LG9k%?wyP^7{me2YweYbdc`;t%Ejy`c|+T~l{dSJn~D{4>omp^c@sb=xeRl}Cg z<+8cEOZP$n#w71*b+xCI6CxoKFGhUG6bnVQ)57u#Vo_eGK`QP;0V(V-UhMkVh)bfw z_^{POd7@5KEtNFNXjNmGS7@veSkYLpBrQM20YC_;JRS=L!wMI37PPS&!td8-ta{ z!?_|ttrni!|k`7O{%2*1zoBN!IE?Kav@m<42}S+fQC8QU0$m9hj?$p^Mc3`+V{!g2jlaJ&#tLE-CA zoMFIe<>zs^Du zU5WVBdR|6_0pJn1g7Vb=J>mE12bDYCy1p7|rvQWzl!c&}e-cI}5+=2tF_LjU`7ciL zb%QZY2K?eWXkO3@$z(H3a0c<-%unJhZsry^KDo(+_?@I{lCB9cFd^f~>YAi$LJUmE zc(S_wH@ebBU#CzQeg)OT%hKkWohRW%YnpFGu?uU$9>uRhb_eX+8q=la4Q zf6O}F)7baPXT61o4S!Tt&K{8E*#n)Ov$xgNwUzG5ratQ2{L80r*k;c^-OXpEwy(>? ZF>LV4oX4_K1BU<`a~GAl_Agu4{5KK!yAS{X literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/electric_wrench_alt.png b/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/electric_wrench_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..a0f3ad9d7e39c9f951fcfd93006c6c066c5b627e GIT binary patch literal 4437 zcmeHLYj6|S6<*mSHnN@aFtjnGY}RcD0;^p~tJlWDu_a?^K%n>mrWo*Q_pY_IUPvoT z<`D-wO5%heJW`rAlsE}ZNL$i6K*s@6(wdAJpd{#nx9d-vRPzI)Dh&ppzr%e%a~NL!-CFs#V!a@IgUO=i z1pQuU1{fDZ|4V4nW0|#n4`bz(ufC6i6N+QQeYM-;#SJ<=tuvazo;ENnZG;bQ(6a_J z%P_FMrhC*Q1xZsLAAoC0ayYzhhXap9!=e;G7?#|-WvAWM=PgdHxbOrqEARftt-^t$ z4b#Yv4%E-DOnDa`{)^h=O*b@^FaD8P$Y}gWgD>r#s(*IPtYhn^JM%T$?$sI3JhOX$@#b`T zAN$HRU)h-xgKvLYJ2X2thq%7Txa`?vXL92OvvqK0b%T3l*V|qFo}>8n(syS)b;bJa zwX>7r$+P=E?kYX$>*@UQUE=p^OSjLguJ^pW`QCKT>9!{it$d~DlKoaeU)vV+)AZp- zcb+8n;1!Q_l$<{B=8|o#KQAtj*cCT#KGt}`sY^8?I=ZM^Tl88w@5|0BhmL4#cdx6l zYUDSp=lb*Cd82?yZy(z759^<1;x`K$uLj$XXwGilwJzN9=hE)>IlaB1meb#jyq;UQ z`0m#h9IM%}$2%VzZ2sJ1Yx;2ZCu@iPeu?eBn!Drq)xQWm-05gK?0PS~c<|cQy&s&g zAH4Mi)>0hZzbg3F^N@r|sjfk8@GN8ba8SnyVIR^ZgArxNu(I-GgyUO~jQdct6tWY8 z$4(HqB-n{nCJ*h2IFMg*ZH%JYjmzu!jV-)QAj%hO%aSYr1d+_)$zUK9W0Q75#bsfv zh$#YBRpb^s(Ey3$2uBgl=olSMRwboY1F=|(mqi7Ut#K~NLcpD!@XK<9rKm(Ap-UKb z;b=3Zx7lnIZJ-PW5;VwITS(@TWGGguKx8nSD8@&nh%ALexPr;~!g1M75HODq`xlIO zJR|U-Se6CggGzD{O0T1-V2~PX5tFN00VM0tS6amC+9HUmL9uW=%A=}Q6p~BFLJ0hb zeIykyfiA{f|-Wl|`f9G$3>f~Z#J6gKr1+Gf(*47ACt*V88B zsM1OljX@?Vm}>Dq;=18NOwuNn&bY6@dBTDuwtbzpa(M7E(1$H|NikTzO%-KMR4v+&xy#%JB=soa zxOym9j?aV;<64oR`UzN>Dc;Y8nh{iwY`PB1rLRZ@-l%6dGvY`SZ=p#>K=;u~B6peGlZ5WkajP0}?X z1}3CDnO&1~O^AUBDNknC|BWu~=;IU$!LOhMJS+vO_k9izT6g-ERy(nFY%SLQgL(H* zAekC*t&U+>!E~i*+J*HyL6|4IJym(1Q`$tt}YFR9X>XZ|v8YGGgZR!!l_frp;5ZtrP4D0(_J%sn!A zd(N$!n=kfVsF-J-eSHO4aKFa7s)jbf6tYJ{p_U& zr*HK}{_Wg@lCL+OJ^TQkll%Vf>f2^+vQ*U9i$6-Od0}u<{Bqy@c^}_%eCS`7UtF}* znATqUp+oB;P93?Oc