From f5bfbd22dcc7a63583e0f67d8b01120d71cb2e9f Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 16 Jan 2022 21:39:41 +0100 Subject: [PATCH] post merge fixes --- .../java/com/hbm/hazard/HazardRegistry.java | 6 +++--- src/main/java/com/hbm/items/ModItems.java | 6 +++--- .../machine/TileEntityMachineRTG.java | 9 ++------- .../assets/hbm/textures/items/stamp_357.png | Bin 268 -> 988 bytes .../assets/hbm/textures/items/stamp_44.png | Bin 261 -> 999 bytes .../assets/hbm/textures/items/stamp_50.png | Bin 254 -> 987 bytes .../assets/hbm/textures/items/stamp_9.png | Bin 264 -> 1011 bytes 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 053cb62d2..713b26fad 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -21,17 +21,17 @@ import net.minecraft.item.ItemStack; public class HazardRegistry { //CO60 5a β− 030.00Rad/s Spicy - //SR90 29a β− 015.00Rad/s Spicy + //SR90 29a β− 015.00Rad/s Spicy //TC99 211,000a β− 002.75Rad/s Spicy //I181 192h β− 150.00Rad/s 2 much spice :( //XE135 9h β− aaaaaaaaaaaaaaaa //CS137 30a β− 020.00Rad/s Spicy //AU198 64h β− 500.00Rad/s 2 much spice :( - //PB209 3h β− 10,000.00Rad/s mama mia my face is melting off + //PB209 3h β− 10,000.00Rad/s mama mia my face is melting off //AT209 5h β+ like 2k or sth idk bruv //PO210 138d α 075.00Rad/s Spicy //RA226 1,600a α 007.50Rad/s - //AC227 22a β− 030.00Rad/s Spicy + //AC227 22a β− 030.00Rad/s Spicy //TH232 14,000,000,000a α 000.10Rad/s //U233 160,000a α 005.00Rad/s //U235 700,000,000a α 001.00Rad/s diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 2cf79d067..722e89253 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1,7 +1,7 @@ package com.hbm.items; import com.hbm.blocks.ModBlocks; -import com.hbm.config.MachineConfig; +import com.hbm.config.VersatileConfig; import com.hbm.handler.BucketHandler; import com.hbm.handler.ToolAbility; import com.hbm.handler.ToolAbility.LuckAbility; @@ -3076,8 +3076,8 @@ public class ModItems { pellet_rtg_polonium = new ItemRTGPellet(35).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); pellet_rtg_actinium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(21.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); pellet_rtg_strontium = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.ZIRCONIUM, (long) (RTGUtil.getLifespan(29.0F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_strontium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_strontium"); - pellet_rtg_lead = new ItemRTGPellet(MachineConfig.doRTGsDecay ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); - pellet_rtg_gold = new ItemRTGPellet(MachineConfig.doRTGsDecay ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); + pellet_rtg_lead = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); + pellet_rtg_gold = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); pellet_rtg_americium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium"); pellet_rtg_berkelium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_berkelium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_berkelium"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java index 7855414b9..8b93a37c0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -1,12 +1,7 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.config.MachineConfig; -import com.hbm.items.ModItems; +import com.hbm.config.VersatileConfig; import com.hbm.items.machine.ItemRTGPellet; -import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.util.RTGUtil; @@ -26,7 +21,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, private ItemStack slots[]; public int heat; - public final int heatMax = MachineConfig.doRTGsDecay ? 600 : 200; + public final int heatMax = VersatileConfig.rtgDecay() ? 600 : 200; public long power; public final long powerMax = 100000; diff --git a/src/main/resources/assets/hbm/textures/items/stamp_357.png b/src/main/resources/assets/hbm/textures/items/stamp_357.png index f87985878bba3685b870b643e8ad8808b083cd8e..c9d1ac4be242445ae9b0a8d7ea7c89078a47df26 100644 GIT binary patch literal 988 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2~Ij105p zNH8!kMrMXYltlRYSS9D@>LsS+C#C9DVstT4fPE4;bsH1+JHo@{EISEfi{E8 zw==W>t3(ll+GC>+vK+}V5TAlYfnK%aveAbJn;n457o~ovyhqKx4dxw{e_vc)*MU_IR9LDYZUMF)2u&h-E<|Z_Ap`rXBuSGp*D@X3@(}A7_)+?UuT`$wZy(Lu-hBJ*v|6;7G$IL!foH=lPqsM)FumluiG#FFKzQr-_WOgf*S<7KP=>B zWA1TNKJvJ5OO)=#_PIYVn-nQAl{xyS3HUGD@U|@aS+m_a&fY0s-skg%KKxr@vmtK% z(xp6$7W}P?FIi|dU#!#R-u|Wrr=Z%}r+V$rDs1*K*Z&HLocqTzHb+wZow*oayQ16!C*Ve&)@56Oyd1suw480ce^=JRF7rfUfJj zePav&^E`hN#9#}SMZt4fcF>iQU^mdtC0J|iI|zd$DC)os9%#qW>-#ZH-0B*DbzS!n zZ6Q|OLZX9|B=Aszloa@O!)meW+m}(P;FNXG!9RElF4SEgzJoBC(po32x=`3>}9a7FmgpcMcB002ovPDHLkV1le|XqNy0 diff --git a/src/main/resources/assets/hbm/textures/items/stamp_44.png b/src/main/resources/assets/hbm/textures/items/stamp_44.png index 17de2d75166a2e0d40a3f9d16311cdf000056088..7625978820d50b40464d59fca834e705e5ef6e7e 100644 GIT binary patch literal 999 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2~Ij105p zNH8!kMrMXYltlRYSS9D@>LsS+C#C9DVstT4fPE4;bsH1+JHo@{EISEfi{E8 zw==W>t3(ll+GC>+vK+}V5TAlYfnK%aveAbJn;n2@F>bm3+r4yU(8>oTR*JLF9(w%o!29ps%8Xu1g>I~#^tZ;Y z{q$2I#T*G9wiVZ3d#DH#qhgeI_YzzdO+6 zp`vu)&dZ{m347yCuZvl%^GtO0RjuB#-LV;)c1GwZ%|Czm^;fRlQES_r7An~Bv^)2> zDNpq64{;5=ckE`48PKhaC027cS>N(x+2k*U?su?}d+%s$EvBgU^t_|~k$6jos$fmmY*?!v)m+yb; zju-7@@lC#PA#T0;z6-O@bF?3R@1N+P{PJJ+ldSExkJjz47yoAx*y;CoPb|yB)|Fwa zf82Sx`&ocSOWAH-UlXa?V~;<+&$?%2FCPD&=YOx;;*abPHb01eW-@P$=K~y-6rISqxgD@0?KZ}=eSA>E) zp$qW>p4tnz60&k{4%e^+N85X8V9e@7?p7RR?@oo{yH%__$0000!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2~Ij105p zNH8!kMrMXYltlRYSS9D@>LsS+C#C9DVstT4fPE4;bsH1+JHo@{EISEfi{E8 zw==W>t3(ll+GC>+vK+}V5TAlYfnK%aveAbJn;nMt(C!Ah?GMB3&G8@T|llX86RAFK9W$S^6`8yBb}mS{B7K!WE% ziIpH%t3anqfY#In_uiYo`))16$F4WM`_1Ez5^u|-SB7{oefnwh>Z{eIms?nj9M^_1 zCyU-(AEy1|Z(U}KXyjYG^)4g-HM;9irWf{#sfArq# zuPU0+2}bvXTEzu-e&EuSW9GR~X*RpjeA4NsM`|o&T%=cD)#A*!vU38Xupy^>l8Kb( z{*x&}bN$%UHve3_$D&5J%XT7T{y~mslG?#H^0sS#c9hQVNbo-PJD<1oHp{Gg*`v;hj-D%6+1M; zR4ruKW}Q{rciH64ouB7LxL75v>asgs9?h>$=kmXHME}n*ndRr2SucRHkf*Dk%Q~lo FCID5>bH@Mx delta 225 zcmV<703QF_2mS$&C4X~5NmK|32nc)#WQYI&0JTX(K~y-6rISGl!yphve?l&iT?quT z6S@#D;HkZUH*gW~3L@jaU9>5hjEN<)9DU#Cpq*Hj7jD!508&bJ(HH{&&{`LLA_4$7 z=RN^7cmwBY!s`7G%&X^MZX?%=F_r;D1R{d9w$NU^$5RN_bXv&a7MlRjl-AQ3?+RegE;>K@~G b>pQ;zqUvKS^OOfd00000NkvXXu0mjf>q%eX diff --git a/src/main/resources/assets/hbm/textures/items/stamp_9.png b/src/main/resources/assets/hbm/textures/items/stamp_9.png index 11af6984b04108de5cae39cd78e057298b326158..c8d8e8028e9a36521bd369639913e81615127bf6 100644 GIT binary patch literal 1011 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2~Ij105p zNH8!kMrMXYltlRYSS9D@>LsS+C#C9DVstT4fPE4;bsH1+JHo@{EISEfi{E8 zw==W>t3(ll+GC>+vK+}V5TAlYfnK%aveAbJn;n#rAD%?;2HdGPtC00)c8M24$bqGv)+)@_V9 z@c5&LvX4Zs+mAngT#ROluXlan+%8*0HkGF5gHj&bpetOa2>(|AP zJ>Iy*w>QK!Fz%403|~!sJ@POVF`s=_rR{-_(d@GeE||22toT=BcRXwBBnG*F z$uCQ^{>80#pT5OmLxO<@kBbZ69;dG3EN5@LPcag7+C?PJ^a5aoK3bZSzDjI z!sGt;-?FEl3W@Z(IkGo5zHrLDrz_OCXWO9$r=Z&0XPNu&AFtbA&st_R_xi8eg+g=x zel8Vk;a8jM*S!Ay-XOdA_2-=}WZbsjZq*a(wiWI?((jzR`0L8Imf8P#{`aPB{>lEp i_CfqLk$Gz}_cPpFtEU|Srl(BC;_Od>Mv-TCIE(E_!?}f zZCe18QVtk&ASHBNw}SU9qt`m9Gsd_EQi8N*E0zlFbbwxK9%N++z&MWUa16G#VrzlK z4)$OPJTy21uLft+Y|TH$>A;7V`Mh%zv0r?q6Wj3c4E%I|o)}|-v^>vw*0r