i forgor

changelog

@@ -1,49 +0,0 @@
-##Added
-* CRTs and toasters
-  * Found in the new silo structure
-* Sentry turret "Edwin"
-  * A broken down version of the sentry turret with infinite power and ammo
-  * Also found in the new silos
-* Launch code piece
-  * A rare drop from hostile mobs
-  * 8 of them can be combined into launch codes, which are required to launch the missile found in the silo
-  * Single-use
-* Launch key
-  * The key is required to launch the missile found in the silo
-
-## Changed
-* Updated chinese localization
-* Tweaked super shotgun animations, added config for changing the animation style
-* The benelli now has reloading animations and the drum mag as advertised
-* Tom will now explode close to bedrock even when not hitting a block
-* The assembler recipe config now uses the same system as all other recipe configs, the file has moved into the `hbmRecipes` folder
-  * Old files are still compatible if moved to the new folder, since the base structure of the recipe file is the same
-  * Recipes should work as expected with the `/ntmreload` command
-  * Recipes now have an optional list for specifying which template folder they are made in
-* Electrolyzing heavy water now has the same yields as regular water, I don't remember why this incsonsistency existed and there was probably a reason for it but I don't care
-* Electrolyzing fluids now only takes 20 ticks instead of 60
-  * Batch sizes for water and heavy water have been doubled, effectively increasing throughout 6x
-  * The throughput for electrolysis on chemical plants has been halved (but heavy water still has the output buff, effectively remaining unchanged)
-* Custom machines now have an optional localization field which allows translations to be added within the config
-* The congo lake now has reload and better firing animations
-* Improved shift clicking for centrifuges, acidizers, electric furnace, arc furnaces and arc welders
-* Schrabidium transmutation by fallout is now limited to the inner 40% of the sellafite conversion radius
-* Fluid traits are now listed in a fixed order instead of being arranged randomly
-* Hidden fluid trait descriptions will now be added below the visible part of that trait instead of below the last visible trait
-* The methusalem turret no longer drops anything when broken
-* Gaseous fuels now have a combusion multiplier of 1.5 instead of 1.25
-* LPG now has half the base burn value, preventing an unreasonable jump in efficiency simply by liquefacting petroleum gas
-  * While overall slightly less efficient that petroleum gas per unit of petroleum needed, LPG is still very much desirable due to being much easier to burn at max efficiency
-* The ZPE is no longer craftable in 528 mode
-* The silo structure has been remade. Instead of a concrete hole with a single small control room, it's now a much larger multi-level silo with a small bunker complex
-  * The silo will spawn with the new large silo hatch, as well as a structure-only variant of the silo launch pad
-  * The silo has a damaged version of the doomsday missile loaded, which can be launched using the launch code and launch key
-  * The missile can be released from the launch position, which renders it inoperable. Repairing it will make it usable again, as well as increase the yield considerably
-
-## Fixed
-* Fixed the structure toggle on the world creation screen not working correctly on most world types
-* Fixed antiknock having a broken sprite and localization
-* Fixed crash caused by fallout affecting spotlight blocks, crashing the game
-* Fixed 528 mode bedrock ore replacements not working
-* Fixed potential crashes with improperly configured custom machines
-* Fixed misspelling in the custom machine config template

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=4880
+mod_build_number=4895
 
 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\
   \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -1544,7 +1544,7 @@ public class ModBlocks {
 		deco_loot = new BlockLoot().setBlockName("deco_loot").setCreativeTab(null).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		pedestal = new BlockPedestal().setBlockName("pedestal").setCreativeTab(null).setHardness(2.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":pedestal_top");
 		bobblehead = new BlockBobble().setBlockName("bobblehead").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel");
-		snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(null).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron");
+		snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron");
 		hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":hazmat");
 		
 		gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(240.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");

src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java

@@ -26,8 +26,10 @@ import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 public class BlockSnowglobe extends BlockContainer implements IGUIProvider {
@@ -58,13 +60,8 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider {
 	
 	@Override
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
-		
 		TileEntitySnowglobe entity = (TileEntitySnowglobe) world.getTileEntity(x, y, z);
-		
-		if(entity != null) {
-			return new ItemStack(this, 1, entity.type.ordinal());
-		}
-		
+		if(entity != null) return new ItemStack(this, 1, entity.type.ordinal());
 		return super.getPickBlock(target, world, x, y, z, player);
 	}
 
@@ -100,9 +97,7 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
-		
-		for(int i = 1; i < SnowglobeType.values().length; i++)
-			list.add(new ItemStack(item, 1, i));
+		for(int i = 1; i < SnowglobeType.values().length; i++) list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
@@ -114,6 +109,18 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider {
 		bobble.type = SnowglobeType.values()[Math.abs(stack.getItemDamage()) % SnowglobeType.values().length];
 		bobble.markDirty();
 	}
+	
+	@Override
+	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
+		float f = 0.0625F;
+		this.setBlockBounds(4F * f, 0.0F, 4F * f, 1.0F - 4F * f, 0.3125F, 1.0F - 4F * f);
+	}
+
+	@Override
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
+		this.setBlockBoundsBasedOnState(world, x, y, z);
+		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
+	}
 
 	@Override
 	public TileEntity createNewTileEntity(World world, int meta) {
@@ -160,7 +167,7 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider {
 		TENPENNYTOWER(	"Tenpenny Tower",	"Tenpenny Tower is the brainchild of Allistair Tenpenny, a British refugee who came to the Capital Wasteland seeking his fortune."),
 		LUCKY38(		"Lucky 38",			"My guess? Leads to a big cashout at some casino - and if the \"38\" on it is any indication... well... Lucky 38 it is."),
 		SIERRAMADRE(	"Sierra Madre",		"It's the moment you've been waiting for, the reason we're all here - the Gala Event, the Grand Opening of the Sierra Madre Casino."),
-		PRYDWEN(		"Prydwen",			"People of the Commonwealth. Do not interfere. Our intentions are peaceful. We are the Brotherhood of Steel.");
+		PRYDWEN(		"The Prydwen",		"People of the Commonwealth. Do not interfere. Our intentions are peaceful. We are the Brotherhood of Steel.");
 		
 		public String label;
 		public String inscription;

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

@@ -50,6 +50,7 @@ public class WorldConfig {
 	public static int bedrockFluoriteSpawn = 50;
 	public static int bedrockRedstoneSpawn = 50;
 	public static int bedrockRareEarthSpawn = 50;
+	public static int bedrockBauxiteSpawn = 100;
 	public static int bedrockGlowstoneSpawn = 100;
 	public static int bedrockPhosphorusSpawn = 50;
 	public static int bedrockQuartzSpawn = 100;
@@ -170,6 +171,7 @@ public class WorldConfig {
 		bedrockChlorocalciteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B14_bedrockChlorocalciteWeight", "Spawn weight for chlorocalcite bedrock ore", 35);
 		bedrockNeodymiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B15_bedrockNeodymiumWeight", "Spawn weight for neodymium bedrock ore", 50);
 		bedrockRareEarthSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B16_bedrockRareEarthWeight", "Spawn weight for rare earth bedrock ore", 50);
+		bedrockBauxiteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B17_bedrockBauxiteWeight", "Spawn weight for bauxite bedrock ore", 100);
 
 		bedrockGlowstoneSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN00_bedrockGlowstoneWeight", "Spawn weight for glowstone bedrock ore", 100);
 		bedrockPhosphorusSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN01_bedrockPhosphorusWeight", "Spawn weight for phosphorus bedrock ore", 50);

src/main/java/com/hbm/inventory/recipes/MixerRecipes.java

@@ -50,7 +50,11 @@ public class MixerRecipes extends SerializableRecipe {
 		register(Fluids.SUNFLOWEROIL, new MixerRecipe(100, 50).setSolid(new ComparableStack(Blocks.double_plant, 1, 0)));
 		register(Fluids.FULLERENE, new MixerRecipe(250, 50).setStack1(new FluidStack(Fluids.RADIOSOLVENT, 500)).setSolid(new ComparableStack(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.SOOT))));
 
-		register(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)));
+		register(Fluids.SOLVENT,
+				new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)),
+				new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_CRACK, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)),
+				new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_DS, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)),
+				new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_COKER, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)));
 		register(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust())));
 		register(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust())));
 		register(Fluids.RADIOSOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)));

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 (4880)";
+	public static final String VERSION = "1.0.27 BETA (4895)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/render/tileentity/RenderSnowglobe.java

@@ -12,6 +12,7 @@ import com.hbm.render.loader.HFRWavefrontObject;
 import com.hbm.util.EnumUtil;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.Item;
@@ -25,6 +26,7 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR
 	
 	public static final IModelCustom snowglobe = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/trinkets/snowglobe.obj"), false).asDisplayList();
 	public static final ResourceLocation socket = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/snowglobe.png");
+	public static final ResourceLocation glass = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/snowglobe_glass.png");
 	public static final ResourceLocation features = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/snowglobe_features.png");
 	public static RenderBlocks renderer = new RenderBlocks();
 
@@ -46,12 +48,15 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR
 		GL11.glEnable(GL11.GL_LIGHTING);
 		GL11.glEnable(GL12.GL_RESCALE_NORMAL);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
+		GL11.glDisable(GL11.GL_CULL_FACE);
 		
 		double scale = 0.0625D;
 		GL11.glScaled(scale, scale, scale);
-		
+
 		Minecraft.getMinecraft().getTextureManager().bindTexture(socket);
 		snowglobe.renderPart("Socket");
+		Minecraft.getMinecraft().getTextureManager().bindTexture(glass);
+		snowglobe.renderPart("Glass");
 		
 		Minecraft.getMinecraft().getTextureManager().bindTexture(features);
 		
@@ -59,14 +64,28 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR
 		case NONE: break;
 		case RIVETCITY:		snowglobe.renderPart("RivetCity"); break;
 		case TENPENNYTOWER:	snowglobe.renderPart("TenpennyTower"); break;
-		case LUCKY38:		snowglobe.renderPart("Lucky38_Plane"); break;
+		case LUCKY38:		snowglobe.renderPart("Lucky38"); break;
 		case SIERRAMADRE:	snowglobe.renderPart("SierraMadre"); break;
 		case PRYDWEN:		snowglobe.renderPart("Prydwen"); break;
 		default: break;
 		}
 
+		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glDisable(GL12.GL_RESCALE_NORMAL);
 		GL11.glShadeModel(GL11.GL_FLAT);
+
+		GL11.glDisable(GL11.GL_LIGHTING);
+		FontRenderer font = Minecraft.getMinecraft().fontRenderer;
+		float f3 = 0.05F;
+		GL11.glTranslated(4.025, 0.5, 0);
+		GL11.glScalef(f3, -f3, f3);
+		GL11.glTranslated(0, -font.FONT_HEIGHT / 2F, font.getStringWidth(type.label) * 0.5D);
+		GL11.glRotatef(90, 0, 1, 0);
+		GL11.glDepthMask(false);
+		GL11.glTranslatef(0, 1, 0);
+		font.drawString(type.label, 0, 0, 0xffffff);
+		GL11.glDepthMask(true);
+		GL11.glEnable(GL11.GL_LIGHTING);
 	}
 
 	@Override
@@ -78,8 +97,8 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR
 	public IItemRenderer getRenderer() {
 		return new ItemRenderBase() {
 			public void renderInventory() {
-				GL11.glTranslated(0, -4, 0);
-				GL11.glScaled(10, 10, 10);
+				GL11.glTranslated(0, -2, 0);
+				GL11.glScaled(6, 6, 6);
 			}
 			public void renderCommonWithStack(ItemStack item) {
 				GL11.glTranslated(0, 0.25, 0);

src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityBat;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -29,7 +30,7 @@ public class TileEntityLandmine extends TileEntity {
 		double range = landmine.range;
 		double height = landmine.height;
 
-		if (waitingForPlayer) {
+		if(waitingForPlayer) {
 			range = 25;
 			height = 25;
 		} else if(!isPrimed) {
@@ -42,6 +43,7 @@ public class TileEntityLandmine extends TileEntity {
 			AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - height, zCoord - range, xCoord + range + 1, yCoord + height, zCoord + range + 1));
 
 		for(Object o : list) {
+			if(o instanceof EntityBat) continue;
 			if(waitingForPlayer) {
 				// This mine has been generated by worldgen and is ignoring mobs until a player is close enough
 				// This is to prevent worldgen mines from detonating well before they become gameplay relevant

src/main/java/com/hbm/tileentity/machine/TileEntityCustomMachine.java

@@ -438,7 +438,7 @@ public class TileEntityCustomMachine extends TileEntityMachinePolluting implemen
 		if(this.config.itemInCount > 2) return new int[] { 4, 5, 6, 16, 17, 18, 19, 20, 21 };
 		if(this.config.itemInCount > 1) return new int[] { 4, 5, 16, 17, 18, 19, 20, 21 };
 		if(this.config.itemInCount > 0) return new int[] { 4, 16, 17, 18, 19, 20, 21 };
-		return new int[] { };
+		return new int[] { 16, 17, 18, 19, 20, 21 };
 	}
 
 	@Override

src/main/java/com/hbm/world/feature/BedrockOre.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import com.hbm.blocks.BlockEnums.EnumStoneType;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockBedrockOreTE.TileEntityBedrockOre;
 import com.hbm.config.WorldConfig;
@@ -29,23 +30,24 @@ public class BedrockOre {
 	public static HashMap<String, BedrockOreDefinition> replacements = new HashMap();
 	
 	public static void init() {
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.IRON,											1),													WorldConfig.bedrockIronSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.COPPER,										1),													WorldConfig.bedrockCopperSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.BORAX,											3,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockBoraxSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.CHLOROCALCITE,									3,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockChlorocalciteSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.ASBESTOS,										2),													WorldConfig.bedrockAsbestosSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NIOBIUM,										2,	new FluidStack(Fluids.ACID, 500)),				WorldConfig.bedrockNiobiumSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NEODYMIUM,										3,	new FluidStack(Fluids.ACID, 500)),				WorldConfig.bedrockNeodymiumSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TITANIUM,										2,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockTitaniumSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TUNGSTEN,										2,	new FluidStack(Fluids.ACID, 500)),				WorldConfig.bedrockTungstenSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.GOLD,											1),													WorldConfig.bedrockGoldSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.URANIUM,										4,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockUraniumSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.THORIUM,										4,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockThoriumSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.FLUORITE,										1),													WorldConfig.bedrockFluoriteSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.coal, 8),									1,	0x202020),										WorldConfig.bedrockCoalSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(ModItems.niter, 4),								2,	0x808080,	new FluidStack(Fluids.ACID, 500)),	WorldConfig.bedrockNiterSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.redstone, 4),								1,	0xd01010),										WorldConfig.bedrockRedstoneSpawn);
-		registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE),	2,	0x8F9999,	new FluidStack(Fluids.ACID, 500)),	WorldConfig.bedrockRedstoneSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.IRON,													1),													WorldConfig.bedrockIronSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.COPPER,												1),													WorldConfig.bedrockCopperSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.BORAX,													3,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockBoraxSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.CHLOROCALCITE,											3,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockChlorocalciteSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.ASBESTOS,												2),													WorldConfig.bedrockAsbestosSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NIOBIUM,												2,	new FluidStack(Fluids.ACID, 500)),				WorldConfig.bedrockNiobiumSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NEODYMIUM,												3,	new FluidStack(Fluids.ACID, 500)),				WorldConfig.bedrockNeodymiumSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TITANIUM,												2,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockTitaniumSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TUNGSTEN,												2,	new FluidStack(Fluids.ACID, 500)),				WorldConfig.bedrockTungstenSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.GOLD,													1),													WorldConfig.bedrockGoldSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.URANIUM,												4,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockUraniumSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.THORIUM,												4,	new FluidStack(Fluids.SULFURIC_ACID, 500)),		WorldConfig.bedrockThoriumSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.FLUORITE,												1),													WorldConfig.bedrockFluoriteSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.coal, 8),											1,	0x202020),										WorldConfig.bedrockCoalSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(ModItems.niter, 4),										2,	0x808080,	new FluidStack(Fluids.ACID, 500)),	WorldConfig.bedrockNiterSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.redstone, 4),										1,	0xd01010),										WorldConfig.bedrockRedstoneSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE),			2,	0x8F9999,	new FluidStack(Fluids.ACID, 500)),	WorldConfig.bedrockRareEarthSpawn);
+		registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE, 2),1,	0xEF7213),										WorldConfig.bedrockBauxiteSpawn);
 
 		registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.glowstone_dust, 4),		1,	0xF9FF4D),							WorldConfig.bedrockGlowstoneSpawn);
 		registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(ModItems.powder_fire, 4),		1,	0xD7341F),							WorldConfig.bedrockPhosphorusSpawn);

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

@@ -144,7 +144,7 @@ public class MapGenNTMFeatures extends MapGenStructure {
 					this.components.add(ruin4);
 				}
 				
-			} else if(biome.heightVariation <= 0.25F && rand.nextInt(15) == 0) { //for now our only restriction is kinda-flat biomes. that and chance might change idk
+			} 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
 				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/resources/assets/hbm/lang/de_DE.lang

@@ -4523,6 +4523,10 @@ tile.solar_mirror.name=Heliostatspiegel
 tile.soyuz_capsule.name=Landekapsel
 tile.soyuz_launcher.name=Soyuz-Startplatform
 tile.spikes.name=Stacheln
+tile.snowglobe.name=Schneekugel
+tile.spotlight_incandescent.name=Käfiglampe
+tile.spotlight_fluoro.name=Leuchtstoffröhre
+tile.spotlight_halogen.name=Halogen-Flutlicht
 tile.stalactite.asbestos.name=Asbest-Stalaktit
 tile.stalactite.sulfur.name=Schwefelhaltiger Stalaktit
 tile.stalagmite.asbestos.name=Asbest-Stalagmit

src/main/resources/assets/hbm/lang/en_US.lang

@@ -5086,9 +5086,6 @@ tile.lamp_tritium_green_off.name=Green Tritium Lamp
 tile.lamp_tritium_green_on.name=Green Tritium Lamp
 tile.lantern.name=Lantern
 tile.lantern_behemoth.name=Old Lantern
-tile.spotlight_incandescent.name=Cage Lamp
-tile.spotlight_fluoro.name=Fluorescent Light
-tile.spotlight_halogen.name=Halogen Floodlight
 tile.launch_pad.name=Silo Launch Pad
 tile.launch_pad_large.name=Launch Pad
 tile.launch_table.name=Large Launch Pad
@@ -5535,6 +5532,10 @@ tile.solar_mirror.name=Heliostat Mirror
 tile.soyuz_capsule.name=Cargo Landing Capsule
 tile.soyuz_launcher.name=Soyuz Launch Platform
 tile.spikes.name=Spikes
+tile.snowglobe.name=Snowglobe
+tile.spotlight_incandescent.name=Cage Lamp
+tile.spotlight_fluoro.name=Fluorescent Light
+tile.spotlight_halogen.name=Halogen Floodlight
 tile.stalactite.asbestos.name=Asbestos Stalactite
 tile.stalactite.sulfur.name=Sulfurous Stalactite
 tile.stalagmite.asbestos.name=Asbestos Stalagmite