Merge pull request #2399 from Lazzzycatwastaken/NTMRUINS1

Sludgening is beginning

src/main/java/com/hbm/config/StructureConfig.java

@@ -10,8 +10,8 @@ public class StructureConfig {
 
 	public static int enableStructures = 2;
 
-	public static int structureMinChunks = 8;
+	public static int structureMinChunks = 4;
-	public static int structureMaxChunks = 24;
+	public static int structureMaxChunks = 12;
 
 	public static double lootAmountFactor = 1D;
 
@@ -25,15 +25,15 @@ public class StructureConfig {
 
 		enableStructures = CommonConfig.parseStructureFlag(unparsedStructureFlag);
 
-		structureMinChunks = CommonConfig.createConfigInt(config, CATEGORY_STRUCTURES, "5.01_structureMinChunks", "Minimum non-zero distance between structures in chunks (Settings lower than 8 may be problematic).", 8);
+		structureMinChunks = CommonConfig.createConfigInt(config, CATEGORY_STRUCTURES, "5.01_structureMinChunks", "Minimum non-zero distance between structures in chunks (Settings lower than 8 may be problematic).", 4);
-		structureMaxChunks = CommonConfig.createConfigInt(config, CATEGORY_STRUCTURES, "5.02_structureMaxChunks", "Maximum non-zero distance between structures in chunks.", 24);
+		structureMaxChunks = CommonConfig.createConfigInt(config, CATEGORY_STRUCTURES, "5.02_structureMaxChunks", "Maximum non-zero distance between structures in chunks.", 16);
 
 		lootAmountFactor = CommonConfig.createConfigDouble(config, CATEGORY_STRUCTURES, "5.03_lootAmountFactor", "General factor for loot spawns. Applies to spawned IInventories, not loot blocks.", 1D);
 
 		debugStructures = CommonConfig.createConfigBool(config, CATEGORY_STRUCTURES, "5.04_debugStructures", "If enabled, special structure blocks like jigsaw blocks will not be transformed after generating", false);
 
-		structureMinChunks = CommonConfig.setDef(structureMinChunks, 8);
+		structureMinChunks = CommonConfig.setDef(structureMinChunks, 4);
-		structureMaxChunks = CommonConfig.setDef(structureMaxChunks, 24);
+		structureMaxChunks = CommonConfig.setDef(structureMaxChunks, 12);
 
 		if(structureMinChunks > structureMaxChunks) {
 			MainRegistry.logger.error("Fatal error config: Minimum value has been set higher than the maximum value!");

src/main/java/com/hbm/itempool/ItemPoolsPile.java

@@ -21,6 +21,7 @@ public class ItemPoolsPile {
 	public static final String POOL_PILE_MAKESHIFT_PLATES = "POOL_PILE_MAKESHIFT_PLATES";
 	public static final String POOL_PILE_MAKESHIFT_WIRE = "POOL_PILE_MAKESHIFT_WIRE";
 	public static final String POOL_PILE_NUKE_STORAGE = "POOL_PILE_NUKE_STORAGE";
+	public static final String POOL_PILE_OF_GARBAGE = "POOL_PILE_OF_GARBAGE";
 
 	public static void init() {
 
@@ -106,5 +107,34 @@ public class ItemPoolsPile {
 
 			};
 		}};
+
+		new ItemPool(POOL_PILE_OF_GARBAGE) {{
+			this.pool = new WeightedRandomChestContent[] {
+				weighted(ModItems.pipe, 2600, 0, 2, 20),
+				weighted(ModItems.scrap, 0, 1, 5, 20),
+				weighted(ModItems.wire_fine, 8200, 1, 2, 20),
+				weighted(ModItems.dust, 0, 1, 3, 40),
+				weighted(ModItems.dust_tiny, 0, 1, 7, 40),
+				weighted(ModItems.powder_cement, 0, 1, 6, 40),
+				weighted(ModItems.nugget_lead, 0, 0, 3, 20),
+				weighted(ModItems.wire_fine, 0, 0, 3, 20),
+				weighted(ModItems.powder_ash, 0, 0, 1, 15),
+				weighted(ModItems.plate_lead, 0, 0, 1, 15),
+				weighted(Items.string, 0, 0, 1, 15),
+				weighted(ModItems.bolt, 8200, 0, 2, 15),
+				weighted(ModItems.pin, 0, 0, 2, 15),
+				weighted(ModItems.cap_nuka, 0, 0, 8, 15),
+				weighted(ModItems.plate_iron, 0, 0, 2, 15),
+				weighted(ModItems.fallout, 0, 0, 2, 15),
+				weighted(ModItems.coil_tungsten, 0, 0, 2, 15),
+				weighted(ModItems.can_empty, 0, 0, 1, 15),
+				weighted(ModItems.ingot_asbestos, 0, 0, 1, 15),
+				weighted(ModItems.syringe_metal_empty, 0, 0, 1, 15),
+				weighted(ModItems.syringe_empty, 0, 0, 1, 15),
+				weighted(ModItems.pipe_lead, 0, 0, 1, 5),
+				weighted(ModItems.motor, 0, 0, 1, 5),
+				weighted(ModItems.canned_conserve, 2, 0, 1, 5),
+			};
+		}};
 	}
 }

src/main/java/com/hbm/lib/HbmWorld.java

@@ -41,7 +41,7 @@ public class HbmWorld {
 	private static void registerNTMFeatures() {
 		CivilianFeatures.registerComponents();
 		OfficeFeatures.registerComponents();
-		RuinFeatures.registerComponents();
+//		RuinFeatures.registerComponents();
 		BunkerComponents.registerComponents();
 		MapGenStructureIO.func_143031_a(SiloComponent.class, "NTMSiloComponent");
 	}

src/main/java/com/hbm/main/StructureManager.java

@@ -62,6 +62,17 @@ public class StructureManager {
 	public static final NBTStructure dish = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/dish.nbt"));
 	public static final NBTStructure radio_house = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/radio_house.nbt"));
 
+	public static final NBTStructure ntmruinsA = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsA.nbt"));
+	public static final NBTStructure ntmruinsB = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsB.nbt"));
+	public static final NBTStructure ntmruinsC = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsC.nbt"));
+	public static final NBTStructure ntmruinsD = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsD.nbt"));
+	public static final NBTStructure ntmruinsE = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsE.nbt"));
+	public static final NBTStructure ntmruinsF = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsF.nbt"));
+	public static final NBTStructure ntmruinsG = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsG.nbt"));
+	public static final NBTStructure ntmruinsH = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsH.nbt"));
+	public static final NBTStructure ntmruinsI = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsI.nbt"));
+	public static final NBTStructure ntmruinsJ = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/ntmruinsJ.nbt"));
+
 	public static final NBTStructure spire = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/spire.nbt"));
 
 	// public static final NBTStructure test_rot = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/test-rot.nbt"));

src/main/java/com/hbm/util/LootGenerator.java

@@ -29,6 +29,7 @@ public class LootGenerator {
 	public static final String LOOT_GLYPHID_HIVE = "LOOT_GLYPHID_HIVE";
 	public static final String LOOT_METEOR = "LOOT_METEOR";
 	public static final String LOOT_FLAREGUN = "LOOT_FLAREGUN";
+	public static final String LOOT_SHIT = "LOOT_SHIT";
 
 	public static void applyLoot(World world, int x, int y, int z, String name) {
 		switch(name) {
@@ -42,6 +43,7 @@ public class LootGenerator {
 			case LOOT_GLYPHID_HIVE: lootGlyphidHive(world, x, y, z);
 			case LOOT_METEOR: lootBookMeteor(world, x, y, z);
 			case LOOT_FLAREGUN: lootFlareGun(world, x, y, z);
+			case LOOT_SHIT: lootShit(world, x, y, z);
 			default: lootBones(world, x, y, z); break;
 		}
 	}
@@ -233,4 +235,16 @@ public class LootGenerator {
 					0.25, k * 0.03125, 0.125);
 		}
 	}
+	public static void lootShit(World world, int x, int y, int z) {
+
+		TileEntityLoot loot = (TileEntityLoot) world.getTileEntity(x, y, z);
+
+		if(loot != null && loot.items.isEmpty()) {
+
+			int limit = world.rand.nextInt(3) + 3;
+			for(int i = 0; i < limit; i++) {
+				addItemWithDeviation(loot, world.rand, ItemPool.getStack(ItemPool.getPool(ItemPoolsPile.POOL_PILE_OF_GARBAGE), world.rand), world.rand.nextDouble() - 0.5, i * 0.03125, world.rand.nextDouble() - 0.5);
+			}
+		}
+	}
 }

src/main/java/com/hbm/world/gen/MapGenNTMFeatures.java

@@ -15,10 +15,10 @@ import com.hbm.world.gen.component.CivilianFeatures.NTMLab2;
 import com.hbm.world.gen.component.CivilianFeatures.RuralHouse1;
 import com.hbm.world.gen.component.OfficeFeatures.LargeOffice;
 import com.hbm.world.gen.component.OfficeFeatures.LargeOfficeCorner;
-import com.hbm.world.gen.component.RuinFeatures.NTMRuin1;
+//import com.hbm.world.gen.component.RuinFeatures.NTMRuin1;
-import com.hbm.world.gen.component.RuinFeatures.NTMRuin2;
+//import com.hbm.world.gen.component.RuinFeatures.NTMRuin2;
-import com.hbm.world.gen.component.RuinFeatures.NTMRuin3;
+//import com.hbm.world.gen.component.RuinFeatures.NTMRuin3;
-import com.hbm.world.gen.component.RuinFeatures.NTMRuin4;
+//import com.hbm.world.gen.component.RuinFeatures.NTMRuin4;
 import com.hbm.world.gen.component.SiloComponent;
 
 import net.minecraft.world.World;
@@ -124,26 +124,26 @@ public class MapGenNTMFeatures extends MapGenStructure {
 			 */
 			//TODO: Do something about this so it's nice-looking and easily readable. Plus, test compatibility against mods like BoP
 
-			if(rand.nextInt(3) == 0) { //Empty Ruin Structures
+//			if(rand.nextInt(3) == 0) { //Empty Ruin Structures
-				switch(rand.nextInt(4)) {
+//				switch(rand.nextInt(4)) {
-				case 0:
+//				case 0:
-					NTMRuin1 ruin1 = new NTMRuin1(rand, i, j);
+//					NTMRuin1 ruin1 = new NTMRuin1(rand, i, j);
-					this.components.add(ruin1);
+//					this.components.add(ruin1);
-					break;
+//					break;
-				case 1:
+//				case 1:
-					NTMRuin2 ruin2 = new NTMRuin2(rand, i, j);
+//					NTMRuin2 ruin2 = new NTMRuin2(rand, i, j);
-					this.components.add(ruin2);
+//					this.components.add(ruin2);
-					break;
+//					break;
-				case 2:
+//				case 2:
-					NTMRuin3 ruin3 = new NTMRuin3(rand, i, j);
+//					NTMRuin3 ruin3 = new NTMRuin3(rand, i, j);
-					this.components.add(ruin3);
+//					this.components.add(ruin3);
-					break;
+//					break;
-				case 3:
+//				case 3:
-					NTMRuin4 ruin4 = new NTMRuin4(rand, i, j);
+//					NTMRuin4 ruin4 = new NTMRuin4(rand, i, j);
-					this.components.add(ruin4);
+//					this.components.add(ruin4);
-				}
+//				}
 
-			} else if(biome.heightVariation <= 0.25F && rand.nextInt(10) == 0) { //for now our only restriction is kinda-flat biomes. that and chance might change idk
+			if(biome.heightVariation <= 0.25F && rand.nextInt(10) == 0) { //for now our only restriction is kinda-flat biomes. that and chance might change idk
 				SiloComponent silo = new SiloComponent(rand, i, j);
 				this.components.add(silo);
 			} else if(biome.temperature >= 1.0 && biome.rainfall == 0 && !(biome instanceof BiomeGenMesa)) { //Desert & Savannah

src/main/java/com/hbm/world/gen/NTMWorldGenerator.java

@@ -114,6 +114,56 @@ public class NTMWorldGenerator implements IWorldGenerator {
 			spawnWeight = 1;
 		}});
 
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin1") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsA", StructureManager.ntmruinsA, -1) {{conformToTerrain = true;}};
+			spawnWeight = 20;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin2") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsB", StructureManager.ntmruinsB, -1) {{conformToTerrain = true;}};
+			spawnWeight = 25;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin3") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsC", StructureManager.ntmruinsC, -1) {{conformToTerrain = true;}};
+			spawnWeight = 25;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin4") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsD", StructureManager.ntmruinsD, -1) {{conformToTerrain = true;}};
+			spawnWeight = 30;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin5") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsE", StructureManager.ntmruinsE, -1) {{conformToTerrain = true;}};
+			spawnWeight = 30;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin6") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsF", StructureManager.ntmruinsF, -1) {{conformToTerrain = true;}};
+			spawnWeight = 50;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin7") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsG", StructureManager.ntmruinsG, -1) {{conformToTerrain = true;}};
+			spawnWeight = 50;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin8") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsH", StructureManager.ntmruinsH, -1) {{conformToTerrain = true;}};
+			spawnWeight = 50;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin9") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsI", StructureManager.ntmruinsI, -1) {{conformToTerrain = true;}};
+			spawnWeight = 50;
+		}});
+		NBTStructure.registerStructure(0, new SpawnCondition("ruin10") {{
+			canSpawn = biome -> !invalidBiomes.contains(biome) && biome.canSpawnLightningBolt();
+			structure = new JigsawPiece("NTMRuinsJ", StructureManager.ntmruinsJ, -1) {{conformToTerrain = true;}};
+			spawnWeight = 35;
+		}});
 		NBTStructure.registerStructure(0, new SpawnCondition("radio") {{
 			canSpawn = flatbiomes::contains;
 			structure = new JigsawPiece("radio_house", StructureManager.radio_house, -6);

src/main/java/com/hbm/world/gen/component/RuinFeatures.java

@@ -8,7 +8,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraft.world.gen.structure.StructureBoundingBox;
-
+// Idk what i should do with these if you read this bob do whatever since it's not used anywhere
 public class RuinFeatures {
 
 	public static void registerComponents() {