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 f87985878..c9d1ac4be 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_357.png and b/src/main/resources/assets/hbm/textures/items/stamp_357.png differ 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 17de2d751..762597882 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_44.png and b/src/main/resources/assets/hbm/textures/items/stamp_44.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_50.png b/src/main/resources/assets/hbm/textures/items/stamp_50.png index 5192c5a46..212044422 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_50.png and b/src/main/resources/assets/hbm/textures/items/stamp_50.png differ 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 11af6984b..c8d8e8028 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_9.png and b/src/main/resources/assets/hbm/textures/items/stamp_9.png differ