From c607243491e19111ae93d98696a86177f20dd2fe Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:04:12 +0300 Subject: [PATCH 01/16] add battery --- src/main/java/gregtech/api/enums/ItemList.java | 1 + .../common/items/GT_MetaGenerated_Item_01.java | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 51aa28c1..e9c26962 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,6 +628,7 @@ public enum ItemList implements IItemContainer { MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV, Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, + Energy_Module, Maximum_Battery, ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 8f491ac5..23f8d9d0 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -438,17 +438,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0]), null, 1600, 2); GT_Values.RA.addCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0]), null, 1600, 2); - ItemList.Energy_LapotronicOrb.set(addItem(tLastID = 597, "Lapotronic Energy Orb", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + ItemList.Energy_LapotronicOrb.set(addItem(tLastID = 597, "Lapotronic Energy Orb", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); setElectricStats(32000 + tLastID, 100000000L, GT_Values.V[5], 5L, -3L, true); - ItemList.ZPM.set(addItem(tLastID = 598, "Zero Point Module", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + ItemList.ZPM.set(addItem(tLastID = 598, "Zero Point Module", "Single use battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); setElectricStats(32000 + tLastID, 2000000000000L, GT_Values.V[7], 7L, -2L, true); - ItemList.Energy_LapotronicOrb2.set(addItem(tLastID = 599, "Lapotronic Energy Orb Cluster", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + ItemList.Energy_LapotronicOrb2.set(addItem(tLastID = 599, "Lapotronic Energy Orb Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); setElectricStats(32000 + tLastID, 1000000000L, GT_Values.V[6], 6L, -3L, true); - ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); - setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true); + ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)})); ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)})); @@ -770,6 +769,14 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GregTech_API.registerCover(ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)}), new GT_Cover_NeedMaintainance()); GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_MV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), 600, 24); + ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); + + ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), OrePrefixes.battery.get(Materials.Ultimate)})); + setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); + + ItemList.Maximum_Battery.set(addItem(tLastID = 737, "Maximum Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[9], 9L, -3L, true); } From 733d77481757b6b1619408ea6f4766f770b45419 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:07:31 +0300 Subject: [PATCH 02/16] add icon battery --- .../textures/items/gt.metaitem.01/736.png | Bin 0 -> 330 bytes .../textures/items/gt.metaitem.01/736/1.png | Bin 0 -> 328 bytes .../textures/items/gt.metaitem.01/736/2.png | Bin 0 -> 322 bytes .../textures/items/gt.metaitem.01/736/3.png | Bin 0 -> 323 bytes .../textures/items/gt.metaitem.01/736/4.png | Bin 0 -> 319 bytes .../textures/items/gt.metaitem.01/736/5.png | Bin 0 -> 322 bytes .../textures/items/gt.metaitem.01/736/6.png | Bin 0 -> 322 bytes .../textures/items/gt.metaitem.01/736/7.png | Bin 0 -> 330 bytes .../textures/items/gt.metaitem.01/736/8.png | Bin 0 -> 330 bytes .../textures/items/gt.metaitem.01/737.png | Bin 0 -> 2312 bytes .../textures/items/gt.metaitem.01/737/1.png | Bin 0 -> 2361 bytes .../textures/items/gt.metaitem.01/737/2.png | Bin 0 -> 2374 bytes .../textures/items/gt.metaitem.01/737/3.png | Bin 0 -> 2359 bytes .../textures/items/gt.metaitem.01/737/4.png | Bin 0 -> 2360 bytes .../textures/items/gt.metaitem.01/737/5.png | Bin 0 -> 2350 bytes .../textures/items/gt.metaitem.01/737/6.png | Bin 0 -> 2378 bytes .../textures/items/gt.metaitem.01/737/7.png | Bin 0 -> 2305 bytes .../textures/items/gt.metaitem.01/737/8.png | Bin 0 -> 2312 bytes 18 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png new file mode 100644 index 0000000000000000000000000000000000000000..e58b3c13836d437ff2c5c6ddacd263d581fc5a27 GIT binary patch literal 330 zcmV-Q0k!^#P)L51tX)V1i!jjO=a*NtT4hR`n1l&JI3H#- z+iw8ot2Nu7UjQENZhR6E!TbkzH9R~3U_6;dEsC{Pgl}cSaNZB+U)1GtaC<1<4s%&0P}SFSR@UDhXLN+H`;(}e)pb`L9NasI`T*AY2I+#01hJ9p@(8BYJ`rmh3nidUx~nb;BKQKX z#j)dVcCGF&cjx=}pJ5hyO02cfVP%T=5P1E0mjD)FCk4+QpOUXtrm&HTpTLI?2M4U% z4FHQ}L;Lv!z~p+QNkjzmAH1!>{vH6saUHZM*4iZOUUyn78-O6moBa^u7j47S>5Q9t z4nUb_K@z9HVBKy4xLI}c@=ctP8r)yr?M4lQ!T`@Nt5iv6aCUqC?f2<=y&9b;Jb$=| z?wx`?DDzB<$~;pO2gBbGH34)Rc6xlICO(jY{aw%@rc8XLU`YIh$`p1ut|NmaEYklo a_0}(cN1qg9UUlmL0000U?-_!XKQ6)tAt?X55xpw6RTigNf19F z&mzn?lX+Hq%h@?+?i+TXW<*u9#nKh|A~0M{B!NZPvf%#U)jX|qg=UhtK@2yVyDX|D z0ORS5>iY+PyPK=fL_~1^!JBFBYy;5lbdwQ9RZZBR?lYdw0Fox}`XMgfv}3N(fC2h%b8E|5aCUqC70>Bsy}URI@Zj+@ z`)-cl>&227hQCWp1jE%tPL5lq#De30AvCZgaV!{&w@|u5+nsJEFkzAUkEwQk0WXG~ U)@oS@2mk;807*qoM6N<$f^BGv=>Px# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png new file mode 100644 index 0000000000000000000000000000000000000000..68d9520021d5070884ade32410e3b7f1342590a5 GIT binary patch literal 323 zcmV-J0lfZ+P)i1-15otaP2T*wIK62ZetDg6 zc{2fEXL~DY5|Rj}^(=v_kHxx{1W^>+o?dNc14D!X?(RRWEepZH`O%l2Gt7E?xDnx} z>rVFF93j-x5)H%OB_@KwypsLBT~lJg`d^3*EQyW+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png new file mode 100644 index 0000000000000000000000000000000000000000..97c49364111b61ef1b9f2198ada211d19c25ad5b GIT binary patch literal 319 zcmV-F0l@x=P)iWu#GD zg0B}!LKqI07zv8~N^Wm@ro@87f1zn$Ny1n#7;hnWnGS}dL}0=q?H^O?`~k(bo7Tii Ri7Eg9002ovPDHLkV1nPvi+BJ4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png new file mode 100644 index 0000000000000000000000000000000000000000..007d7ce4ec2c4b6fac52d22b503439df85781f70 GIT binary patch literal 322 zcmV-I0lof-P)8ZZWSL z0LIf9_18B5!^`v7L_~1^!K>+Rt^?5P50VkZdvC(w^pNp%29Pv)_mw!kX%%jMIy}5? z1F*lhn=}bY1oOH{;J0ddUs@7GQE-28x04MF5eB%vt*k9e!Rgi6hn_RcdUEg?;g_3@ z?7KNasHY_whQCWp1f#`7j*kvai3RI_AvUliIu;DZTPR)Od;LKsFkzAQkEwNj0ngu? U){5(F@c;k-07*qoM6N<$f_5l}eEwhI<(f{2Z6 zo<*2(CiATJma}ut+&An%%ZRFGi=`{_MW9+vC4oiQu;8cX7xT2z6`D!n1~J_2b(l8` z04DW}=JN}H+pCMvL_~1^!RzU5ZvoIB43iN>RZZBR?lY-p07;XvzKM%Bt;63xU0%mK z037V^B~5%1!Ms@{a8IJ-H2kLUEW9vyxJ`0jc$ z`)-cl>&227hQCWp1l4jXrzgjz#De30AvCZgaV!{&w@|u5`-5R7FkzAQkEwNj0U)fK U)+dyer2qf`07*qoM6N<$f`IajCIA2c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png new file mode 100644 index 0000000000000000000000000000000000000000..62327c4be8197346a66a8b37b967c070031d3d27 GIT binary patch literal 330 zcmV-Q0k!^#P)*CC0BVE%)f>g?|U&>sww7R5QI!oIrKbWs5$N#5MMnD|f=Uac+T zxdq_l_$W!@m0V(6b+xv9d~V0%xuw^wgNaW8V4iLs53`0LzyQyqN;|SOxVXRkiu?4v z_PTX|@2+;U{a_GJe8ku!hMVz&!DKU&^RrXcM1$kE5E5u6u{0QzzfhXO^#{YuK!rux cf2P*@1KnwyuW9RRP5=M^07*qoM6N<$f_d1M*#H0l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png new file mode 100644 index 0000000000000000000000000000000000000000..e58b3c13836d437ff2c5c6ddacd263d581fc5a27 GIT binary patch literal 330 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png new file mode 100644 index 0000000000000000000000000000000000000000..a7490e93c839f5f592af9d2530d4d9c78040716e GIT binary patch literal 2359 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 U(s$Z24*&oF07*qoM6N<$f(rV40RR91 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png new file mode 100644 index 0000000000000000000000000000000000000000..2757c27c4ac5a8e0acdc8f2f5f974e7e6c4ea0d5 GIT binary patch literal 2378 zcmV-Q3AOf#P)-4;n<-SN+Lmul1PyI0d`_JYBEXF$@FS zw()%*09lqvrBZZtb&<>E02YBOz~{gvA;k7$4QaJn-}U^pD2m=TP4m@Tw{Ee%zRu?6 zCXGgeD2k9I2_XbR2%;z=2m-<|#P@xK5ajcD1_uWj9UWzAYKlxI^C@sH9*=+eEdvb0 z=-dQB@Fwu~>gww0nVA_jHa3XI<0KLZlF1~pEF*+Kk|e?~1VEA`qA2PZ;&~peRtwv< zv27dIbvbnC5T{R{W^!`!GH@=F$^4~bK&@6IpU(?T(|%`J)^9Feyoj#rq*5tlStb^X zb=Hz3AxRPdQ51DNu*c_~5x(!^`+kQi+qN-HlaY}T&YnF>KA(R#pU?jm+M*I`YiqwU zP4nD^3l};Y8HRx*NyxGcK%r2etE;O6_P7y65zS_kN~HqO@rW$Tv|24BN#dP%-l145 z{<6Qn|GWgmf*^SN%u{{sk zwoNvh#dTfIpFfY|IKKvv-h1!8!;MB`TGKQDTCEmKOG}uhNf?GiQH0|-+_-V$TY!$^ ze5WBxOG`M8Lli}XVTf(p+`4rOS(Zs860EMSqG{T5w{PG6o+5-OR;yK-%_i}993cdw zqoXV>Ez#4{gQ6(7u1ld%=(zH~jW7)9?(SxFb(Lf?Nf?Gyt5rrvM?1oGU6)FwLOdSN zDVnAQhYufSeSIC*b;;#&6bc1;dU}u~2}Myly!*aS5Cl)u!0_y%0l@H`L8vRow=izRhkr`c>Ggdhk4(&;p*REjVRJAe<1?{PwWIIHfh_d?WlT@1sZ zQmJ5?7UgmoRaKM9M<0E(^8WkpW7{^>YL#?4O*|ea2m*uh(Hd7?Mh*P*oLKmQfUiWHO1Ws;H_;GMPkC6l7UORaH`{6j2mWuh*HMpJ#b_ z8GxmmOISk|nPHcDz25WThac`!CMPEkl*?rbwUbCc_=5YJ_t}}f&)C=)x~_Lb|}?#ow2bouC0BB`8+6j$bS74x~`MU z!Ws0;+Zk{*8mtlhvxQOScHFExy)0wV;p&Uns_{pBuT{M@y<#2cn-s` z^KN^4n}r*TEG^IB4MAA08*%-ooPZr~Y^PX9+EJpmjkPvDh` z=sW9Ft5qaPN-49mvv*&A{dFP<*4EY-m&f^Gc#LNHIvcsWti(XdfuC=0>v_XHhe$Xz#u~>{i39vnzMzg`f!UBtni@fs6E8Mwrht{Y`?F@7H(=@iWw$L<<>FH?}Hvf)(I)VZe?o83J8pyIdqBNV$ zu-R;4-br&>g_(n(ABxbcOUT#ZlbMS=Up~om&%8iaR~Lyyf=nhuKA$I($pCbE2gh+x zRh5m64X$6m%GK4+@uomOp+g>G5u7N2xtT)hvXCUn6$cL=;y8p1p9C4cKL z;Yxsjm;f&XN`MB*8gyBZksuRGwhizc>H)YaSOwZWb3eo+@FF0BoDV1U{X{FrSy@@x zJIo0Yi^ayr$H$iwi3FBqapcGmviUSx_XTd|9KMP}C_o5^1iL-deMNQ@;~Kp^b6v|aSW$Z3xw2eFru){ zzwi4blSx`p3(ISZ^2(KeGCMoV8*jY9+}s?V=aJ23v2FVtfD8nl=RL4(`=9Z6T;18( znOI+6XL53qQmMqizySUI{p{brpK7(r?CdP2Y0_*qF${~HdIMe8dGO!?tE;Q@_4P3@ zFo12_Y;0^WH#f)F*cjKZU&k;E5{bkgUDrKZE|+fr$f;B+@_oM*hT&$b)%pymg<)9S z-rnwQG#V@|E#bN@sZ@$=HjAcd6bc1;dwc2W=^>lVqA2Y$?l=y^!^7OWcaO`LFLUYA zC7R79)oPV646g-2@UCf^zjs|%-=j|K^>{%L2p|TiKo@XGlB73<5I+XS9`0~ru^8!e zntVRrDZ8d=;(1=DPuQK8fxm`f_@^j}z5+ZR`EL~8(O8IGYT`g*cTNK1z~S9_2uKSd w(z_cPfUyg56S%VrZqxp84TKQUBRBy38^93}{Cei0hyVZp07*qoM6N<$f~W<4>i_@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png new file mode 100644 index 0000000000000000000000000000000000000000..94b7336ed4e6fd5b13df3c7b379421d1116c6a93 GIT binary patch literal 2305 zcmV+c3I6tpP)Ty+_Xz&qhv57E|Fj?24`hK9p!A-1fF@7|Hi0K96$AkQ`3d_nz^lMX;055BX0wT^ zsu+fW<2V3Fl0-BbWnf@{R4N6q1Y83?11<}KQ2ka%I-Snrp1CxjEL?*HILOa5zjP5~KomuM-wzzIZJSP~ zgJBpLhJj^S96o%QQ>RWbH8phwIG0Ey{uVgUXf#Nt(?Ypi{=Kg2zrA?zB9%&oXf%o> zNrXb7U@eLwq9_93`+g9CKAwFi9LK?NoB%4rFwiuOv9U4Eo;^!Coqj)^PX7+Nq!QNF z)_$#N+PMoCE(D5HRYep$>k=x^xN8^9Y4Pl*{GdwEd7*Diw5HN7wb>RF8_T>!_+qxm*q+ z){mfJ7$lQPEX(5j`SX~j`5OT7gAYEKXti2L%jGfvolb{*K98npc%Fyv`vh`gHj1Jk z2m<5dx8zVL6sc4ywA*b2LBMrg;_*1qXcW)$0)xBB_iaSnT~+(*eu`R_ zg{rD-Z*QY%I<;DjSS%KiKl$X7J0E`dA%$(VnKr|W+j6Nv?b{p?I zU>HWg1x?c^l}aFVvr5AjBLm_j>G2WCRiZa)h;oeqnOi)6D|B9RDnks z3IzaWW@bnv5=5g>L{Y@H?Vv#Qi<0Mg*tU)9x`D%%WzlRlxq0&@g+hUBHcNgvkA6Uh zQD`=sLmz+q@l*2D)YQRRt;Wg5OZ@YPpR=*K!N&Xsxm=D)r4qmri^Zr`s}u?a5{U$n zNQ6)*1aymyX_~02%8?^S7#a>qGarlPPv@{rvzwi`oK<4;Ek> zXaHr9qhW?3sjg15iDOzI!`!Vo*aJKVoZ3Ya7oM&iA+wdGv{Ry9uOo_LRGy!ozx(>@ zuj7lbwzkHkG|7xN%fI6{SWVr95Z%@zy-S$@4i;OKAEEza)+S7}bIhpE(r&d`zPk)` zdk9U_?#LS(8#|_HYHP9ec;vo-BuUh&HJju`G*Y$Br?b{2tHCKR^;C?2e5r%gC~fBzDWP>$*5@_X-Y$Lb$SvVH>pCEpFbt z$)c)bis|e$)oPWI zkr6VP4B2d!R;#OU_l>BkYQXmU_wSR*WEdG4!LlsM<#LeLU+!F^exeRXVYWI=*ofjd z&R^wryY02xZ9=PYhyjOy!#??X9&W(Jxr>~vy~Oe7USMEgfN(fWB9S1SPLoI^0D|7Z zG)-c$80+in%-^`q=f%%p8Y;&sT@Lxc7RZ}X^Z^}F6fNP8-ZupOp4$zG7i|sS$+ieyX7x6r=Us>al z=Xr8C9DcglY)&>B4GtYTM61za&+=2enRt_zLN5|^1WIglPbBg6xi9_E%Yu{Ui@asN z#q$r2BYoi`I6ks0v$(j3<2cB&{Ku7*l}j?9*X#Aaq*AHZY};mOX^E++Ddy(pa2$t| zCr|RD^iTPT{}u`grfMR~GLc9G#BPIu*Tvs)93qhj9lwKa>+J08aP8U`%+JsB#v5<2 zu&{t_+a!}o48u4_?;Nge+Yb%H_(D;X*v`(*ky5F|)YKGPTU+egw~vvL5%%ugOTAua zetsTJ(`dKbXsXUmvqhy+;o-xF6pKYNnGE~(?ZYq(*4NirSXdyJ%W>nz4OCSn91j1< zvaGYUTJ08q6pcoG$8kEI=WTX6ovT2@^So@eS{-h+TIBP2EXyJqjgm|zDVNI(4h}Lr zJj~G05Xoc`S?*rrrfD)dI?BC!_qcN93YRZmrrmB+uh;QB?_aL#zOQN8A1uqN^br&K zJ)Y~j0^M2{0|tP@qA0#C2*Qtn-0lu16bccK$4RHt_`XlG*+kPcY}*d{gx*{L{_c6+ zpMBr|s>_bA|8Eo?(^v>SXcQpan;Ui|8@lW15rDfL00000NkvXXu0mjfXAWyx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png new file mode 100644 index 0000000000000000000000000000000000000000..4644bf59c81f649686af9c06d3c96ef7c7c69bd8 GIT binary patch literal 2312 zcmV+j3HSDiP)APC;nb^WDVw{B4? zl~`Y2r_pE-1OcKbA_xM4AP@urp6B8FKCbH`2mvJBnX0@BaY+H zYPB#;6Vo)YZJQ%Uj&S<)X(lEnt^(&1iNwb}2Wqt%>2z99RrODXVf^9JrAw5{Wunn2 zk|Yrdg?e*Q6cI%cfFKBZ5$NLCb;5OBT-WVEWtt|st}`++!nt$jNT<_pr_<>_LYq{= z%F4>`bX`Ax@#4kaMw+G}iXxIE0g%aL=-fG;5CmA3#m$>H zzhls{tOq)h&*!l$iy#Q_eIL^_xpnInk|Yrhhbb0|sH*zJ($dloWI+(J)oPVyvx%Z8 z2!g=q=qUMop8o!RWLd_xZ8DimFO>gHeBWp9-n|ryMIw<1zVB15Rv8@~?Ge|uZML_! zQ4}R5tE%c9J$jT$NH4djAI>e6UBJn3yvK zt}qJ+p?0hW10Ad?A{kY}vMh96x8)!RV%2JuN~OXJ$_sqje-{Re?OXobLY&N zGXx^6tgP@eX^f;l#mDg*kh%jQ+O0==*Jc8MjgNXC{U0#5fM$-@v`1++nk?Q~1lm1> zuIsnuwY9Y!%d+&P*lN7*8v#j@sBBeu{Ob(kl4gG*itJSK%|Ni^BJTfwpux&fe^BPSTmRFWJG<=Bb z*RNySHYZP>$R`oP$+~adzg+%quF47ex8Me z1zvpdMV6PB(MNTd0A1HpZ@lqFN*)*(IA|CKgT^zIfB8AZZ;BNEy~5<=B;|4$P1DF` zvt+YbHa9n!pPy&Xo;}23F~Z?6(5~%rfN zkw}nEr%5Cd0KMM9vMge;7^|zR%-p!n=f%%p63QpbZ4L#%Cgj$m7<~q!DB8l|!-ro= zrBYV_4jw$n42~Z^P9z=YqrDd)Wwje`;Q{&}2_B#=pdR7Z+h;Mh zo6OD4;ro8Kvc@If_vLUn{KI;^K31#MIDGgpTCKs}#XY>5c$KNpDZX+AV6A;3iEocx z?Mf#Luukz?>orboJc0B@fZztmvdrAv9Iopk%krO>mXb%^9w~$VmmuK1-InkB>#bJn8c_3nKfATHHPC1@$mjFewoNn|C7Dd3 zsw$aGhJk?r`uqDyCX>i=`x>__i{as6?%uu2)vH&za^(umW|L~Qitqbhd7k&SuIumE zwq5QbCUko|&+`P@wJrwq0Y^kpd|eQPp8~nv9Zo0|A|8*EPNxZifO@@-uIo6C)9VvD zV*&V^@B4oZg5c{8JHGY5QFuUOA#|WofN*Dw0As+>&Ug@r3xW{uY^VWR$H*eE+%ax; i^1u@WA-K;D0RI6dNZ;lCil;jO0000 Date: Sat, 8 Jul 2017 14:10:59 +0300 Subject: [PATCH 03/16] add recipe --- .../postload/GT_MachineRecipeLoader.java | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ea7781c7..d68f5ba8 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2129,22 +2129,57 @@ if(Loader.isModLoaded("Railcraft")){ }, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000); GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), + ItemList.Circuit_Wetwarecomputer.get(1,o), + ItemList.Circuit_Wetwarecomputer.get(1,o), + ItemList.Circuit_Wetwarecomputer.get(1,o), + ItemList.Circuit_Wetwarecomputer.get(1,o), ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), - ItemList.Field_Generator_UV.get(2,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(16,o), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + ItemList.Field_Generator_LuV.get(2,o), + ItemList.Circuit_Wafer_SoC2.get(64,o), + ItemList.Circuit_Wafer_SoC2.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(8,o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), }, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.ZPM2.get(1,o), 2000, 300000); - + GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.Energy_Module.get(1,o), 2000, 100000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1,o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Energy_Module.get(8L, new Object[0]), + ItemList.Field_Generator_ZPM.get(2,o), + ItemList.Circuit_Wafer_HPIC.get(64,o), + ItemList.Circuit_Wafer_HPIC.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(16,o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.ZPM2.get(1,o), 2000, 200000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.ZPM2.get(1,o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.ZPM2.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2,o), + ItemList.Circuit_Neuroprocessor.get(64,o), + ItemList.Circuit_Neuroprocessor.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(16,o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + Materials.Naquadria.getMolten(1152) + }, ItemList.Maximum_Battery.get(1,o), 2000, 300000); + GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ ItemList.Casing_Fusion_Coil.get(1,o), ItemList.Circuit_Quantummainframe.get(1,o), From 147101ff6cfb6bc2a0d8a46bad8aa77c943b7429 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:12:20 +0300 Subject: [PATCH 04/16] add achievements --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 8 +++++++- src/main/resources/assets/gregtech/lang/en_US.lang | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 7d560f0a..acd78f59 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -207,7 +207,9 @@ public class GT_Achievements { registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false); registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false); registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); - registerAchievement("whatnow", 4, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("whatnow", 10, 10, ItemList.ZPM2.get(1, new Object[]{}), "zpmage", false); + registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("whattheend", 12, 10, ItemList.Maximum_Battery.get(1, new Object[]{}), "whatnow", false); // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ // for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { @@ -597,6 +599,10 @@ public class GT_Achievements { issueAchievement(player, "filterregulate"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32605")) { issueAchievement(player, "whatnow"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) { + issueAchievement(player, "zpmage"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) { + issueAchievement(player, "whattheend"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32030")) { issueAchievement(player, "gtmonosilicon"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32036")) { diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 970e5fd0..7f8489d5 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -408,8 +408,12 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium +achievement.zpmage=Welcome to ZPM Energy Age +achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery +achievement.whattheend=The End? +achievement.whattheend.desc=Craft a Maximum Battery achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -490,6 +494,10 @@ achievement.gt.metaitem.01.32605=Ultimate Battery achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32609=Really Ultimate Battery achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32736=Energy Module +achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32737=Maximum Battery +achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI From 612cece6299ed698146d041d1277b52fa6e65df1 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sun, 9 Jul 2017 19:36:23 +0300 Subject: [PATCH 05/16] update change --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- .../common/items/GT_MetaGenerated_Item_01.java | 6 +++--- .../gregtech/loaders/misc/GT_Achievements.java | 6 +++--- .../postload/GT_MachineRecipeLoader.java | 8 ++++---- .../resources/assets/gregtech/lang/en_US.lang | 4 ++-- .../textures/items/gt.metaitem.01/737.png | Bin 2312 -> 319 bytes .../textures/items/gt.metaitem.01/737/1.png | Bin 2361 -> 325 bytes .../textures/items/gt.metaitem.01/737/2.png | Bin 2374 -> 317 bytes .../textures/items/gt.metaitem.01/737/3.png | Bin 2359 -> 313 bytes .../textures/items/gt.metaitem.01/737/4.png | Bin 2360 -> 310 bytes .../textures/items/gt.metaitem.01/737/5.png | Bin 2350 -> 313 bytes .../textures/items/gt.metaitem.01/737/6.png | Bin 2378 -> 315 bytes .../textures/items/gt.metaitem.01/737/7.png | Bin 2305 -> 321 bytes .../textures/items/gt.metaitem.01/737/8.png | Bin 2312 -> 319 bytes 14 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index e9c26962..6763328c 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,7 +628,7 @@ public enum ItemList implements IItemContainer { MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV, Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, - Energy_Module, Maximum_Battery, + Energy_Module, Energy_Cluster, ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 23f8d9d0..05f71ba2 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -772,11 +772,11 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); - ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), OrePrefixes.battery.get(Materials.Ultimate)})); + ItemList.Energy_Cluster.set(addItem(tLastID = 737, "Energy Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); - ItemList.Maximum_Battery.set(addItem(tLastID = 737, "Maximum Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); - setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[9], 9L, -3L, true); + ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true); } diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index acd78f59..2266673e 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -207,9 +207,9 @@ public class GT_Achievements { registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false); registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false); registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); - registerAchievement("whatnow", 10, 10, ItemList.ZPM2.get(1, new Object[]{}), "zpmage", false); registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); - registerAchievement("whattheend", 12, 10, ItemList.Maximum_Battery.get(1, new Object[]{}), "whatnow", false); + registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1, new Object[]{}), "zpmage", false); + registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1, new Object[]{}), "uvage", false); // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ // for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { @@ -602,7 +602,7 @@ public class GT_Achievements { } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) { issueAchievement(player, "zpmage"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) { - issueAchievement(player, "whattheend"); + issueAchievement(player, "uvage"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32030")) { issueAchievement(player, "gtmonosilicon"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32036")) { diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index d68f5ba8..101aaafe 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2160,15 +2160,15 @@ if(Loader.isModLoaded("Railcraft")){ }, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.ZPM2.get(1,o), 2000, 200000); + }, ItemList.Energy_Cluster.get(1,o), 2000, 200000); - GT_Values.RA.addAssemblylineRecipe(ItemList.ZPM2.get(1,o), 288000, new ItemStack[]{ + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1,o), 288000, new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.ZPM2.get(8L, new Object[0]), + ItemList.Energy_Cluster.get(8L, new Object[0]), ItemList.Field_Generator_UV.get(2,o), ItemList.Circuit_Neuroprocessor.get(64,o), ItemList.Circuit_Neuroprocessor.get(64,o), @@ -2178,7 +2178,7 @@ if(Loader.isModLoaded("Railcraft")){ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), Materials.Naquadria.getMolten(1152) - }, ItemList.Maximum_Battery.get(1,o), 2000, 300000); + }, ItemList.ZPM2.get(1,o), 2000, 300000); GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ ItemList.Casing_Fusion_Coil.get(1,o), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 7f8489d5..b5f598fe 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -412,8 +412,8 @@ achievement.zpmage=Welcome to ZPM Energy Age achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery -achievement.whattheend=The End? -achievement.whattheend.desc=Craft a Maximum Battery +achievement.uvage=Welcome to UV Energy Age +achievement.uvage.desc=Energy Cluster achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png index 4644bf59c81f649686af9c06d3c96ef7c7c69bd8..b1068d091c1bec1abc33b626608583b08870d43e 100644 GIT binary patch literal 319 zcmV-F0l@x=P)vng3-+Z&|LQjdR=9{JDn}BXrk~$HNJ@{=t_q&y%nTbtc;mh+gzINXLELLlp zpI-o8>&KWxL@54)yQ)r40GQO%WJFO_7Y^Nn7OOQtl7t;n*rG1nwgZ;U5P<8eizG=< za*4KU+Yb2L9PVq`3>j7XXcAHY6n8HVRW>k07~uV5APC;nb^WDVw{B4? zl~`Y2r_pE-1OcKbA_xM4AP@urp6B8FKCbH`2mvJBnX0@BaY+H zYPB#;6Vo)YZJQ%Uj&S<)X(lEnt^(&1iNwb}2Wqt%>2z99RrODXVf^9JrAw5{Wunn2 zk|Yrdg?e*Q6cI%cfFKBZ5$NLCb;5OBT-WVEWtt|st}`++!nt$jNT<_pr_<>_LYq{= z%F4>`bX`Ax@#4kaMw+G}iXxIE0g%aL=-fG;5CmA3#m$>H zzhls{tOq)h&*!l$iy#Q_eIL^_xpnInk|Yrhhbb0|sH*zJ($dloWI+(J)oPVyvx%Z8 z2!g=q=qUMop8o!RWLd_xZ8DimFO>gHeBWp9-n|ryMIw<1zVB15Rv8@~?Ge|uZML_! zQ4}R5tE%c9J$jT$NH4djAI>e6UBJn3yvK zt}qJ+p?0hW10Ad?A{kY}vMh96x8)!RV%2JuN~OXJ$_sqje-{Re?OXobLY&N zGXx^6tgP@eX^f;l#mDg*kh%jQ+O0==*Jc8MjgNXC{U0#5fM$-@v`1++nk?Q~1lm1> zuIsnuwY9Y!%d+&P*lN7*8v#j@sBBeu{Ob(kl4gG*itJSK%|Ni^BJTfwpux&fe^BPSTmRFWJG<=Bb z*RNySHYZP>$R`oP$+~adzg+%quF47ex8Me z1zvpdMV6PB(MNTd0A1HpZ@lqFN*)*(IA|CKgT^zIfB8AZZ;BNEy~5<=B;|4$P1DF` zvt+YbHa9n!pPy&Xo;}23F~Z?6(5~%rfN zkw}nEr%5Cd0KMM9vMge;7^|zR%-p!n=f%%p63QpbZ4L#%Cgj$m7<~q!DB8l|!-ro= zrBYV_4jw$n42~Z^P9z=YqrDd)Wwje`;Q{&}2_B#=pdR7Z+h;Mh zo6OD4;ro8Kvc@If_vLUn{KI;^K31#MIDGgpTCKs}#XY>5c$KNpDZX+AV6A;3iEocx z?Mf#Luukz?>orboJc0B@fZztmvdrAv9Iopk%krO>mXb%^9w~$VmmuK1-InkB>#bJn8c_3nKfATHHPC1@$mjFewoNn|C7Dd3 zsw$aGhJk?r`uqDyCX>i=`x>__i{as6?%uu2)vH&za^(umW|L~Qitqbhd7k&SuIumE zwq5QbCUko|&+`P@wJrwq0Y^kpd|eQPp8~nv9Zo0|A|8*EPNxZifO@@-uIo6C)9VvD zV*&V^@B4oZg5c{8JHGY5QFuUOA#|WofN*Dw0As+>&Ug@r3xW{uY^VWR$H*eE+%ax; i^1u@WA-K;D0RI6dNZ;lCil;jO0000@9+V3$mox3+y2Rol=XA>eiBo2)+N{eVrcl0T@-2phZ#DBvk(?Yw*wXJiKB$E(ArVK5k={@kWYT7##{habOB*X!N&nZeVyi|F1d z*n_gjt*9(=GjTBd4bc)nyJ6?Up_%wV3ifxwhL|$(m4YGh7bFuMRg=gd35#_9Or7-$ XVxgUEF=axd00000NkvXXu0mjfOoNcY literal 2361 zcmV-93C8w`P)0|sO{%Xpay8bD)7Wbg%AKJPk3)1a2_}VoCcn))oK`q zfomB3=R%*?AS3nx*p67L>vTYmFG#MBe;PU0m`7wL4m1NMC_3_}`?2Ai9k0G)`)vP`qtM3N-leDh86 z`TVbXdwZ`+K*aa`H?Cc~Mi2x+E(XguAqyBkT8P!y%3yXSfMzW+oI^!N9F%aj8H1Ngp=Wm)LD z&ieX8TCEnAWw}Zu5{c=$PNUI42!ZeWB$G+v@i;*cbO3jo@B56n`&8YT@1&^fx)_GR z=H@1*X;ChhNhA_6<^A{HUwr4Ccd%`nN~JDwZ^LZo0^E_5pS6N?Q=fsH<9UXTF?aq!zL4zRZ z7^R6mo8muNiV(hQqr=l%!|1e z3WWl-T8$tGh{xk35(#8kMo|=Eu^5R&fhmg6{PuC|tZU28#Rna(5XcZl!OMW1&tX3O1MJ>IR7{hFg$0t^c~7-k z<)9kSY&L7}zWc7J3=9mUT-QyW&)N7|lcjt2=s$Rnsi`Sk*X88NlW<@RF>(r9mT9$G zD2mc?J@Bn7I1-8A`#!d9Q?J*#efu^uGc%k!caD4a?s3#I8OzC-rkQ>1wb!yrPfyPQ z%d)5ro#xWqCoC0<+|WuKJ9Z3R*D(x(d_GS;pJ#o2o!hr>vuDp95{U%SXmr~Hu8U<^ zY;A3E{P=NtdwbC|jkUEkG)-e{Y>e{fAM=a4N4J3K{YNqDb!1r{P#TR!&}cOHQi_v1 zBp5A*95p;PW@niY@Wns=M)^lC^26s&kxr+HMx&%sDRQ|SsZi^W zk;ur%$jCx88pX0K#>dC$P9{0H_)qd*t`jxCAtLe3{IPdHy9c}GZW6R(y_AlgM{hJJ z6bhY_Rg$En90Y+9jYglT)oLTvYL(&PVJh`Hx6CN~{Fel0U%=~Ak>qt`-$(XA3byNc zc~?gODtK9N4yjas{380x7ny(dd2X!Rw89WYQ79A&c%Fx%D1V%vpTDL6R;5z;OE#N* zrPXRNGc&{J=qM8t6L_A-nKNf-jsFb$)CE*k#c`a@U7)lJ46m)f=Xu0pF`CV0$CNj3 ze#YeFBo{AUWO{m(s zdwY56si&w^DojpJVwxt6MuUcBQLWd}b)AO~A5tt9*|%>WeSLk{w!Lk}>1l?BhPZX> z7KULEjYj|Ey6)w2xqJsej>qGn=XuQ_2v(cT=D&by5Cr*+jg6jqz0U0HEUxPkkH^Vm zGH9AcS63H3Jw0@HcazCvP!t8v^Kcx8{{DU*Jb1v38#lOq{W^_CgG!}B5CmWNzW9bWFg`i zo<*4PP3EQAznq=#oBs_vP&1;c`C=jYBA{E9WS22Okx{Y`11UWWwirf zx>&LP`32yue2Ps(gvK%WFs0$+tG@(KocGDsJ{_(}ja0bA2 z`yy!)k_eX7E`jHp{e4+U5Jka#|FM+~3=szS{@i$5_JYB~>)Os4W_`Z9itu=JlYMtb z2=%PQ!tj5Ii9ok1x1EkF@nHKe#0H+k#)H9m3sQ)7%U&jMVUhZesdoMV{#%?J1We21 P00000NkvXXu0mjf=x~lv literal 2374 zcmV-M3Ay%(P)rd>Laf#s-@>j!8ueZJNNMqN-3MNLEo3vFWC2r2Ge6r0qJp zD0GpAs+(+@mQC1|NHnb#*i$yjzHfT1R zgkgvzNeCejLJ)=_zV8zR0iNd}gdm&Ea`50mhKGlln3y1$OnwerR#o-$Zz#}iw>uBM z@4p4SyRx!!c4}&hwY4==RV5mY5{t!s^k|YrX0RWOD5r$z$5!ZEb90$`hF-;TO zwmEj}7-!F(Wqf@6I&e9eO#Y>#K)qfko6U++sq{O;Fn;sdXP;3nmx;&Y$g)f%66xGa zl7u8l0EA)K@xXpO_m%KG56|;Dp)ySqUDp{J8sgHWOJuXz_p{mTZ()~IVs&-(SGulW z{`AvNI|sGfZ6rxTmSq5Pxg4ofssr|2D-1(gtrpd46`U?!SL`f zi;Ii&^z@)83bt*N%jG(*{BJ7=0=m1qSy@>j7K;%C0kv9<;o;#9ac$eCTCJk0YDOuQ zO8)5RD8*tC+qTJMGUReOdU|@0Bnd@PI&t?r58wBn%Ynm(4}Xo6LqkLOzK>xTl*?td zwjSfUE{0*)N+c4AmCI#XtrkKEeBURLNDz<534)*l_%!*xi-=EG)&2YZ6t!)ecDqfr zT1D3lDwPVFrp1&`KKbO{haY~3X`0k(H4=#gs;c7qK0*lM@puRHc^U9D_`U+BX?D1v z>pI0^5g~T7$}o(((&px-sq1>P-&vSqe8yg!;Pfz1GPREV5ZDZRuuIqLx-_zHA z5!&D9`#xb9;y4b|)6=Z4uj6?h^?IFyVI9k|Di<$abfwo`do5uYM*7vf!=%&Z&Ye4i zVMw7+U~X=XMx#Lx1jOTUG)+U6WfVmr7K@>28k(jNi^WhB1zDESG>v#XP8fzX8V%;= z<|q^j04yyoa?CLpN!c_Sjh>G`{3K=zQDW-sbkg0xR>g3=25r*U6`M`LQ{WVBL_hEDK%NZ6ypttyZg1sZ=NoyuzX5 zYYY|dF(_a#0T7};n&n|(mURzwpsqqJ9Ve!B0bm(B*iDm&4fk(O(HnttF}T?GgqXex zYe&Xe4SU%s7OB;0NRkv+rl+UxU$}4q8CYFiMIIZ&JavNZ`oGCXfZZ8F*Y$hK`uh5gWm$TcwV8NW4UlD- za;3ukb{EG_zC$jRAX>XeqH>eiPK$^Ek^>?DX%8`wAe10b!PUS@chT-UiIW|r*3u~y z3MBjrnx;{&*BMF$IF8f!=%bHxWoT$9Y1?+<{Gk>>Ibd~pnZrkpFf%iQZQGnYd6IN~ z66wfk99hP7T@*#>upanY3ywr0_`Z*0nlzhD=I7^GSXkiPxpOQpFEj4yOm<7?x}JIa z?YA>ZZ*T9QVHh-eU*#9se{jFH!rvPYn3$NLTrSgYx5?-8qot+(Ce)(nk`}--CN^EX!QYw|0oSbBP?h7u2K0Q4!+x;R&vxzLrLrSaF z3Rv|G{ZesT9#@lw>kVHk&1xOagRf2g|b1 zG>x^jHD+gKDBk=hrsa;vk7#&=7DXD2@&>D<-&i z@7}&KCq*O@85i%m5*tC?nW?{`Ma51TX}`0IUR* z4)swy_;V_a7ISlRoysanQbG=bK#4}9FEkpBv3kAE(W6JH?KGLK#SlM!6aVBZxVZ>I zSwjL80dlw}1CRk(1|dNh1vdrefS^8khV37{N#VdLzIb5a1tE%}FgG`c=XofK@`t;3 z?_N~^qgJc^Ig`n}?z%1u3k!^ok25tjh39#kIdcYY>Mu^ zi;Rztv$eIwz`y|g{rwy`aDZB^#`N?wx~|h|wP@)Ejh!ata+$}EAG5NuLSJ7W0|Nt? zrnyVT*;z(LM!0qB7VUPMXf*mq+qN%NDwW#+ay%XnJ({we}e;{X5v diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png index a7490e93c839f5f592af9d2530d4d9c78040716e..2f25838028e9fcb666658d2857f15bc27af4c0d9 100644 GIT binary patch literal 313 zcmV-90mlA`P)CD|v!i3d+-Gyk+gG?Ul{7QVhbr>b`VES4+Q zKfeG>%IDZbL}(p@57Rz71)x_Bk`YB!T{xT`vRJMFk|xwh%WgV^Kjz=OzHI@x>0BjE zLJ~n$?-Ka)Ykyx>5=2q(FzmOpfg!>G^Y_ZzvKNdVU)FZcFzeI(MTDp0+w8kLLa1jY z7KZ;zOa!`7x$Aaai3i(%AvW+NHXaPlTaZGuR}M0P3yU;=OpWsglCqo}T~!8=00000 LNkvXXu0mjf+sc6> literal 2359 zcmV-73CQ+|P)RH9)G<&r4H_VDoK=bxMuBdM2FQQVMcS^j z3*s))xacNb)TmJ)UUXrgi4ixYYpIfHS+?Zp8H;a`&@_#{zCJRU48S7r1#lg>DhNX5v4*&=`%TYZi=yal!!TZ5T3TXlZH?{i zZCb4sQ4}GHB7z_w2m(KV{zG{|PNLa9{xwP~8aynOjG<#HKK(~u+y zMNxWlQ4|qH5r8O)dLHP;vulL!`}n@!3zcPA7>2>v*ccZsTp*jxzMIWve+3;<39GBC zKQ|2H;>RC<+}lXkbwp7_k|Y3fxg33ceLb+pwJ3^cx7*ZeHGrN+BuT<`T|`mjop;`0 zXlUqX!^6XuL_i6G;O#3{t`LSHilR^|m3pV`y1ZO2W11$WY4%R_Xg5t0UDqj2w;$akzBp61Hvs0ziE4z4sZQI@ua=D%>|62>gkOKz}u(Gm3JRTXgkjhN+)uv85pln&cIVv`bsPs> z*QwQN7=}r;S|yQ4#O04Z`sm*K@4t^_S=8%wlF1~hsuBbNf*_!2S`YL|8L%I`Yk*~0 zJuVoA!P?pyg3!q-(=_jjUw!qJWf(>)FKtq*)$o0v?d@#}g#xbY_T1<=4vypCd0tQX z_V=y`b=L(!Komu|u1ld%U~6j&-}h-W8XSz(v2DBh`s=TI@|iPdlBQ{W71k20I0L;$Ll1in}G!0P{@jS05P+d_9!?0&qmw1lj&}=qYSXf|rd6}W1A(o0o zj>#rR4+u1y&4CX;{IFl1nVC6StybAlzQ+%aUT34e#r1`4CMG5*m&?7dBoYZKl?uzt z%cN2%;_*0&q5vJSv27b&*O{K4W^iz@7t(UM%*4b5>kFT9b^s3K;f^{(xm+fb$sCny zwOWwR=lQZKprvCRjvRiRjVQMt@Q(lrpIxJI@)=G&{WPkoB8noas**?~di<~~i!cm( z|5Yj#ZZ9r!zc|Nu9G+DhpMlp-LpL!388%ZV zShw=*?yga<*AYcglM98ygLCK30kFEdiZnHab8wc7J5SzNL2)3LgafHZxo!hHooViy zG66yXYz3-)$7v|vVz=Gq!Gk+Mr-m>Lt^$jdLk%>DcKnbHhSje=nqnYZ40D;r54qbwSyxOeYf_b{ggMNy`vrlyu-u^6UlGCMm< zu0P3P^DhjxYiNFFBLG3zE1@29B}98*-P8*sa1>==z^i+^ov$WOgNIPoH$CL@TOh=3%5xaS#RUq^sQ0bd0>4UNNR zs2zQS74w{|JBdJgTZ<+cvT+cdBHelZQdniNEjr#N%;X*TpnVc6WFA;)~BI6bhU_ zf1bIyIXurJolav})pHPm z?01giT&Py7w*e$g(<0yZ-7pNdUDy2-XoO)nRH;-3TdfwwViCu2&@_#7I!&omBA3fC zI5^0_zyRrV8d;X{eIMJl866#EeSMv4*RFB(>Q&n9HuZX)Fbw}01i`z8Vf@B%oN|{p z!agw(00l?@eZX;16yFpC;fKJ){t8D?6q3m#*=&|5ifA^Q7>0r8dA*`#Z(Iic9ERcV zqbT|k@Ob3AQFyel^1;?JZ~CxpVI@12rY8nl5INE&{q&iRMJO^WfQH;h&a?CMGt4h1-u!HpKye<$BBR zcmm)vA67|3gvKrSTCInB0DAc-swk@J!r}Cw<$4PcC80nXcIX=Z{fFsSS^2s16eS6Y z3^v6ff`9%>*qQ{R%Ah|Pw35PHV1V!W${Q&SKHkSW+cR{1d(jG>O*_fHTOq`=CKiUv zB}N9iS9$GrT@w$sZ=p)ynOJ!+IDbJh(Oy1E3|v^G{%5MKGZrbD9N{{nHUIzs07*qo IM6N<$g0hN%c>n+a literal 2360 zcmV-83CH${P)sXeB z=Xn4~l0+;PBb7>#$z%X#fjhwGzzsnVcAg5P-EM!^``5!Te8(`1*XHKtSY2IZV`GD6 zvq>0+h@yxf2nd2e7>4-1PY?uno`)a^WV2Zg9XiCw$OtD-o+Oz}ehOSsRrS+v0nl~5 z`{4WjTfjR@OG_7S-@eV-+8U~=5{X2JMx#iQgdhlrqDT+~0EnVU7=~RSuItinx3Me> z%d&7BhoeW2a^b=SCMG6s0#}mBc0;dvgO=XFzMSr&$2Fg!fW<;$1JX0z{Qv)SK6hg8Dy^73yC z!?^OvC!cf;>AH?6ib#?KKrWXfl}dG;J*|adNUPPNQmFuRBO*x>?RFbc6nXdEcPSJK zzwYnvzbXQX@B8muzkZz{2v8J-QmNG4?Ow<=O~W)zOw;V{>d9`JCc3UuDwVns+l!!O zS)|ix9LM46)vMUH{aXO>{rBHL)@(LUl}aT5+U+*QViChI2!enx46$vS2M->6%b{)C z-wC8xEMnU>VHgqw0hVPkH#dhQNkk$MmX?+%l}azp&(9y01wklOt5sU97OJWu2m&J` zBNU58^7%ZnEaNy1xm>Or%Kz4aAfTtGhoz+@qR}Wp5KygF85tSr64!AYDwPVVs%GR; zspKC!c8t~4RUF45lgW_F<;dsrh@yxr%iX+to`>)I&*Z?+(9kzXIXpa!@B5ghiKc06 zZ*SqcE~aTZvZ5$aP19(#S_p!G@B1VY31YDrK@fBu?kC^Vh`3)>_vU*?)NveiU8hp1 zU>GLla+!EM9+f}-_~S<(eDDF5Wl^nGNhA`es*3OX2!cQ?7VA2F)(P0}d=G$SSzRs| zhQaFUDuU2CRi+5))N3B+)kg8zYcKMAr-f-n}=guWe(@ekgoQd6lhYuez zIy%b2!U6!3lanNqNn)`WqA23JZdai8L@5Y@F0eh~IgUfUUT0=zhJ}R%3WWl5#Ue+t zCc_7zUa#jr`skwr^2Ef%k#f0=);`NmCcj`!Tj$ooI-{ebXqwhdOFSNDXJ?0ng$0ty zB++OTMNxo`*x0s>uIn5>ew^Ok-fl`YO=EO)l&|JL<44CJcK{xl&!K4=nM~%0T&Yz2 zzP>&lZ;3?nGKcaWzs$oKg~`98V2lq4Y631NU~$q(d$^YjRMS9Z_}HBa|7_RG1xm8z5rY86RfrR zXf#%-R;!4j7?Y=_rdBRqya>SZ@-ou+IIeP+78lTDi=Mp5^%QUy(hKKynv| z_+JnWJVZbWcQNca6gtyD03WbL1xGrIuZ&Y`7%VI&@@eq=s7N({hY^J zOMJGp!pV~-(KHQR*C`YV6bc2lx3`&@nc={J1H|KTB9Tak1CE1fnlu^>PMYvm@d9uMeAK~aC6cC(2jNyBoh)e2gz7V}1&)L}R_2;)Nml}3>- z7vau7uTkDP$M=8m5~);*NF+isnIxOdl1wH6y0wFC+r;B>*4EazckeDM^Ph8i0A3u| z$frAm+%REHi;_y2h@$8SV`F2lWipu?0E2^rjOD&$P~AiZ1OY?=JRdfzP^v)L1j7YM z0wosj=zwM7wjr%TPZA0}aJUCV5rVMe*b8CJJIvhHB#$0F+S|+-K~a?P@$vD6NF;)3 znoLeklFKA0$bTm8P5XD_UyFC;E2|NiL z1)8z5G*g#YHDBak(;l85BFi%O@88GsJY-q^)BODWbr~?L)#_g}nau01>oPk#%f!S4 zw{PFZ^E}R6h+`M^{8#ivyYPG0Vs{}#tZ{PRdGYsR8j^k)u zQQapd0-ykKAO##1Me!{`5MBjF_g6TIqL4@=$Y!&IVMx7R$1n_B*XvP8f#5ZfaB@vO7kBap2hQI0z&JK}hTx)B%0h$wOdq*SSUK$JG}E eA$-CQ0RI8!yC-H6;|=Nn0000j_@pG zCU2aVYX5R}zHk0F>_E+ks^*J@>}cl8h*->cZjlkmY&{kTjt}8g|n;{Po-6X5*T)#<*hB#5Hm?)jmY4Ga+mn7ysMEhoXt{nO6Q8D_m5RuP`QUS!|h5kfsH zu`v8yVj|GJ%FSrxN<7&93$cMGvGHJV-hvdO<8qP-Tv(+3W2&7areT^KX0?xp00000 LNkvXXu0mjf&Q6TE literal 2350 zcmV+}3DNe6P)j}T~@(g2FobP+X5Q)Lkm303N*YNY%JU8LI7C@PzZGbrC|4PNx|j9%gK8j6;VGkw_%I0M4tb`o*^hXqwi$ z@jUN6;DeQwl`}IlGpw(#qpB+5aF|FWf-K7jA&?{q-}eEKB#9shdPE$@q0{MLnkJ@c zV%s(c4<6*qnKMjJPhSPjClZOj^$0W?4bthfD3waTHw@#qmo8nRTrLxhMv-NiP$<;9 zmLv&Dk^l&Tpl5+yf9{fST^HANd#*A~6J6IC9UbM|xpSn`>5tOs^zWc6DzUn{`fFX+ z&tJTFvA29{UXqrZ;RO(r5*Mg>L zl1wJCZJP@hE?`;KZvdo^KmK^4)oL9nl}Z3~Ivo}l7twVc-}ecE0L!wtef##e04>Y< zP9lqoi&&OL5Cr(Xk7=6RxpN0umI;T$tgNh1DwSSYUS9s5B814*>vh`gHma&3gkWrJ zjK#%81_lOD6b0M1$z(D;Q~tN%`#$~s{j9945Q#+aeV=;0&e+&kPq?;iQ>)cbRW+rQ zN+oY%VuH1`HEi1^l}eGxWEdD2K$0XBMd|t7bzMBqd#(mXMn?Wal%u1gc%Fx07?jIp zwzi(&I1Ywk*h(lAij>P`+U+(%2t3at9*+}^M)7^W2e?;!&l2L^th#%>8=|&tqiGto zS`A${s8*}QVzG$w`RAYC{p6ERFin$sy-qwHM^#lk&qD}7G#c%JJ}(0Hg6|SAO|z#3 zUDsJ#TSJI$R2hb`tUP}F*wl5sl}@iEH#QVp*JX2aldY{SjvYJJ^W!d|z0vVBsPFqd z;qFF3r_*76ex6(|MRliIF8dxP`gRV_kA44!SlQxVcWK8Hk;hKb&F!LNG_LSX=#!D`wd1$ zpxJB=eD>LAFDTQ~(+8^6D)q)|oc!@Wc(S>{joA$fg#zVrx#yNxEJmeLp;#=ENF<0v zB7{OApqp$g%R^y?r&_I|sy|_1;2{Iq74{9ozF`mq zX!;ya9?wy&L8}3!5=5h6B9RmTmes_xY-9!gb$f+r_OxS82BDkt5a-k<=Ea{ zqh7BgNm5jqot?e^_Sqi_G7IYcrRq zR$t@9iC5|C>mwWvlSm{;r_&@734mVjU|ANiSd8`cb#C6g!OF^4ym$y+K3*o3?z*V5 z1)G~u`uYqcNwUTG`1qTtRO$-A{{8zIIq)^P{1%b~LUgC^!`2p*OVDV5VSplm6pC~e z?pSm@h{qt4fou-)d61+XF$NI0uvOm2%H5Z_d-v|{VUCMXC^R`aIav&c!x)Ca(W6I6 zr{nbZU*v_9g{*c(Cy8$e1dgqv+F5F~HuLlI_`biJS>v+r`${+* z{(iIBoNP22jE|4gXtY>bdVxgZ7lcD6@m&FIAW0y}An&Y_v}f*#cgKN_b&`(tE{`9- z!q?XVTsJ^b6z1pWaa|WhQU18RynI;!jC#HPmsBeCmg6`qEG#fRJ7Nk_-bJ8dXcmg15Q#*PB!8zCbp7wTE|EwCf)0*ju)V#__3PJ|ot@>Kciv%cZVtzB zNG6k*rgvd*lXVGTNwX&T{h_)oTNpQ~1@ zw*lm6G#a?B+wpyWv(xE(2{e4)&s8dw!B(rq;^HE>b^gQn)UDy9$+jhC9o82DI^E?5B zfEdsR9F!#KJt4$Tfx_MnClm@1kH<-;(*!|4v)M$~bsWd(^$9y`5%|0B`+p9C-~r(9 z)PJM+j>balxJCuSJ8J}(1SWRY{Xkp@5#QNR1GF8GCE(r;xJmcN)e}MlPvHRYZ+6TO U(s$Z24*&oF07*qoM6N<$f(rV40RR91 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png index 2757c27c4ac5a8e0acdc8f2f5f974e7e6c4ea0d5..f6fadbe52258d421ab6a029e6404487113e4d6c1 100644 GIT binary patch literal 315 zcmV-B0mS}^P)uX@zJeu?;MI)460-?*Ld< zYc}6M0KAst*hEBVoq~_ky*LM8P)?E&MO9rmoF1~Q)&NNpYNTa19mBu-E8agl0NmeR zCrv^U!K&UR@JDsHFDnV6C>XvxcC&#Y!T__kFK^31FdaQ_?3`iNhr2q$^QU(9-5nv+ zvl0u#|0N~@-Kz9^Jy+tv_Fsq%Jc*45gYy=o5FM10OyI&I%^y?a`~mNQnj8Z-4;n<-SN+Lmul1PyI0d`_JYBEXF$@FS zw()%*09lqvrBZZtb&<>E02YBOz~{gvA;k7$4QaJn-}U^pD2m=TP4m@Tw{Ee%zRu?6 zCXGgeD2k9I2_XbR2%;z=2m-<|#P@xK5ajcD1_uWj9UWzAYKlxI^C@sH9*=+eEdvb0 z=-dQB@Fwu~>gww0nVA_jHa3XI<0KLZlF1~pEF*+Kk|e?~1VEA`qA2PZ;&~peRtwv< zv27dIbvbnC5T{R{W^!`!GH@=F$^4~bK&@6IpU(?T(|%`J)^9Feyoj#rq*5tlStb^X zb=Hz3AxRPdQ51DNu*c_~5x(!^`+kQi+qN-HlaY}T&YnF>KA(R#pU?jm+M*I`YiqwU zP4nD^3l};Y8HRx*NyxGcK%r2etE;O6_P7y65zS_kN~HqO@rW$Tv|24BN#dP%-l145 z{<6Qn|GWgmf*^SN%u{{sk zwoNvh#dTfIpFfY|IKKvv-h1!8!;MB`TGKQDTCEmKOG}uhNf?GiQH0|-+_-V$TY!$^ ze5WBxOG`M8Lli}XVTf(p+`4rOS(Zs860EMSqG{T5w{PG6o+5-OR;yK-%_i}993cdw zqoXV>Ez#4{gQ6(7u1ld%=(zH~jW7)9?(SxFb(Lf?Nf?Gyt5rrvM?1oGU6)FwLOdSN zDVnAQhYufSeSIC*b;;#&6bc1;dU}u~2}Myly!*aS5Cl)u!0_y%0l@H`L8vRow=izRhkr`c>Ggdhk4(&;p*REjVRJAe<1?{PwWIIHfh_d?WlT@1sZ zQmJ5?7UgmoRaKM9M<0E(^8WkpW7{^>YL#?4O*|ea2m*uh(Hd7?Mh*P*oLKmQfUiWHO1Ws;H_;GMPkC6l7UORaH`{6j2mWuh*HMpJ#b_ z8GxmmOISk|nPHcDz25WThac`!CMPEkl*?rbwUbCc_=5YJ_t}}f&)C=)x~_Lb|}?#ow2bouC0BB`8+6j$bS74x~`MU z!Ws0;+Zk{*8mtlhvxQOScHFExy)0wV;p&Uns_{pBuT{M@y<#2cn-s` z^KN^4n}r*TEG^IB4MAA08*%-ooPZr~Y^PX9+EJpmjkPvDh` z=sW9Ft5qaPN-49mvv*&A{dFP<*4EY-m&f^Gc#LNHIvcsWti(XdfuC=0>v_XHhe$Xz#u~>{i39vnzMzg`f!UBtni@fs6E8Mwrht{Y`?F@7H(=@iWw$L<<>FH?}Hvf)(I)VZe?o83J8pyIdqBNV$ zu-R;4-br&>g_(n(ABxbcOUT#ZlbMS=Up~om&%8iaR~Lyyf=nhuKA$I($pCbE2gh+x zRh5m64X$6m%GK4+@uomOp+g>G5u7N2xtT)hvXCUn6$cL=;y8p1p9C4cKL z;Yxsjm;f&XN`MB*8gyBZksuRGwhizc>H)YaSOwZWb3eo+@FF0BoDV1U{X{FrSy@@x zJIo0Yi^ayr$H$iwi3FBqapcGmviUSx_XTd|9KMP}C_o5^1iL-deMNQ@;~Kp^b6v|aSW$Z3xw2eFru){ zzwi4blSx`p3(ISZ^2(KeGCMoV8*jY9+}s?V=aJ23v2FVtfD8nl=RL4(`=9Z6T;18( znOI+6XL53qQmMqizySUI{p{brpK7(r?CdP2Y0_*qF${~HdIMe8dGO!?tE;Q@_4P3@ zFo12_Y;0^WH#f)F*cjKZU&k;E5{bkgUDrKZE|+fr$f;B+@_oM*hT&$b)%pymg<)9S z-rnwQG#V@|E#bN@sZ@$=HjAcd6bc1;dwc2W=^>lVqA2Y$?l=y^!^7OWcaO`LFLUYA zC7R79)oPV646g-2@UCf^zjs|%-=j|K^>{%L2p|TiKo@XGlB73<5I+XS9`0~ru^8!e zntVRrDZ8d=;(1=DPuQK8fxm`f_@^j}z5+ZR`EL~8(O8IGYT`g*cTNK1z~S9_2uKSd w(z_cPfUyg56S%VrZqxp84TKQUBRBy38^93}{Cei0hyVZp07*qoM6N<$f~W<4>i_@% diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png index 94b7336ed4e6fd5b13df3c7b379421d1116c6a93..799981d620edf08a18b24d0813cb01ff93aeb5e1 100644 GIT binary patch literal 321 zcmV-H0lxl;P)3cHXZ34t6awt-Y* z5q6oo9jp7h-JS2Bf0kY7C{fjPvygNX(1S{&PK2HZ&#TJsR){7hHi3n2^J_NsHvr4^ zj{VOs0H5V+Od=v=|G{kyt}X$Xl+(tDqN*+&x(6-SJAg(KY9zBoZTNWVvsmQ-+~3_a zk_0s_(RMwa`h0EA{)<)4Xjn&+kOClk`gj>614D!X-m9%wayFPfzwPauVb;;Gj_~~P zA~}x+b`c_46AQQFM*}^mJdDS#i3i)a5EFPNRvrw_Uywp{Qce>C7Z&OMnL6tauYsER TiM0<+00000NkvXXu0mjf1$l)B literal 2305 zcmV+c3I6tpP)Ty+_Xz&qhv57E|Fj?24`hK9p!A-1fF@7|Hi0K96$AkQ`3d_nz^lMX;055BX0wT^ zsu+fW<2V3Fl0-BbWnf@{R4N6q1Y83?11<}KQ2ka%I-Snrp1CxjEL?*HILOa5zjP5~KomuM-wzzIZJSP~ zgJBpLhJj^S96o%QQ>RWbH8phwIG0Ey{uVgUXf#Nt(?Ypi{=Kg2zrA?zB9%&oXf%o> zNrXb7U@eLwq9_93`+g9CKAwFi9LK?NoB%4rFwiuOv9U4Eo;^!Coqj)^PX7+Nq!QNF z)_$#N+PMoCE(D5HRYep$>k=x^xN8^9Y4Pl*{GdwEd7*Diw5HN7wb>RF8_T>!_+qxm*q+ z){mfJ7$lQPEX(5j`SX~j`5OT7gAYEKXti2L%jGfvolb{*K98npc%Fyv`vh`gHj1Jk z2m<5dx8zVL6sc4ywA*b2LBMrg;_*1qXcW)$0)xBB_iaSnT~+(*eu`R_ zg{rD-Z*QY%I<;DjSS%KiKl$X7J0E`dA%$(VnKr|W+j6Nv?b{p?I zU>HWg1x?c^l}aFVvr5AjBLm_j>G2WCRiZa)h;oeqnOi)6D|B9RDnks z3IzaWW@bnv5=5g>L{Y@H?Vv#Qi<0Mg*tU)9x`D%%WzlRlxq0&@g+hUBHcNgvkA6Uh zQD`=sLmz+q@l*2D)YQRRt;Wg5OZ@YPpR=*K!N&Xsxm=D)r4qmri^Zr`s}u?a5{U$n zNQ6)*1aymyX_~02%8?^S7#a>qGarlPPv@{rvzwi`oK<4;Ek> zXaHr9qhW?3sjg15iDOzI!`!Vo*aJKVoZ3Ya7oM&iA+wdGv{Ry9uOo_LRGy!ozx(>@ zuj7lbwzkHkG|7xN%fI6{SWVr95Z%@zy-S$@4i;OKAEEza)+S7}bIhpE(r&d`zPk)` zdk9U_?#LS(8#|_HYHP9ec;vo-BuUh&HJju`G*Y$Br?b{2tHCKR^;C?2e5r%gC~fBzDWP>$*5@_X-Y$Lb$SvVH>pCEpFbt z$)c)bis|e$)oPWI zkr6VP4B2d!R;#OU_l>BkYQXmU_wSR*WEdG4!LlsM<#LeLU+!F^exeRXVYWI=*ofjd z&R^wryY02xZ9=PYhyjOy!#??X9&W(Jxr>~vy~Oe7USMEgfN(fWB9S1SPLoI^0D|7Z zG)-c$80+in%-^`q=f%%p8Y;&sT@Lxc7RZ}X^Z^}F6fNP8-ZupOp4$zG7i|sS$+ieyX7x6r=Us>al z=Xr8C9DcglY)&>B4GtYTM61za&+=2enRt_zLN5|^1WIglPbBg6xi9_E%Yu{Ui@asN z#q$r2BYoi`I6ks0v$(j3<2cB&{Ku7*l}j?9*X#Aaq*AHZY};mOX^E++Ddy(pa2$t| zCr|RD^iTPT{}u`grfMR~GLc9G#BPIu*Tvs)93qhj9lwKa>+J08aP8U`%+JsB#v5<2 zu&{t_+a!}o48u4_?;Nge+Yb%H_(D;X*v`(*ky5F|)YKGPTU+egw~vvL5%%ugOTAua zetsTJ(`dKbXsXUmvqhy+;o-xF6pKYNnGE~(?ZYq(*4NirSXdyJ%W>nz4OCSn91j1< zvaGYUTJ08q6pcoG$8kEI=WTX6ovT2@^So@eS{-h+TIBP2EXyJqjgm|zDVNI(4h}Lr zJj~G05Xoc`S?*rrrfD)dI?BC!_qcN93YRZmrrmB+uh;QB?_aL#zOQN8A1uqN^br&K zJ)Y~j0^M2{0|tP@qA0#C2*Qtn-0lu16bccK$4RHt_`XlG*+kPcY}*d{gx*{L{_c6+ zpMBr|s>_bA|8Eo?(^v>SXcQpan;Ui|8@lW15rDfL00000NkvXXu0mjfXAWyx diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png index 4644bf59c81f649686af9c06d3c96ef7c7c69bd8..b1068d091c1bec1abc33b626608583b08870d43e 100644 GIT binary patch literal 319 zcmV-F0l@x=P)vng3-+Z&|LQjdR=9{JDn}BXrk~$HNJ@{=t_q&y%nTbtc;mh+gzINXLELLlp zpI-o8>&KWxL@54)yQ)r40GQO%WJFO_7Y^Nn7OOQtl7t;n*rG1nwgZ;U5P<8eizG=< za*4KU+Yb2L9PVq`3>j7XXcAHY6n8HVRW>k07~uV5APC;nb^WDVw{B4? zl~`Y2r_pE-1OcKbA_xM4AP@urp6B8FKCbH`2mvJBnX0@BaY+H zYPB#;6Vo)YZJQ%Uj&S<)X(lEnt^(&1iNwb}2Wqt%>2z99RrODXVf^9JrAw5{Wunn2 zk|Yrdg?e*Q6cI%cfFKBZ5$NLCb;5OBT-WVEWtt|st}`++!nt$jNT<_pr_<>_LYq{= z%F4>`bX`Ax@#4kaMw+G}iXxIE0g%aL=-fG;5CmA3#m$>H zzhls{tOq)h&*!l$iy#Q_eIL^_xpnInk|Yrhhbb0|sH*zJ($dloWI+(J)oPVyvx%Z8 z2!g=q=qUMop8o!RWLd_xZ8DimFO>gHeBWp9-n|ryMIw<1zVB15Rv8@~?Ge|uZML_! zQ4}R5tE%c9J$jT$NH4djAI>e6UBJn3yvK zt}qJ+p?0hW10Ad?A{kY}vMh96x8)!RV%2JuN~OXJ$_sqje-{Re?OXobLY&N zGXx^6tgP@eX^f;l#mDg*kh%jQ+O0==*Jc8MjgNXC{U0#5fM$-@v`1++nk?Q~1lm1> zuIsnuwY9Y!%d+&P*lN7*8v#j@sBBeu{Ob(kl4gG*itJSK%|Ni^BJTfwpux&fe^BPSTmRFWJG<=Bb z*RNySHYZP>$R`oP$+~adzg+%quF47ex8Me z1zvpdMV6PB(MNTd0A1HpZ@lqFN*)*(IA|CKgT^zIfB8AZZ;BNEy~5<=B;|4$P1DF` zvt+YbHa9n!pPy&Xo;}23F~Z?6(5~%rfN zkw}nEr%5Cd0KMM9vMge;7^|zR%-p!n=f%%p63QpbZ4L#%Cgj$m7<~q!DB8l|!-ro= zrBYV_4jw$n42~Z^P9z=YqrDd)Wwje`;Q{&}2_B#=pdR7Z+h;Mh zo6OD4;ro8Kvc@If_vLUn{KI;^K31#MIDGgpTCKs}#XY>5c$KNpDZX+AV6A;3iEocx z?Mf#Luukz?>orboJc0B@fZztmvdrAv9Iopk%krO>mXb%^9w~$VmmuK1-InkB>#bJn8c_3nKfATHHPC1@$mjFewoNn|C7Dd3 zsw$aGhJk?r`uqDyCX>i=`x>__i{as6?%uu2)vH&za^(umW|L~Qitqbhd7k&SuIumE zwq5QbCUko|&+`P@wJrwq0Y^kpd|eQPp8~nv9Zo0|A|8*EPNxZifO@@-uIo6C)9VvD zV*&V^@B4oZg5c{8JHGY5QFuUOA#|WofN*Dw0As+>&Ug@r3xW{uY^VWR$H*eE+%ax; i^1u@WA-K;D0RI6dNZ;lCil;jO0000 Date: Mon, 17 Jul 2017 12:56:37 +0300 Subject: [PATCH 06/16] add config EnableZPMandUVBatteries default false --- .../items/GT_MetaGenerated_Item_01.java | 6 + .../loaders/misc/GT_Achievements.java | 4 + .../postload/GT_MachineRecipeLoader.java | 118 ++++++++++-------- .../resources/assets/gregtech/lang/en_US.lang | 6 +- 4 files changed, 79 insertions(+), 55 deletions(-) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 05f71ba2..75d911de 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -449,6 +449,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { + ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); + + ItemList.Energy_Cluster.set(addItem(tLastID = 737, "Energy Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); + ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)})); ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)})); ItemList.Electric_Motor_HV.set(addItem(tLastID = 602, "Electric Motor (HV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L)})); diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 2266673e..d2bf8a73 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -617,6 +617,10 @@ public class GT_Achievements { issueAchievement(player, "gtwetware"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32095")) { issueAchievement(player, "gtwetmain"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) { + issueAchievement(player, "zpmage"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) { + issueAchievement(player, "uvage"); } } else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) { issueAchievement(player, "newfuel"); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 101aaafe..fe7e0482 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2127,59 +2127,77 @@ if(Loader.isModLoaded("Railcraft")){ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(10000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000) }, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000); - - GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), - ItemList.Field_Generator_LuV.get(2,o), - ItemList.Circuit_Wafer_SoC2.get(64,o), - ItemList.Circuit_Wafer_SoC2.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(8,o), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), + + if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) { + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), + ItemList.Field_Generator_LuV.get(2, o), + ItemList.Circuit_Wafer_SoC2.get(64, o), + ItemList.Circuit_Wafer_SoC2.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(8, o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.Energy_Module.get(1,o), 2000, 100000); + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.Energy_Module.get(1, o), 2000, 100000); - GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Energy_Module.get(8L, new Object[0]), - ItemList.Field_Generator_ZPM.get(2,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(16,o), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.Energy_Cluster.get(1,o), 2000, 200000); - - GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Energy_Cluster.get(8L, new Object[0]), - ItemList.Field_Generator_UV.get(2,o), - ItemList.Circuit_Neuroprocessor.get(64,o), - ItemList.Circuit_Neuroprocessor.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(16,o), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), - Materials.Naquadria.getMolten(1152) - }, ItemList.ZPM2.get(1,o), 2000, 300000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Energy_Module.get(8L, new Object[0]), + ItemList.Field_Generator_ZPM.get(2, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(16, o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.Energy_Cluster.get(1, o), 2000, 200000); + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Energy_Cluster.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2, o), + ItemList.Circuit_Neuroprocessor.get(64, o), + ItemList.Circuit_Neuroprocessor.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(16, o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + Materials.Naquadria.getMolten(1152) + }, ItemList.ZPM2.get(1, o), 2000, 300000); + }else { + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(16, o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.ZPM2.get(1, o), 2000, 300000); + } GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ ItemList.Casing_Fusion_Coil.get(1,o), ItemList.Circuit_Quantummainframe.get(1,o), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index b5f598fe..08dba553 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -408,12 +408,8 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium -achievement.zpmage=Welcome to ZPM Energy Age -achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery -achievement.uvage=Welcome to UV Energy Age -achievement.uvage.desc=Energy Cluster achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -496,7 +492,7 @@ achievement.gt.metaitem.01.32609=Really Ultimate Battery achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32736=Energy Module achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32737=Maximum Battery +achievement.gt.metaitem.01.32737=Energy Cluster achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet From 848a57291a2145680e0a87f7178b416e03f1ffaa Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Sat, 22 Jul 2017 16:02:44 +0800 Subject: [PATCH 07/16] Correct description The cost is actually tripled at: https://github.com/Blood-Asp/GT5-Unofficial/blob/unstable/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java#L95 --- .../tileentities/automation/GT_MetaTileEntity_Regulator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java index aa2d6e73..cfb1b757 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java @@ -26,7 +26,7 @@ public class GT_MetaTileEntity_Regulator "Filters up to 9 different Items", "Allows Item-specific output stack size", "Allows Item-specific output slot", - "Consumes 1EU per moved Item"}); + "Consumes 3EU per moved Item"}); } public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) { From 2482504b5020741d2498cfa825b25c0caf6932b7 Mon Sep 17 00:00:00 2001 From: Dimach Date: Fri, 28 Jul 2017 16:12:40 +0300 Subject: [PATCH 08/16] Added new function to GT scanner - print voltage and amperage of electric cable at last second. --- src/main/java/gregtech/api/util/GT_Utility.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index ec4db394..acc5c9da 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -14,6 +14,7 @@ import gregtech.api.interfaces.IProjectileItem; import gregtech.api.interfaces.tileentity.*; import gregtech.api.items.GT_EnergyArmor_Item; import gregtech.api.items.GT_Generic_Item; +import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.net.GT_Packet_Sound; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.ItemData; @@ -1732,6 +1733,15 @@ public class GT_Utility { } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); } + try { + if (tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable) { + GT_MetaPipeEntity_Cable c = (GT_MetaPipeEntity_Cable) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); + tList.add("Max voltage last second " + c.mTransferredVoltageLast20); + tList.add("Max amperage last second " + c.mTransferredAmperageLast20); + } + } catch (Throwable e) { + if (D1) e.printStackTrace(GT_Log.err); + } try { if (tTileEntity instanceof IBasicEnergyContainer && ((IBasicEnergyContainer) tTileEntity).getEUCapacity() > 0) { tList.add(trans("179","Max IN: ") + ((IBasicEnergyContainer) tTileEntity).getInputVoltage() + trans("180"," EU")); From c09f6b5bdd47e51c3d5ec41d9947f1f94bfb0267 Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Wed, 16 Aug 2017 13:14:23 +0800 Subject: [PATCH 09/16] Fix Tooltip of Pump Add the missing bracket --- .../tileentities/machines/basic/GT_MetaTileEntity_Pump.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index 1cc9635f..c4fa8d73 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -34,7 +34,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { public Block mPumpedBlock2 = null; public GT_MetaTileEntity_Pump(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 3, new String[]{"The best way to empty Oceans!", "Pumping Area: " + (10 * ((int) Math.pow(1.6, aTier))) * 2 + 1 + "x" + (10 * ((int) Math.pow(1.6, aTier))) * 2 + 1}); + super(aID, aName, aNameRegional, aTier, 3, new String[]{"The best way to empty Oceans!", "Pumping Area: " + ((10 * ((int) Math.pow(1.6, aTier))) * 2 + 1) + "x" + ((10 * ((int) Math.pow(1.6, aTier))) * 2 + 1)}); } public GT_MetaTileEntity_Pump(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { From 4b36ca77be9997df93074353820ac6ec66af6643 Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Wed, 16 Aug 2017 16:23:08 +0800 Subject: [PATCH 10/16] Fix the Generated Item Pipes Correct the factor. --- .../gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index e88cc697..20898386 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1629,7 +1629,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 2, "GT_Pipe_" + displayName + "_Huge", "Huge " + displayName +" Item Pipe", 1.00F, aMaterial, baseInvSlots * 4, 8192 / baseInvSlots, aBoolConst_0).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveMedium.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 3, "GT_Pipe_Restrictive_" + displayName, "Restrictive " + displayName + " Item Pipe", 0.50F, aMaterial, baseInvSlots, 3276800 / baseInvSlots, true).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveLarge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 4, "GT_Pipe_Restrictive_" + displayName + "_Large","Large Restrictive " + displayName + " Item Pipe", 0.75F, aMaterial, baseInvSlots * 2, 1638400 / baseInvSlots, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveHuge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 5, "GT_Pipe_Restrictive_" + displayName + "_Huge", "Huge Restrictive " + displayName + " Item Pipe", 0.875F, aMaterial, baseInvSlots * 2, 819200 / baseInvSlots, true).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveHuge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 5, "GT_Pipe_Restrictive_" + displayName + "_Huge", "Huge Restrictive " + displayName + " Item Pipe", 0.875F, aMaterial, baseInvSlots * 4, 819200 / baseInvSlots, true).getStackForm(1L)); } From 6691f1e86c91aa524f40f01ba7406410728825fc Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Thu, 17 Aug 2017 14:51:45 +0800 Subject: [PATCH 11/16] Update GT_Cover_FluidRegulator.java Improve the screwdriver-rightclick behavior. --- .../java/gregtech/common/covers/GT_Cover_FluidRegulator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index fd8e1350..0e6d19eb 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -61,9 +61,9 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehavior { public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) { - aCoverVariable += 16; + aCoverVariable += aPlayer.isSneaking() ? 256 : 16; } else { - aCoverVariable -= 16; + aCoverVariable -= aPlayer.isSneaking() ? 256 : 16; } if (aCoverVariable > mTransferRate) { aCoverVariable = mTransferRate; From ec0767d4fd84c149baebf17c1fd0a405357e8b2d Mon Sep 17 00:00:00 2001 From: Techlone Date: Sat, 19 Aug 2017 03:17:14 +0500 Subject: [PATCH 12/16] Fix inconsistent worldgen --- .../gregtech/common/GT_Worldgenerator.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index 2b63f337..9036d1f6 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -47,11 +47,10 @@ public class GT_Worldgenerator implements IWorldGenerator { if (tempDimensionId != -1 && tempDimensionId != 1 && !aChunkGenerator.getClass().getName().contains("galacticraft")) { tempDimensionId = 0; } - new WorldGenContainer(new XSTR(aRandom.nextInt()), aX * 16, aZ * 16, tempDimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName).run(); + new WorldGenContainer(aX * 16, aZ * 16, tempDimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName).run(); } public static class WorldGenContainer implements Runnable { - public final Random mRandom; public int mX; public int mZ; public final int mDimensionType; @@ -61,8 +60,7 @@ public class GT_Worldgenerator implements IWorldGenerator { public final String mBiome; public static HashSet mGenerated = new HashSet<>(2000); - public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider, String aBiome) { - this.mRandom = aRandom; + public WorldGenContainer(int aX, int aZ, int aDimensionType, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider, String aBiome) { this.mX = aX; this.mZ = aZ; this.mDimensionType = aDimensionType; @@ -82,22 +80,35 @@ public class GT_Worldgenerator implements IWorldGenerator { return mWorld.checkChunksExist(xCenter - 16, 0, zCenter - 16, xCenter + 16, 0, zCenter + 16); } + public Random getRandom(int xChunk, int zChunk) { + long worldSeed = mWorld.getSeed(); + Random fmlRandom = new Random(worldSeed); + long xSeed = fmlRandom.nextLong() >> 2 + 1L; + long zSeed = fmlRandom.nextLong() >> 2 + 1L; + long chunkSeed = (xSeed * xChunk + zSeed * zChunk) ^ worldSeed; + fmlRandom.setSeed(chunkSeed); + return new XSTR(fmlRandom.nextInt()); + } + public void run() { - int xCenter = getVeinCenterCoordinate(mX >> 4) << 4; - int zCenter = getVeinCenterCoordinate(mZ >> 4) << 4; + int xCenter = getVeinCenterCoordinate(mX >> 4); + int zCenter = getVeinCenterCoordinate(mZ >> 4); + Random random = getRandom(xCenter, zCenter); + xCenter <<= 4; + zCenter <<= 4; ChunkCoordIntPair centerChunk = new ChunkCoordIntPair(xCenter, zCenter); - if (surroundingChunksLoaded(xCenter, zCenter) && !mGenerated.contains(centerChunk)) { + if (!mGenerated.contains(centerChunk) && surroundingChunksLoaded(xCenter, zCenter)) { mGenerated.add(centerChunk); if ((GT_Worldgen_GT_Ore_Layer.sWeight > 0) && (GT_Worldgen_GT_Ore_Layer.sList.size() > 0)) { boolean temp = true; int tRandomWeight; for (int i = 0; (i < 256) && (temp); i++) { - tRandomWeight = this.mRandom.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight); + tRandomWeight = random.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight); for (GT_Worldgen tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) { tRandomWeight -= ((GT_Worldgen_GT_Ore_Layer) tWorldGen).mWeight; if (tRandomWeight <= 0) { try { - if (tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, xCenter, zCenter, this.mChunkGenerator, this.mChunkProvider)) { + if (tWorldGen.executeWorldgen(this.mWorld, random, this.mBiome, this.mDimensionType, xCenter, zCenter, this.mChunkGenerator, this.mChunkProvider)) { temp = false; } break; @@ -114,7 +125,7 @@ public class GT_Worldgenerator implements IWorldGenerator { for (int tZ = zCenter - 16; j < 3; tZ += 16) { try { for (GT_Worldgen tWorldGen : GregTech_API.sWorldgenList) { - tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, tX, tZ, this.mChunkGenerator, this.mChunkProvider); + tWorldGen.executeWorldgen(this.mWorld, random, this.mBiome, this.mDimensionType, tX, tZ, this.mChunkGenerator, this.mChunkProvider); } } catch (Throwable e) { e.printStackTrace(GT_Log.err); @@ -139,7 +150,7 @@ public class GT_Worldgenerator implements IWorldGenerator { for (int i = 0; (i < 256) && (temp); i++) { tRandomWeight = aRandom.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight); for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) { - tRandomWeight -= ((GT_Worldgen_GT_Ore_Layer) tWorldGen).mWeight; + tRandomWeight -= tWorldGen.mWeight; if (tRandomWeight <= 0) { try { if ((tWorldGen.mEndAsteroid && tDimensionType == 1) || (tWorldGen.mAsteroid && tDimensionType == -30)) { From 4724bbe403fc5c608811300d1e337066667935bc Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Sat, 19 Aug 2017 12:08:34 +0800 Subject: [PATCH 13/16] Adding tooltip --- .../common/items/GT_MetaGenerated_Item_01.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 8f491ac5..018a8494 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -484,11 +484,11 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GregTech_API.registerCover(ItemList.Electric_Pump_ZPM.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[7][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)}), new GT_Cover_Pump(131072)); GregTech_API.registerCover(ItemList.Electric_Pump_UV.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)}), new GT_Cover_Pump(524288)); - ItemList.FluidRegulator_LV.set(addItem(tLastID = 615, "Fluid Regulator (LV)", "Configuable up to 640 L/sec (as Cover)", new Object[]{})); - ItemList.FluidRegulator_MV.set(addItem(tLastID = 616, "Fluid Regulator (MV)", "Configuable up to 2560 L/sec (as Cover)", new Object[]{})); - ItemList.FluidRegulator_HV.set(addItem(tLastID = 617, "Fluid Regulator (HV)", "Configuable up to 10240 L/sec (as Cover)", new Object[]{})); - ItemList.FluidRegulator_EV.set(addItem(tLastID = 618, "Fluid Regulator (EV)", "Configuable up to 40960 L/sec (as Cover)", new Object[]{})); - ItemList.FluidRegulator_IV.set(addItem(tLastID = 619, "Fluid Regulator (IV)", "Configuable up to 163840 L/sec (as Cover)", new Object[]{})); + ItemList.FluidRegulator_LV.set(addItem(tLastID = 615, "Fluid Regulator (LV)", "Configuable up to 640 L/sec (as Cover; rightclick/screwdriver-click/shift-screwdriver-click to adjust 1/16/256 per click.)", new Object[]{})); + ItemList.FluidRegulator_MV.set(addItem(tLastID = 616, "Fluid Regulator (MV)", "Configuable up to 2560 L/sec (as Cover; rightclick/screwdriver-click/shift-screwdriver-click to adjust 1/16/256 per click)", new Object[]{})); + ItemList.FluidRegulator_HV.set(addItem(tLastID = 617, "Fluid Regulator (HV)", "Configuable up to 10240 L/sec (as Cover; rightclick/screwdriver-click/shift-screwdriver-click to adjust 1/16/256 per click)", new Object[]{})); + ItemList.FluidRegulator_EV.set(addItem(tLastID = 618, "Fluid Regulator (EV)", "Configuable up to 40960 L/sec (as Cover; rightclick/screwdriver-click/shift-screwdriver-click to adjust 1/16/256 per click)", new Object[]{})); + ItemList.FluidRegulator_IV.set(addItem(tLastID = 619, "Fluid Regulator (IV)", "Configuable up to 163840 L/sec (as Cover; rightclick/screwdriver-click/shift-screwdriver-click to adjust 1/16/256 per click)", new Object[]{})); GregTech_API.registerCover(ItemList.FluidRegulator_LV.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)}), new GT_Cover_FluidRegulator(32)); GregTech_API.registerCover(ItemList.FluidRegulator_MV.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)}), new GT_Cover_FluidRegulator(128)); From d294ba97733726228aeb10c11290373bb5e3d9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Sat, 19 Aug 2017 11:46:52 +0200 Subject: [PATCH 14/16] Reduced the cost of Fluid Canners Circuits: 2 -> 1 Pumps: 2 -> 1 Glass: 2 -> 4 --- .../preload/GT_Loader_MetaTileEntities.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index e88cc697..7451bd47 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -792,14 +792,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { ItemList.Machine_ZPM_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(427, "basicmachine.chemicalreactor.tier.07", "Advanced Chemical Reactor VI", 7, "Letting Chemicals react with each other", GT_Recipe.GT_Recipe_Map.sChemicalRecipes, 2, 2, 16000, 0, 1, "ChemicalReactor.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(200)), aBoolConst_0, aBoolConst_0, 0, "CHEMICAL_REACTOR", new Object[]{"GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.pipeHuge.get(Materials.Plastic)}).getStackForm(1L)); ItemList.Machine_UV_ChemicalReactor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(428, "basicmachine.chemicalreactor.tier.08", "Advanced Chemical Reactor VII", 8, "Letting Chemicals react with each other", GT_Recipe.GT_Recipe_Map.sChemicalRecipes, 2, 2, 16000, 0, 1, "ChemicalReactor.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(200)), aBoolConst_0, aBoolConst_0, 0, "CHEMICAL_REACTOR", new Object[]{"GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.pipeHuge.get(Materials.Plastic)}).getStackForm(1L)); - ItemList.Machine_LV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(431, "basicmachine.fluidcanner.tier.01", "Basic Fluid Canner", 1, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 16000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_MV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(432, "basicmachine.fluidcanner.tier.02", "Advanced Fluid Canner", 2, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 32000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_HV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(433, "basicmachine.fluidcanner.tier.03", "Quick Fluid Canner", 3, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 48000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_EV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(434, "basicmachine.fluidcanner.tier.04", "Turbo Fluid Canner", 4, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 64000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_IV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(435, "basicmachine.fluidcanner.tier.05", "Instant Fluid Canner", 5, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_LuV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(436, "basicmachine.fluidcanner.tier.06", "Instant Fluid Canner", 6, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_ZPM_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(437, "basicmachine.fluidcanner.tier.07", "Instant Fluid Canner", 7, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_UV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(438, "basicmachine.fluidcanner.tier.08", "Instant Fluid Canner", 8, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_LV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(431, "basicmachine.fluidcanner.tier.01", "Basic Fluid Canner", 1, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 16000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_MV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(432, "basicmachine.fluidcanner.tier.02", "Advanced Fluid Canner", 2, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 32000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_HV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(433, "basicmachine.fluidcanner.tier.03", "Quick Fluid Canner", 3, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 48000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_EV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(434, "basicmachine.fluidcanner.tier.04", "Turbo Fluid Canner", 4, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 64000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_IV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(435, "basicmachine.fluidcanner.tier.05", "Instant Fluid Canner", 5, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_LuV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(436, "basicmachine.fluidcanner.tier.06", "Instant Fluid Canner", 6, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_ZPM_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(437, "basicmachine.fluidcanner.tier.07", "Instant Fluid Canner", 7, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_UV_FluidCanner.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(438, "basicmachine.fluidcanner.tier.08", "Instant Fluid Canner", 8, "Puts Fluids into and out of Containers", GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes, 1, 1, 80000, 0, 1, "FluidCanner.png", "", true, aBoolConst_0, 0, "FLUID_CANNER", new Object[]{"GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); ItemList.Machine_LV_RockBreaker.set(new GT_MetaTileEntity_RockBreaker(441, "basicmachine.rockbreaker.tier.01", "Basic Rock Breaker", 1).getStackForm(1L)); ItemList.Machine_MV_RockBreaker.set(new GT_MetaTileEntity_RockBreaker(442, "basicmachine.rockbreaker.tier.02", "Advanced Rock Breaker", 2).getStackForm(1L)); From 97fc717f9a69480beda609c4c7789027c89246bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Mon, 21 Aug 2017 08:42:24 +0200 Subject: [PATCH 15/16] Fixed LCM desulfurization recipes in combination with CirChemUpdateFU --- .../postload/GT_MachineRecipeLoader.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 484b3b1e..c49e4d9a 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -655,16 +655,16 @@ if(Loader.isModLoaded("Railcraft")){ GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.cell,Materials.SulfuricAcid, 1), null, null, null, new FluidStack(ItemList.sNitricAcid,1000), new FluidStack(ItemList.sNitrationMixture, 2000), ItemList.Cell_Empty.get(1, new Object[0]), 480, 2); GT_Values.RA.addChemicalRecipe(ItemList.GelledToluene.get(4, new Object[0]), GT_Values.NI, new FluidStack(ItemList.sNitrationMixture,500), Materials.DilutedSulfuricAcid.getFluid(500), GT_ModHandler.getIC2Item("industrialTnt", 1L), 80, 480); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(12), Materials.NatruralGas.getGas(16000), Materials.Gas.getGas(16000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 16L), GT_Utility.getIntegratedCircuit(12), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16L), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(12), Materials.SulfuricGas.getGas(16000), Materials.Gas.getGas(16000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 16L), GT_Utility.getIntegratedCircuit(12), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16L), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(12), Materials.SulfuricNaphtha.getFluid(12000), Materials.Naphtha.getFluid(12000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 12L), GT_Utility.getIntegratedCircuit(12), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 12L), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(12), Materials.SulfuricLightFuel.getFluid(12000), Materials.LightFuel.getFluid(12000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 12L), GT_Utility.getIntegratedCircuit(12), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 12L), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(12), Materials.SulfuricHeavyFuel.getFluid(8000), Materials.HeavyFuel.getFluid(8000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 8L), GT_Utility.getIntegratedCircuit(12), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 8L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(4), Materials.NatruralGas.getGas(16000), Materials.Gas.getGas(16000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 16L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricGas.getGas(16000), Materials.Gas.getGas(16000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 16L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricNaphtha.getFluid(12000), Materials.Naphtha.getFluid(12000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 12L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 12L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricLightFuel.getFluid(12000), Materials.LightFuel.getFluid(12000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 12L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 12L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricHeavyFuel.getFluid(8000), Materials.HeavyFuel.getFluid(8000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), Materials.Empty.getCells(1), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 8L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(2000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 8L), 160); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), null, Materials.Naphtha.getFluid(576), Materials.Polycaprolactam.getMolten(1296), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Potassium, 1), 640); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L), new ItemStack(Items.string, 32), 80, 48); From f94d61a3d27f34555c5ccc1171501e1b768be4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Mon, 21 Aug 2017 08:56:24 +0200 Subject: [PATCH 16/16] Fixed Large Chemical Reactor GUI, was wrongly using default before --- .../multi/GT_MetaTileEntity_LargeChemicalReactor.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index 393f5b81..52120d2e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -2,6 +2,7 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; +import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -10,6 +11,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -62,6 +64,11 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu } return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX] }; } + + @Override + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeChemicalReactor.png"); + } @Override public boolean isCorrectMachinePart(ItemStack aStack) {