From c7a8fa9bf1ec513c8f3a4108f1960a576c940b6c Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 25 Aug 2021 03:13:07 -0500 Subject: [PATCH 1/4] Add solar covers MV-UV (CEu) --- .../gregtech/common/covers/CoverBehaviors.java | 9 +++++++++ .../java/gregtech/common/items/MetaItem1.java | 8 ++++++++ .../java/gregtech/common/items/MetaItems.java | 7 +++++++ .../resources/assets/gregtech/lang/en_us.lang | 14 ++++++++++++++ .../items/metaitems/cover.solar.panel.ev.png | Bin 0 -> 492 bytes .../items/metaitems/cover.solar.panel.hv.png | Bin 0 -> 414 bytes .../items/metaitems/cover.solar.panel.iv.png | Bin 0 -> 481 bytes .../items/metaitems/cover.solar.panel.luv.png | Bin 0 -> 509 bytes .../items/metaitems/cover.solar.panel.mv.png | Bin 0 -> 500 bytes .../items/metaitems/cover.solar.panel.uv.png | Bin 0 -> 502 bytes .../items/metaitems/cover.solar.panel.zpm.png | Bin 0 -> 558 bytes 11 files changed, 38 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.ev.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.hv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.iv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.luv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.mv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.uv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.zpm.png diff --git a/src/main/java/gregtech/common/covers/CoverBehaviors.java b/src/main/java/gregtech/common/covers/CoverBehaviors.java index 23aa96ddc38..7e4e3056e15 100644 --- a/src/main/java/gregtech/common/covers/CoverBehaviors.java +++ b/src/main/java/gregtech/common/covers/CoverBehaviors.java @@ -74,6 +74,15 @@ public static void init() { registerBehavior(20 + i, new ResourceLocation(GTValues.MODID, "pump." + tierShortName), MetaItems.PUMPS[i], (tile, side) -> new CoverPump(tile, side, coverTier, throughput)); registerBehavior(40 + i, new ResourceLocation(GTValues.MODID, "fluid.regulator." + tierShortName), MetaItems.FLUID_REGULATORS[i], (tile, side) -> new CoverFluidRegulator(tile, side, coverTier, throughput)); } + + registerBehavior(55, new ResourceLocation(GTValues.MODID, "solar_panel.mv"), MetaItems.COVER_SOLAR_PANEL_MV, (tile, side) -> new CoverSolarPanel(tile, side, 128)); + registerBehavior(56, new ResourceLocation(GTValues.MODID, "solar_panel.hv"), MetaItems.COVER_SOLAR_PANEL_HV, (tile, side) -> new CoverSolarPanel(tile, side, 512)); + registerBehavior(57, new ResourceLocation(GTValues.MODID, "solar_panel.ev"), MetaItems.COVER_SOLAR_PANEL_EV, (tile, side) -> new CoverSolarPanel(tile, side, 2048)); + registerBehavior(58, new ResourceLocation(GTValues.MODID, "solar_panel.iv"), MetaItems.COVER_SOLAR_PANEL_IV, (tile, side) -> new CoverSolarPanel(tile, side, 8192)); + registerBehavior(59, new ResourceLocation(GTValues.MODID, "solar_panel.luv"), MetaItems.COVER_SOLAR_PANEL_LUV, (tile, side) -> new CoverSolarPanel(tile, side, 32768)); + registerBehavior(60, new ResourceLocation(GTValues.MODID, "solar_panel.zpm"), MetaItems.COVER_SOLAR_PANEL_ZPM, (tile, side) -> new CoverSolarPanel(tile, side, 131072)); + registerBehavior(61, new ResourceLocation(GTValues.MODID, "solar_panel.uv"), MetaItems.COVER_SOLAR_PANEL_UV, (tile, side) -> new CoverSolarPanel(tile, side, 524288)); + } public static void registerBehavior(int coverNetworkId, ResourceLocation coverId, MetaValueItem placerItem, BiFunction behaviorCreator) { diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 8dd0968a2d7..8df33f80ba1 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -25,6 +25,7 @@ import static gregtech.api.util.DyeUtil.getOredictColorName; import static gregtech.common.items.MetaItems.*; +import static gregtech.common.items.MetaItems.COVER_SOLAR_PANEL_UV; public class MetaItem1 extends StandardMetaItem { @@ -312,6 +313,13 @@ public void registerSubItems() { COVER_SOLAR_PANEL = addItem(331, "cover.solar.panel"); COVER_SOLAR_PANEL_ULV = addItem(332, "cover.solar.panel.ulv"); COVER_SOLAR_PANEL_LV = addItem(333, "cover.solar.panel.lv"); + COVER_SOLAR_PANEL_MV = addItem(334, "cover.solar.panel.mv"); + COVER_SOLAR_PANEL_HV = addItem(335, "cover.solar.panel.hv"); + COVER_SOLAR_PANEL_EV = addItem(336, "cover.solar.panel.ev"); + COVER_SOLAR_PANEL_IV = addItem(337, "cover.solar.panel.iv"); + COVER_SOLAR_PANEL_LUV = addItem(338, "cover.solar.panel.luv"); + COVER_SOLAR_PANEL_ZPM = addItem(339, "cover.solar.panel.zpm"); + COVER_SOLAR_PANEL_UV = addItem(340, "cover.solar.panel.uv"); // Early Game Brick Related: ID 347-360 IItemContainerItemProvider selfContainerItemProvider = itemStack -> itemStack; diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 8cc815b92f7..674612a9d37 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -408,6 +408,13 @@ private MetaItems() { public static MetaItem.MetaValueItem COVER_SOLAR_PANEL; public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_ULV; public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_LV; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_MV; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_HV; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_EV; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_IV; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_LUV; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_ZPM; + public static MetaItem.MetaValueItem COVER_SOLAR_PANEL_UV; public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT; diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 181a744983e..cca18473db4 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -740,6 +740,20 @@ metaitem.cover.solar.panel.ulv.name=Solar Panel (8V) metaitem.cover.solar.panel.ulv.tooltip=8 Volt Solar Panel metaitem.cover.solar.panel.lv.name=Solar Panel (LV) metaitem.cover.solar.panel.lv.tooltip=Low Voltage Solar Panel +metaitem.cover.solar.panel.mv.name=Solar Panel (MV) +metaitem.cover.solar.panel.mv.tooltip=Medium Voltage Solar Panel +metaitem.cover.solar.panel.hv.name=Solar Panel (HV) +metaitem.cover.solar.panel.hv.tooltip=High Voltage Solar Panel +metaitem.cover.solar.panel.ev.name=Solar Panel (EV) +metaitem.cover.solar.panel.ev.tooltip=Extreme Voltage Solar Panel +metaitem.cover.solar.panel.iv.name=Solar Panel (IV) +metaitem.cover.solar.panel.iv.tooltip=Insane Voltage Solar Panel +metaitem.cover.solar.panel.luv.name=Solar Panel (LuV) +metaitem.cover.solar.panel.luv.tooltip=Ludicrous Voltage Solar Panel +metaitem.cover.solar.panel.zpm.name=Solar Panel (ZPM) +metaitem.cover.solar.panel.zpm.tooltip=Zero Point Module Solar Panel +metaitem.cover.solar.panel.uv.name=Solar Panel (UV) +metaitem.cover.solar.panel.uv.tooltip=Ultimate Voltage Solar Panel metaitem.cover.infinite_water.name=Infinite Water Cover metaitem.cover.infinite_water.tooltip=Creates 16 Buckets of Water every second (as Cover) diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.ev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.ev.png new file mode 100644 index 0000000000000000000000000000000000000000..2f40322a850f4b108639a95b687a9604e9616c63 GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G_YAk0{w5<>&kwYMUcmwi*07JDo{wW#5JNMI6tkV zJh3R1p&&6cuS72|wM4;0&p^-6*n~N{3TTn1r;B4qg!|KLzCni^1Xv%e2|2)}_E5b+ za9hkVpCYBzHZ0j@>ueju3!fgVe(_~?mC&q(5i>Y~%dT!$xLjh-v{LEQmGI+!)86~$ zT1914{QvPrr{>svlB`Me1-?9P7h;1HkaWyh`R{j%TIZj$=Jc!>Le<2QkMeHUtL)}BAieL#LT zkEl$D%GBxak{fPrX!^jk#9Z}6z`=u$_u0&PcQNZyEzg0^@$3&A-u`EK@WB2z*QXl| zKn;H;NJ-pW=)0?*QLR}BWTa6@!GdFURy*vWL9N2)P65p`Jl3b@z$}U;*t%m+`BgB-cjZ*oomam`sS6^$xo|; eXG@8?-ajm~dD;fPQaxbEGkCiCxvX!Inl z_ipxkp3R(j=wrjlo#&s{)lPW5V$#V8lhcxIZ>vuAIevyWV#NooH78;;J{t)v(GfAx zzT9Q^faSmvwJlD^cbOY+E@vvpN!CkpWL#sGAj)a3AZciHIHRS08{^vY1O|iiwb$e) zwC*v?7xrts$)6y&g(1NxP58&_&(pkFY`G;Rxl5VeD1MnSb>)PgQ+6}{QoPy_VXIWC zexYa)qqOL;dz>${T5=gyNtTHkS^d&9exnsS?>pNYowvSwKUMq&1_OhqtDnm{r-UW| DLF1T= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.iv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.iv.png new file mode 100644 index 0000000000000000000000000000000000000000..86a7c1e9a9e64464b1b0c0b0b9d585528a94bd8f GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G_YAk0{w5<>&kwYMUcmwi*07JDo{wW#5JNMI6tkV zJh3R1p&&6cuS72|wM4;0&p^-6*n~N{3TTm?r;B4qg!|iT)_#W_1lSV79XN`TtoffO zPMmi7!B+p4Db4|x1Bw~+oTjRMZ9_hlw)C=gp_MtuRWe=&+qNY^wo01WYJwK z{p-b~?D&p57WV60Dc#0!@Th+N`{o<=`qMAuS%C!XU<1l6-%MyVxtMYKCd|OPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+00(qQO+^RY1Q853 z3I>^jB>(^b8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF*7s+TY3Nh0a{5!K~z{r z?UqkY!ax|syAlCYY|EblR@r(PJMD=~JcMgEu04PkaplH)=)7-y+73fVbS5wfU-Ap| zo7eXqgeD}8`3%h7aoyyTog;#`_m7}32Z8n+tbjB4>E$&D50B3RbC0h8h1ppx%tlJM zUEc}oNh{<7)nhs|PjA#7r+k2 z46${m0{<>hrb>V*pz(FC1nj2Y1@LO?SYSS`h4>242&RCBfO`f}%j@25We8GWD@?Ps z`)dJyb!BRxVWq!*z;nVqb(^9QR+mbMufXpg62nh{Ob2QBn3BbX5~#bcY(k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.mv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.mv.png new file mode 100644 index 0000000000000000000000000000000000000000..09b43bdbb24b3eec928fe44ccef0af849142b627 GIT binary patch literal 500 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+00(qQO+^RY1Q853 z3I>^jB>(^b8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF*7s+TY3Nh0Z~arK~z{r z?UqeW!!Q(tvjW2VUu@&#*Hx**0Z)pom;5eR~_INNUs2m%pu^K zJeWO!YhUM||G9v`J(@=?z#p5K3a)8Ww7t)Qt8=xRc?*IR5EvM}KzX5nmh@I&wpSXYSK#LliRDnBFhK@hQ?kC)fVyiFD)2nL0-<5>NfzK>!xx5z qITGm4(F<@~Q4B_B=%J7}lV#t|3bm+p&q0g;0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+00(qQO+^RY1Q853 z3I>^jB>(^b8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF*7s+TY3Nh0aHmtK~z{r z?Up@G!$1^-T><%#gYEn{35K*>hF$waNI3*G4K)YgBB|1F57;-W3C@e7NMI{ji6?!9 z_l;-9RxBlIn6HjGIZZdU$MnzHr2Jl+zxSx+o5MF`w#sD!DXgul5r)hQp{LHjY@Ba&g zS0Ilq5L1E1_o)R87&~)8>$sl|3<$3PjRY|kGi_ei9NjHEe<~o*_#i-Wu>WlVzPdd2 z(6Df?U*MkboVrz3g2k-`;T8D#L*m&LNL-MEpDCFQEuiksg$mqIMBkj sVU7gqIeP(4UDO39r|G6PsZA7p190cF;gaZ|p#T5?07*qoM6N<$f=%PdasU7T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.zpm.png b/src/main/resources/assets/gregtech/textures/items/metaitems/cover.solar.panel.zpm.png new file mode 100644 index 0000000000000000000000000000000000000000..726fccb4ec2170a8b27dd9f7700742b48af59a29 GIT binary patch literal 558 zcmV+}0@3}6P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+00(qQO+^RY1Q853 z3I>^jB>(^b8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF*7s+TY3Nh0gFjQK~z{r z)s{_C!axv(S*d`Pkc2=2L@0M&#{8VfDi7h>jcX6!MO?Y@9y+gwhm$c%X(m9r>Z>F( zoqivXR556%kB-?}O*gsZ$C8HExA#tA4g&2unm}Xl5~5))^iN=>LP6?P0taVmD437S8i}W2-zKUAet`Z7aFE*k z#+`zDI5)3(AK*Ipw}4Gkpn1)6vk&}PfDhYhqTwJ8&Vo_`am4jHDr!R4v0hL8QgAAO z(BA|=Yk}}07x)@69K<8NhCm##HovS3WMLueyx*As!jB?=VYUF*z(E8s*cRZvbAiMw zgvCS;qQI3J45nKF96{>W1<-^2**F(k3z&lsBEUfyVhWhp>!tvZ{e?PLv=*@01#J6( zQvrT;iKpREJY0bLgzN0vM5TbA5cE&r>ko-$ClIJ01z%Hw*ATF8r9uJs`zPQU2A`w= wOBU=#*Dwcxb{$=SWj1xe-fFtZB}NSfpI?iq7?7vFAOHXW07*qoM6N<$f-$z-?f?J) literal 0 HcmV?d00001 From 283c75cbbca45e9fb0299bd089357f084f326c1a Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 25 Aug 2021 03:37:29 -0500 Subject: [PATCH 2/4] Address comments Addressed comments, changed EUt to long --- .../common/covers/CoverBehaviors.java | 27 ++++++++++--------- .../common/covers/CoverSolarPanel.java | 4 +-- .../java/gregtech/common/items/MetaItem1.java | 1 - 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/gregtech/common/covers/CoverBehaviors.java b/src/main/java/gregtech/common/covers/CoverBehaviors.java index 7e4e3056e15..19ed677ef81 100644 --- a/src/main/java/gregtech/common/covers/CoverBehaviors.java +++ b/src/main/java/gregtech/common/covers/CoverBehaviors.java @@ -52,12 +52,19 @@ public static void init() { registerBehavior(33, new ResourceLocation(GTValues.MODID, "shutter"), MetaItems.COVER_SHUTTER, CoverShutter::new); registerBehavior(34, new ResourceLocation(GTValues.MODID, "solar_panel.basic"), MetaItems.COVER_SOLAR_PANEL, (tile, side) -> new CoverSolarPanel(tile, side, 1)); - registerBehavior(35, new ResourceLocation(GTValues.MODID, "solar_panel.ulv"), MetaItems.COVER_SOLAR_PANEL_ULV, (tile, side) -> new CoverSolarPanel(tile, side, 8)); - registerBehavior(36, new ResourceLocation(GTValues.MODID, "solar_panel.lv"), MetaItems.COVER_SOLAR_PANEL_LV, (tile, side) -> new CoverSolarPanel(tile, side, 32)); + registerBehavior(35, new ResourceLocation(GTValues.MODID, "solar_panel.ulv"), MetaItems.COVER_SOLAR_PANEL_ULV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[0])); + registerBehavior(36, new ResourceLocation(GTValues.MODID, "solar_panel.lv"), MetaItems.COVER_SOLAR_PANEL_LV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[1])); + registerBehavior(37, new ResourceLocation(GTValues.MODID, "solar_panel.mv"), MetaItems.COVER_SOLAR_PANEL_MV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[2])); + registerBehavior(38, new ResourceLocation(GTValues.MODID, "solar_panel.hv"), MetaItems.COVER_SOLAR_PANEL_HV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[3])); + registerBehavior(39, new ResourceLocation(GTValues.MODID, "solar_panel.ev"), MetaItems.COVER_SOLAR_PANEL_EV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[4])); + registerBehavior(40, new ResourceLocation(GTValues.MODID, "solar_panel.iv"), MetaItems.COVER_SOLAR_PANEL_IV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[5])); + registerBehavior(41, new ResourceLocation(GTValues.MODID, "solar_panel.luv"), MetaItems.COVER_SOLAR_PANEL_LUV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[6])); + registerBehavior(42, new ResourceLocation(GTValues.MODID, "solar_panel.zpm"), MetaItems.COVER_SOLAR_PANEL_ZPM, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[7])); + registerBehavior(43, new ResourceLocation(GTValues.MODID, "solar_panel.uv"), MetaItems.COVER_SOLAR_PANEL_UV, (tile, side) -> new CoverSolarPanel(tile, side, GTValues.V[8])); - registerBehavior(37, new ResourceLocation(GTValues.MODID, "machine_controller"), MetaItems.COVER_MACHINE_CONTROLLER, CoverMachineController::new); - registerBehavior(38, new ResourceLocation(GTValues.MODID, "smart_filter"), MetaItems.SMART_FILTER, (tile, side) -> new CoverItemFilter(tile, side, "cover.smart_item_filter.title", Textures.SMART_FILTER_FILTER_OVERLAY, new SmartItemFilter())); - registerBehavior(39, new ResourceLocation(GTValues.MODID, "facade"), MetaItems.COVER_FACADE, CoverFacade::new); + registerBehavior(45, new ResourceLocation(GTValues.MODID, "machine_controller"), MetaItems.COVER_MACHINE_CONTROLLER, CoverMachineController::new); + registerBehavior(46, new ResourceLocation(GTValues.MODID, "smart_filter"), MetaItems.SMART_FILTER, (tile, side) -> new CoverItemFilter(tile, side, "cover.smart_item_filter.title", Textures.SMART_FILTER_FILTER_OVERLAY, new SmartItemFilter())); + registerBehavior(47, new ResourceLocation(GTValues.MODID, "facade"), MetaItems.COVER_FACADE, CoverFacade::new); registerBehavior(49, new ResourceLocation(GTValues.MODID, "screen"), MetaItems.COVER_SCREEN, CoverScreen::new); registerBehavior(50, new ResourceLocation(GTValues.MODID, "energy_detector"), MetaItems.COVER_ENERGY_DETECTOR, CoverDetectorEnergy::new); @@ -72,16 +79,10 @@ public static void init() { String tierShortName = GTValues.VN[coverTier].toLowerCase(Locale.ROOT); registerBehavior(20 + i, new ResourceLocation(GTValues.MODID, "pump." + tierShortName), MetaItems.PUMPS[i], (tile, side) -> new CoverPump(tile, side, coverTier, throughput)); - registerBehavior(40 + i, new ResourceLocation(GTValues.MODID, "fluid.regulator." + tierShortName), MetaItems.FLUID_REGULATORS[i], (tile, side) -> new CoverFluidRegulator(tile, side, coverTier, throughput)); + registerBehavior(60 + i, new ResourceLocation(GTValues.MODID, "fluid.regulator." + tierShortName), MetaItems.FLUID_REGULATORS[i], (tile, side) -> new CoverFluidRegulator(tile, side, coverTier, throughput)); } - registerBehavior(55, new ResourceLocation(GTValues.MODID, "solar_panel.mv"), MetaItems.COVER_SOLAR_PANEL_MV, (tile, side) -> new CoverSolarPanel(tile, side, 128)); - registerBehavior(56, new ResourceLocation(GTValues.MODID, "solar_panel.hv"), MetaItems.COVER_SOLAR_PANEL_HV, (tile, side) -> new CoverSolarPanel(tile, side, 512)); - registerBehavior(57, new ResourceLocation(GTValues.MODID, "solar_panel.ev"), MetaItems.COVER_SOLAR_PANEL_EV, (tile, side) -> new CoverSolarPanel(tile, side, 2048)); - registerBehavior(58, new ResourceLocation(GTValues.MODID, "solar_panel.iv"), MetaItems.COVER_SOLAR_PANEL_IV, (tile, side) -> new CoverSolarPanel(tile, side, 8192)); - registerBehavior(59, new ResourceLocation(GTValues.MODID, "solar_panel.luv"), MetaItems.COVER_SOLAR_PANEL_LUV, (tile, side) -> new CoverSolarPanel(tile, side, 32768)); - registerBehavior(60, new ResourceLocation(GTValues.MODID, "solar_panel.zpm"), MetaItems.COVER_SOLAR_PANEL_ZPM, (tile, side) -> new CoverSolarPanel(tile, side, 131072)); - registerBehavior(61, new ResourceLocation(GTValues.MODID, "solar_panel.uv"), MetaItems.COVER_SOLAR_PANEL_UV, (tile, side) -> new CoverSolarPanel(tile, side, 524288)); + } diff --git a/src/main/java/gregtech/common/covers/CoverSolarPanel.java b/src/main/java/gregtech/common/covers/CoverSolarPanel.java index 24fa942c689..129a7f3ce38 100644 --- a/src/main/java/gregtech/common/covers/CoverSolarPanel.java +++ b/src/main/java/gregtech/common/covers/CoverSolarPanel.java @@ -23,9 +23,9 @@ public class CoverSolarPanel extends CoverBehavior implements ITickable { - private final int EUt; + private final long EUt; - public CoverSolarPanel(ICoverable coverHolder, EnumFacing attachedSide, int EUt) { + public CoverSolarPanel(ICoverable coverHolder, EnumFacing attachedSide, long EUt) { super(coverHolder, attachedSide); this.EUt = EUt; } diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 8df33f80ba1..e5db93be2b7 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -25,7 +25,6 @@ import static gregtech.api.util.DyeUtil.getOredictColorName; import static gregtech.common.items.MetaItems.*; -import static gregtech.common.items.MetaItems.COVER_SOLAR_PANEL_UV; public class MetaItem1 extends StandardMetaItem { From 952fefce61f810ec386e3d87b32fcb6ec98d9c25 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 4 Sep 2021 17:39:04 -0500 Subject: [PATCH 3/4] add config for IV+ solars --- src/main/java/gregtech/common/ConfigHolder.java | 4 ++++ src/main/java/gregtech/common/items/MetaItem1.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java index 3bbb9b14429..8dc76d5140f 100644 --- a/src/main/java/gregtech/common/ConfigHolder.java +++ b/src/main/java/gregtech/common/ConfigHolder.java @@ -251,6 +251,10 @@ public static class GT5U { @Config.Comment("Whether to enable maintenance or not. Default: false") @Config.RequiresMcRestart public boolean enableMaintenance = true; + + @Config.Comment("Enable High-Tier solar panels (IV-UV). Default: false") + @Config.RequiresMcRestart + public boolean enableHighTierSolars = false; } public static class GT6 { diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index e5db93be2b7..70cdac30046 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -16,6 +16,7 @@ import gregtech.api.unification.stack.ItemMaterialInfo; import gregtech.api.unification.stack.MaterialStack; import gregtech.api.util.RandomPotionEffect; +import gregtech.common.ConfigHolder; import gregtech.common.items.behaviors.*; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; @@ -320,6 +321,13 @@ public void registerSubItems() { COVER_SOLAR_PANEL_ZPM = addItem(339, "cover.solar.panel.zpm"); COVER_SOLAR_PANEL_UV = addItem(340, "cover.solar.panel.uv"); + if (!ConfigHolder.U.GT5u.enableHighTierSolars) { + COVER_SOLAR_PANEL_IV.setInvisible(); + COVER_SOLAR_PANEL_LUV.setInvisible(); + COVER_SOLAR_PANEL_ZPM.setInvisible(); + COVER_SOLAR_PANEL_UV.setInvisible(); + } + // Early Game Brick Related: ID 347-360 IItemContainerItemProvider selfContainerItemProvider = itemStack -> itemStack; WOODEN_FORM_EMPTY = addItem(347, "wooden_form.empty"); From 4d4e2b351ad8ce31c3f7ee4c7af9a0723ce64f39 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 4 Sep 2021 17:49:31 -0500 Subject: [PATCH 4/4] last touches --- src/main/java/gregtech/common/ConfigHolder.java | 2 +- src/main/java/gregtech/common/items/MetaItem1.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java index 8dc76d5140f..faf33d6c53d 100644 --- a/src/main/java/gregtech/common/ConfigHolder.java +++ b/src/main/java/gregtech/common/ConfigHolder.java @@ -252,7 +252,7 @@ public static class GT5U { @Config.RequiresMcRestart public boolean enableMaintenance = true; - @Config.Comment("Enable High-Tier solar panels (IV-UV). Default: false") + @Config.Comment("Enable High-Tier solar panels (IV-UV). They will not have recipes. Default: false") @Config.RequiresMcRestart public boolean enableHighTierSolars = false; } diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 70cdac30046..4c362660d02 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -320,6 +320,7 @@ public void registerSubItems() { COVER_SOLAR_PANEL_LUV = addItem(338, "cover.solar.panel.luv"); COVER_SOLAR_PANEL_ZPM = addItem(339, "cover.solar.panel.zpm"); COVER_SOLAR_PANEL_UV = addItem(340, "cover.solar.panel.uv"); + // MAX-tier solar panel? if (!ConfigHolder.U.GT5u.enableHighTierSolars) { COVER_SOLAR_PANEL_IV.setInvisible();