From c9155b55ba41f7efb8b8939800f0945861b1a895 Mon Sep 17 00:00:00 2001 From: Boblet Date: Mon, 22 Sep 2025 11:32:20 +0200 Subject: [PATCH] maybe i should push before something breaks completely --- changelog | 8 +++++++- .../hbm/entity/train/EntityRailCarElectric.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 6 ------ .../com/hbm/items/special/ItemStarterKit.java | 17 ----------------- src/main/java/com/hbm/lib/Library.java | 2 -- src/main/java/com/hbm/main/MainRegistry.java | 2 ++ 6 files changed, 10 insertions(+), 27 deletions(-) diff --git a/changelog b/changelog index e636a3177..8cdfb58d0 100644 --- a/changelog +++ b/changelog @@ -11,7 +11,13 @@ * Gibbing NPCs now also spawns bones, if supported by the skeletonizer * Gibbed bones only have a 50% chance of spawning and come with a unique red texture * Gibbed bones have a way shorter lifetime and higher gravity to match the gib particles +* Updated the factory structure +* NBT based structures now have a config for the spawn weight, unlike the old structure configs, higher numbers make structures more frequent +* Mobs are no longer registered in the vanilla namespace +* Drills no longer clip through depth rock, depth rock now has to be cleared before bedrock ore becomes accessible +* When an area modifier is selected on a tool, an icon will now render next to the crosshair to make it obvious that the modifier is active ## Fixed * Fixed wood burner only being able to create one ash pile per item burned, even when that item yields more, creating a backlog in the internal ash value -* Fixed some QMAW link icons not having the correct block lighting applied \ No newline at end of file +* Fixed some QMAW link icons not having the correct block lighting applied +* Fixed a rare crash caused by RBMK neutron calculations happening in unloaded chunks \ No newline at end of file diff --git a/src/main/java/com/hbm/entity/train/EntityRailCarElectric.java b/src/main/java/com/hbm/entity/train/EntityRailCarElectric.java index bf794147c..5e6847d61 100644 --- a/src/main/java/com/hbm/entity/train/EntityRailCarElectric.java +++ b/src/main/java/com/hbm/entity/train/EntityRailCarElectric.java @@ -60,7 +60,7 @@ public abstract class EntityRailCarElectric extends EntityRailCarRidable { this.setPower(this.getPower() + powerTransfered); } } else if(stack != null) { - if(stack.getItem() == ModItems.battery_creative || stack.getItem() == ModItems.fusion_core_infinite) { + if(stack.getItem() == ModItems.battery_creative) { this.setPower(this.getMaxPower()); } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 1a6182ca8..e7b2d800a 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1666,7 +1666,6 @@ public class ModItems { public static Item battery_potatos; public static Item hev_battery; public static Item fusion_core; - public static Item fusion_core_infinite; public static Item energy_core; public static Item fuse; public static Item redcoil_capacitor; @@ -2111,7 +2110,6 @@ public class ModItems { public static Item fleija_kit; public static Item prototype_kit; public static Item missile_kit; - @Deprecated public static Item t45_kit; public static Item euphemium_kit; public static Item solinium_kit; public static Item hazmat_kit; @@ -3934,7 +3932,6 @@ public class ModItems { battery_potatos = new ItemPotatos(500000, 0, 100).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos"); hev_battery = new ItemFusionCore(150000).setUnlocalizedName("hev_battery").setMaxStackSize(4).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":hev_battery"); fusion_core = new ItemFusionCore(2500000).setUnlocalizedName("fusion_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core"); - fusion_core_infinite = new Item().setUnlocalizedName("fusion_core_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core_infinite"); energy_core = new ItemBattery(10000000, 0, 1000).setUnlocalizedName("energy_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":energy_core"); fuse = new ItemCustomLore().setUnlocalizedName("fuse").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fuse"); redcoil_capacitor = new ItemCapacitor(10).setUnlocalizedName("redcoil_capacitor").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":redcoil_capacitor"); @@ -4031,7 +4028,6 @@ public class ModItems { fleija_kit = new ItemStarterKit().setUnlocalizedName("fleija_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_kit"); prototype_kit = new ItemStarterKit().setUnlocalizedName("prototype_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":prototype_kit"); missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_kit"); - t45_kit = new ItemStarterKit().setUnlocalizedName("t45_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":t45_kit"); euphemium_kit = new ItemStarterKit().setUnlocalizedName("euphemium_kit").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":code"); solinium_kit = new ItemStarterKit().setUnlocalizedName("solinium_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_kit"); hazmat_kit = new ItemStarterKit().setUnlocalizedName("hazmat_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":hazmat_kit"); @@ -5760,7 +5756,6 @@ public class ModItems { GameRegistry.registerItem(hev_battery, hev_battery.getUnlocalizedName()); GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName()); GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName()); - GameRegistry.registerItem(fusion_core_infinite, fusion_core_infinite.getUnlocalizedName()); //Folders GameRegistry.registerItem(blueprints, blueprints.getUnlocalizedName()); @@ -7101,7 +7096,6 @@ public class ModItems { GameRegistry.registerItem(custom_kit, custom_kit.getUnlocalizedName()); GameRegistry.registerItem(missile_kit, missile_kit.getUnlocalizedName()); GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName()); - GameRegistry.registerItem(t45_kit, t45_kit.getUnlocalizedName()); GameRegistry.registerItem(hazmat_kit, hazmat_kit.getUnlocalizedName()); GameRegistry.registerItem(hazmat_red_kit, hazmat_red_kit.getUnlocalizedName()); GameRegistry.registerItem(hazmat_grey_kit, hazmat_grey_kit.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemStarterKit.java b/src/main/java/com/hbm/items/special/ItemStarterKit.java index ba8bf97b4..6d7af36a9 100644 --- a/src/main/java/com/hbm/items/special/ItemStarterKit.java +++ b/src/main/java/com/hbm/items/special/ItemStarterKit.java @@ -7,7 +7,6 @@ import com.hbm.interfaces.Spaghetti; import com.hbm.inventory.OreDictManager.DictFrame; import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemBattery; import com.hbm.items.machine.ItemBreedingRod.BreedingRodType; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; @@ -407,21 +406,6 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_emp, 1)); } - if(this == ModItems.t45_kit) - { - player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_helmet, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_plate, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_legs, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_boots, 1)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - player.inventory.addItemStackToInventory(ItemBattery.getFullBattery(ModItems.fusion_core)); - } - if(this == ModItems.stealth_boy) { player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 30 * 20, 1, true)); @@ -470,7 +454,6 @@ public class ItemStarterKit extends Item { this == ModItems.prototype_kit || this == ModItems.fleija_kit || this == ModItems.solinium_kit || - this == ModItems.t45_kit || this == ModItems.grenade_kit || this == ModItems.missile_kit || this == ModItems.multi_kit) { diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index e0d5217cb..5512310a8 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -237,7 +237,6 @@ public class Library { if(power > maxPower) return maxPower; if(slots[index] != null && slots[index].getItem() == ModItems.battery_creative) return 0; - if(slots[index] != null && slots[index].getItem() == ModItems.fusion_core_infinite) return 0; if(slots[index] != null && slots[index].getItem() instanceof IBatteryItem) { @@ -259,7 +258,6 @@ public class Library { public static long chargeTEFromItems(ItemStack[] slots, int index, long power, long maxPower) { if(slots[index] != null && slots[index].getItem() == ModItems.battery_creative) return maxPower; - if(slots[index] != null && slots[index].getItem() == ModItems.fusion_core_infinite) return maxPower; if(slots[index] != null && slots[index].getItem() instanceof IBatteryItem) { diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 9f5366d6c..8d0b9d544 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1428,6 +1428,8 @@ public class MainRegistry { ignoreMappings.add("hbm:item.mp_f_20"); ignoreMappings.add("hbm:item.mp_thruster_10_kerosene_tec"); ignoreMappings.add("hbm:item.mp_thruster_15_kerosene_tec"); + ignoreMappings.add("hbm:item.t45_kit"); + ignoreMappings.add("hbm:item.fusion_core_infinite"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);