diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java index 48b2ae6c9..aadcd973e 100644 --- a/src/main/java/com/hbm/config/WorldConfig.java +++ b/src/main/java/com/hbm/config/WorldConfig.java @@ -35,6 +35,9 @@ public class WorldConfig { public static int bedrockIronSpawn = 200; public static int bedrockCopperSpawn = 200; + public static int bedrockBoraxSpawn = 300; + public static int bedrockAsbestosSpawn = 300; + public static int bedrockNiobiumSpawn = 300; public static int ironClusterSpawn = 4; public static int titaniumClusterSpawn = 2; @@ -129,6 +132,9 @@ public class WorldConfig { bedrockIronSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B00_bedrockIronSpawn", "Spawns a bedrock iron deposit every nTH chunk", 200); bedrockCopperSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B01_bedrockCopperSpawn", "Spawns a bedrock copper deposit every nTH chunk", 200); + bedrockBoraxSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B02_bedrockBoraxSpawn", "Spawns a bedrock borax deposit every nTH chunk", 300); + bedrockAsbestosSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B03_bedrockAsbestosSpawn", "Spawns a bedrock asbestos deposit every nTH chunk", 300); + bedrockNiobiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B04_bedrockNiobiumSpawn", "Spawns a bedrock niobium deposit every nTH chunk", 300); ironClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C00_ironClusterSpawn", "Amount of iron cluster veins per chunk", 4); titaniumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C01_titaniumClusterSpawn", "Amount of titanium cluster veins per chunk", 2); diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOre.java b/src/main/java/com/hbm/items/special/ItemBedrockOre.java index cdba5a466..33915030d 100644 --- a/src/main/java/com/hbm/items/special/ItemBedrockOre.java +++ b/src/main/java/com/hbm/items/special/ItemBedrockOre.java @@ -52,7 +52,10 @@ public class ItemBedrockOre extends ItemEnumMulti { public static enum EnumBedrockOre { IRON("Iron", 0xE2C0AA), - COPPER("Copper", 0xFDCA88); + COPPER("Copper", 0xEC9A63), + BORAX("Borax", 0xE4BE74), + ASBESTOS("Asbestos", 0xBFBFB9), + NIOBIUM("Niobium", 0xAF58D8); public String oreName; public int color; diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 0d39cecea..6c3dd12f7 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -8,6 +8,8 @@ import com.hbm.blocks.generic.BlockMotherOfAllOres; import com.hbm.blocks.generic.BlockNTMFlower.EnumFlowerType; import com.hbm.config.GeneralConfig; import com.hbm.config.WorldConfig; +import com.hbm.inventory.FluidStack; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBedrockOre.EnumBedrockOre; import com.hbm.main.MainRegistry; @@ -154,8 +156,11 @@ public class HbmWorldGen implements IWorldGenerator { DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.hematiteSpawn, 10, 4, 80, ModBlocks.stone_resource, EnumStoneType.HEMATITE.ordinal()); DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.malachiteSpawn, 10, 4, 40, ModBlocks.stone_resource, EnumStoneType.MALACHITE.ordinal()); - if(WorldConfig.bedrockIronSpawn > 0 && rand.nextInt(WorldConfig.bedrockIronSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.IRON); - if(WorldConfig.bedrockCopperSpawn > 0 && rand.nextInt(WorldConfig.bedrockCopperSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.COPPER); + if(WorldConfig.bedrockIronSpawn > 0 && rand.nextInt(WorldConfig.bedrockIronSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.IRON, 1); + if(WorldConfig.bedrockCopperSpawn > 0 && rand.nextInt(WorldConfig.bedrockCopperSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.COPPER, 1); + if(WorldConfig.bedrockBoraxSpawn > 0 && rand.nextInt(WorldConfig.bedrockBoraxSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.BORAX, new FluidStack(Fluids.SULFURIC_ACID, 500), 3); + if(WorldConfig.bedrockAsbestosSpawn > 0 && rand.nextInt(WorldConfig.bedrockAsbestosSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.ASBESTOS, 2); + if(WorldConfig.bedrockNiobiumSpawn > 0 && rand.nextInt(WorldConfig.bedrockNiobiumSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.NIOBIUM, new FluidStack(Fluids.ACID, 1_000), 2); for(int k = 0; k < WorldConfig.randomSpawn; k++) { BlockMotherOfAllOres.shuffleOverride(rand); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 95c796e06..44cab020e 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4473)"; + public static final String VERSION = "1.0.27 BETA (4474)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java index f03214c46..5ea2a2cbd 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java @@ -279,7 +279,7 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements breakBlocks(ring); buildWall(ring + 1, ring == radius && this.enableWalling); if(ring == radius) mineOuterOres(ring + 1); - tryCollect(radius); + tryCollect(radius + 1); } else { collectBedrock(bedrockOre); } @@ -287,6 +287,8 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements } return false; + } else { + tryCollect(radius + 1); } } diff --git a/src/main/java/com/hbm/world/feature/BedrockOre.java b/src/main/java/com/hbm/world/feature/BedrockOre.java index 362f1cfc2..cea197f72 100644 --- a/src/main/java/com/hbm/world/feature/BedrockOre.java +++ b/src/main/java/com/hbm/world/feature/BedrockOre.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; public class BedrockOre { - public static void generate(World world, int x, int z, ItemStack stack, FluidStack acid, int color) { + public static void generate(World world, int x, int z, ItemStack stack, FluidStack acid, int color, int tier) { for(int ix = x - 1; ix <= x + 1; ix++) { for(int iz = z - 1; iz <= z + 1; iz++) { @@ -23,6 +23,7 @@ public class BedrockOre { ore.color = color; ore.shape = world.rand.nextInt(10); ore.acidRequirement = acid; + ore.tier = tier; world.markBlockForUpdate(ix, 0, iz); world.markTileEntityChunkModified(ix, 0, iz, ore); } diff --git a/src/main/java/com/hbm/world/generator/DungeonToolbox.java b/src/main/java/com/hbm/world/generator/DungeonToolbox.java index be8766a1c..01624896f 100644 --- a/src/main/java/com/hbm/world/generator/DungeonToolbox.java +++ b/src/main/java/com/hbm/world/generator/DungeonToolbox.java @@ -3,6 +3,7 @@ package com.hbm.world.generator; import java.util.List; import java.util.Random; +import com.hbm.inventory.FluidStack; import com.hbm.inventory.RecipesCommon.MetaBlock; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBedrockOre.EnumBedrockOre; @@ -93,10 +94,14 @@ public class DungeonToolbox { } } - public static void generateBedrockOre(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore) { + public static void generateBedrockOre(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore, int tier) { + generateBedrockOre(world, rand, chunkX, chunkZ, ore, null, tier); + } + + public static void generateBedrockOre(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore, FluidStack stack, int tier) { int randPosX = chunkX + rand.nextInt(16); int randPosZ = chunkZ + rand.nextInt(16); - BedrockOre.generate(world, randPosX, randPosZ, new ItemStack(ModItems.ore_bedrock, 1, ore.ordinal()), null, ore.color); + BedrockOre.generate(world, randPosX, randPosZ, new ItemStack(ModItems.ore_bedrock, 1, ore.ordinal()), stack, ore.color, tier); } private static WorldGenFlowers genFlowers = new WorldGenFlowers(null); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index e6b0b299d..5b222ea7f 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2330,18 +2330,36 @@ item.oil_tar.name=Ölteer item.oil_tar.crude.name=Erdölteer item.oil_tar.crack.name=Crackölteer item.oil_tar.wood.name=Holzteer +item.ore_bedrock.asbestos.name=Bedrock-Asbesterz +item.ore_bedrock.borax.name=Bedrock-Boraxerz item.ore_bedrock.copper.name=Bedrock-Kupfererz item.ore_bedrock.iron.name=Bedrock-Eisenerz +item.ore_bedrock.niobium.name=Bedrock-Nioberz +item.ore_centrifuged.asbestos.name=Zentrifugiertes Asbesterz +item.ore_centrifuged.borax.name=Zentrifugiertes Boraxerz item.ore_centrifuged.copper.name=Zentrifugiertes Kupfererz item.ore_centrifuged.iron.name=Zentrifugiertes Eisenerz +item.ore_centrifuged.niobium.name=Zentrifugiertes Nioberz +item.ore_cleaned.asbestos.name=Gereinigtes Asbesterz +item.ore_cleaned.borax.name=Gereinigtes Boraxerz item.ore_cleaned.copper.name=Gereinigtes Kupfererz item.ore_cleaned.iron.name=Gereinigtes Eisenerz +item.ore_cleaned.niobium.name=Gereinigtes Nioberz +item.ore_enriched.asbestos.name=Reiches Asbesterz +item.ore_enriched.borax.name=Reiches Boraxerz item.ore_enriched.copper.name=Reiches Kupfererz item.ore_enriched.iron.name=Reiches Eisenerz +item.ore_enriched.niobium.name=Reiches Nioberz +item.ore_purified.asbestos.name=Pures Asbesterz +item.ore_purified.borax.name=Pures Boraxerz item.ore_purified.copper.name=Pures Kupfererz item.ore_purified.iron.name=Pures Eisenerz +item.ore_purified.niobium.name=Pures Nioberz +item.ore_separated.asbestos.name=Separiertes Asbesterz +item.ore_separated.borax.name=Separiertes Boraxerz item.ore_separated.copper.name=Separiertes Kupfererz item.ore_separated.iron.name=Separiertes Eisenerz +item.ore_separated.niobium.name=Separiertes Nioberz item.overfuse.name=Singularitätsschraubenzieher item.oxy_mask.name=Sauerstoffmaske item.paa_boots.name=PaA-"olle Latschen" @@ -3921,7 +3939,7 @@ tile.radio_torch_receiver.desc=Kann auf ebenen Flächen oder Komparator-kompatib tile.radio_torch_sender.name=Redstone-over-Radio Sender tile.radio_torch_sender.desc=Kann auf ebenen Flächen oder Komparator-kompatiblen Blöcken platziert werden$Erkennt Redstone-Signale oder Komparator-Output tile.radiobox.name=Rosenberg Ungeziefervernichter -tile.radiorec.name=Kaputtes UKW Radio +tile.radiorec.name=UKW Radio tile.rail_booster.name=Hochgeschwindigkeits-Boosterschienen tile.rail_highspeed.name=Hochgeschwindigkeitsschienen tile.rail_narrow.name=Schmalspurschienen diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index c5fdbb831..bb2e0476f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2768,18 +2768,36 @@ item.oil_tar.coal.name=Coal Tar item.oil_tar.crude.name=Oil Tar item.oil_tar.crack.name=Crack Oil Tar item.oil_tar.wood.name=Wood Tar +item.ore_bedrock.asbestos.name=Asbestos Bedrock Ore +item.ore_bedrock.borax.name=Borax Bedrock Ore item.ore_bedrock.copper.name=Copper Bedrock Ore item.ore_bedrock.iron.name=Iron Bedrock Ore +item.ore_bedrock.niobium.name=Niobium Bedrock Ore +item.ore_centrifuged.asbestos.name=Centrifuged Asbestos Ore +item.ore_centrifuged.borax.name=Centrifuged Borax Ore item.ore_centrifuged.copper.name=Centrifuged Copper Ore item.ore_centrifuged.iron.name=Centrifuged Iron Ore +item.ore_centrifuged.niobium.name=Centrifuged Niobium Ore +item.ore_cleaned.asbestos.name=Cleaned Asbestos Ore +item.ore_cleaned.borax.name=Cleaned Borax Ore item.ore_cleaned.copper.name=Cleaned Copper Ore item.ore_cleaned.iron.name=Cleaned Iron Ore +item.ore_cleaned.niobium.name=Cleaned Niobium Ore +item.ore_enriched.asbestos.name=Enriched Asbestos Ore +item.ore_enriched.borax.name=Enriched Borax Ore item.ore_enriched.copper.name=Enriched Copper Ore item.ore_enriched.iron.name=Enriched Iron Ore +item.ore_enriched.niobium.name=Enriched Niobium Ore +item.ore_purified.asbestos.name=Purified Asbestos Ore +item.ore_purified.borax.name=Purified Borax Ore item.ore_purified.copper.name=Purified Copper Ore item.ore_purified.iron.name=Purified Iron Ore +item.ore_purified.niobium.name=Purified Niobium Ore +item.ore_separated.asbestos.name=Separated Asbestos Ore +item.ore_separated.borax.name=Separated Borax Ore item.ore_separated.copper.name=Separated Copper Ore item.ore_separated.iron.name=Separated Iron Ore +item.ore_separated.niobium.name=Separated Niobium Ore item.overfuse.name=Singularity Screwdriver item.overfuse.desc=Say what? item.oxy_mask.name=Oxygen Mask @@ -4502,7 +4520,7 @@ tile.radio_torch_receiver.desc=Placable on flat surfaces or comparator-compatibl tile.radio_torch_sender.name=Redstone-over-Radio Transmitter tile.radio_torch_sender.desc=Placable on flat surfaces or comparator-compatible blocks$Reads redstone signals or comparator input tile.radiobox.name=Rosenberg Pest Control Box -tile.radiorec.name=Broken FM Radio +tile.radiorec.name=FM Radio tile.rail_booster.name=High Speed Booster Rail tile.rail_highspeed.name=High Speed Rail tile.rail_narrow.name=Narrow Gauge Cart Rail diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 734a2b2ca..af7435c1a 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4473", + "version":"1.0.27_X4474", "mcversion": "1.7.10", "url": "", "updateUrl": "",