From c70f4937b45a23136a679022dedfa1adcd079a1b Mon Sep 17 00:00:00 2001 From: Vaern Date: Wed, 20 Apr 2022 17:47:58 -0700 Subject: [PATCH] a --- .../java/com/hbm/lib/HbmChestContents.java | 29 ++++++++++++------- .../world/worldgen/ComponentNTMFeatures.java | 8 ++--- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/hbm/lib/HbmChestContents.java b/src/main/java/com/hbm/lib/HbmChestContents.java index 9caafcea6..c0d2d003c 100644 --- a/src/main/java/com/hbm/lib/HbmChestContents.java +++ b/src/main/java/com/hbm/lib/HbmChestContents.java @@ -148,17 +148,24 @@ public class HbmChestContents { //Expand to make it not seem as weird and limited public static WeightedRandomChestContent[] nuclearFuel = new WeightedRandomChestContent[] { - new WeightedRandomChestContent(ModItems.nugget_uranium, 0, 2, 12, 3), - new WeightedRandomChestContent(ModItems.nugget_mox_fuel, 0, 2, 12, 3), - new WeightedRandomChestContent(ModItems.nugget_uranium_fuel, 0, 2, 12, 5), - new WeightedRandomChestContent(ModItems.nugget_plutonium_fuel, 0, 2, 12, 4), - new WeightedRandomChestContent(ModItems.nugget_thorium_fuel, 0, 2, 12, 3), - new WeightedRandomChestContent(ModItems.billet_ra226be, 0, 1, 1, 2), - new WeightedRandomChestContent(ModItems.rod_zirnox_empty, 0, 1, 3, 5), - new WeightedRandomChestContent(ModItems.pile_rod_uranium, 0, 2, 6, 4), - new WeightedRandomChestContent(ModItems.pile_rod_source, 0, 1, 2, 3), - new WeightedRandomChestContent(ModItems.reacher, 0, 1, 1, 4), - new WeightedRandomChestContent(ModItems.screwdriver, 0, 1, 1, 2) + new WeightedRandomChestContent(ModItems.billet_uranium, 0, 1, 4, 4), + new WeightedRandomChestContent(ModItems.billet_pu_mix, 0, 1, 2, 4), + new WeightedRandomChestContent(ModItems.billet_th232, 0, 1, 3, 3), + new WeightedRandomChestContent(ModItems.billet_uranium_fuel, 0, 1, 3, 5), + new WeightedRandomChestContent(ModItems.billet_mox_fuel, 0, 1, 3, 5), + new WeightedRandomChestContent(ModItems.billet_plutonium_fuel, 0, 1, 3, 4), + new WeightedRandomChestContent(ModItems.billet_thorium_fuel, 0, 1, 3, 3), + new WeightedRandomChestContent(ModItems.billet_ra226be, 0, 1, 2, 2), + new WeightedRandomChestContent(ModItems.billet_beryllium, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.nugget_u233, 0, 1, 2, 1), + new WeightedRandomChestContent(ModItems.nugget_u235, 0, 1, 2, 1), + new WeightedRandomChestContent(ModItems.nugget_pu239, 0, 1, 2, 1), + new WeightedRandomChestContent(ModItems.rod_zirnox_empty, 0, 1, 3, 3), + new WeightedRandomChestContent(ModItems.ingot_graphite, 0, 1, 4, 3), + new WeightedRandomChestContent(ModItems.pile_rod_uranium, 0, 2, 5, 3), + new WeightedRandomChestContent(ModItems.pile_rod_source, 0, 1, 2, 2), + new WeightedRandomChestContent(ModItems.reacher, 0, 1, 1, 3), + new WeightedRandomChestContent(ModItems.screwdriver, 0, 1, 1, 2), }; public static WeightedRandomChestContent[] nuclear = new WeightedRandomChestContent[] { diff --git a/src/main/java/com/hbm/world/worldgen/ComponentNTMFeatures.java b/src/main/java/com/hbm/world/worldgen/ComponentNTMFeatures.java index da9bafe19..c398afd5b 100644 --- a/src/main/java/com/hbm/world/worldgen/ComponentNTMFeatures.java +++ b/src/main/java/com/hbm/world/worldgen/ComponentNTMFeatures.java @@ -412,7 +412,7 @@ public class ComponentNTMFeatures { this.placeBlockAtCurrentPosition(world, ModBlocks.crate_can, 0, featureSizeX - 1, 1, featureSizeZ - 2, box); if(!hasPlacedLoot[1]) { this.placeBlockAtCurrentPosition(world, ModBlocks.crate_iron, 0, featureSizeX - 1, 1, featureSizeZ - 1, box); - WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.antenna, (TileEntityCrateIron)world.getTileEntity(this.getXWithOffset(featureSizeX - 1, featureSizeZ - 1), + WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.modGeneric, (TileEntityCrateIron)world.getTileEntity(this.getXWithOffset(featureSizeX - 1, featureSizeZ - 1), this.getYWithOffset(1), this.getZWithOffset(featureSizeX - 1, featureSizeZ - 1)), 8); this.hasPlacedLoot[1] = true; } @@ -582,15 +582,15 @@ public class ComponentNTMFeatures { this.fillWithMetadataBlocks(world, box, 3, 1, 2, 3, 3, 2, ModBlocks.steel_wall, westMeta, Blocks.air, 0, false); this.fillWithMetadataBlocks(world, box, 3, 1, 4, 3, 3, 4, ModBlocks.steel_wall, westMeta, Blocks.air, 0, false); this.fillWithMetadataBlocks(world, box, 3, 1, featureSizeZ - 2, 3, 3, featureSizeZ - 2, ModBlocks.steel_wall, westMeta, Blocks.air, 0, false); - this.placeBlockAtCurrentPosition(world, ModBlocks.crate_lead, 0, 5, 1, 5, box); this.placeBlockAtCurrentPosition(world, ModBlocks.crate, 0, 4, 1, featureSizeZ - 2, box); + this.placeBlockAtCurrentPosition(world, ModBlocks.crate_lead, 0, 4, 2, featureSizeZ - 2, box); if(!hasPlacedLoot[0]) { this.placeBlockAtCurrentPosition(world, ModBlocks.crate_iron, 0, 5, 1, featureSizeZ - 2, box); WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.nuclearFuel, (TileEntityCrateIron)world.getTileEntity(this.getXWithOffset(5, featureSizeZ - 2), - this.getYWithOffset(1), this.getZWithOffset(5, featureSizeZ - 2)), 8); + this.getYWithOffset(1), this.getZWithOffset(5, featureSizeZ - 2)), 11); this.hasPlacedLoot[0] = true; } - this.fillWithBlocks(world, box, 4, 2, featureSizeZ - 2, 5, 2, featureSizeZ - 2, ModBlocks.crate_lead, Blocks.air, false); + this.fillWithBlocks(world, box, 4, 1, featureSizeZ - 3, 5, 1, featureSizeZ - 3, ModBlocks.crate_lead, Blocks.air, false); this.fillWithBlocks(world, box, featureSizeX - 5, 1, featureSizeZ - 2, featureSizeX - 5, 3, featureSizeZ - 2, ModBlocks.deco_steel, Blocks.air, false);; this.fillWithMetadataBlocks(world, box, featureSizeX - 4, 1, featureSizeZ - 2, featureSizeX - 2, 1, featureSizeZ - 2, ModBlocks.steel_grate, 7, Blocks.air, 0, false);