diff --git a/changelog b/changelog index bbf650d9c..b1aec00f0 100644 --- a/changelog +++ b/changelog @@ -1,33 +1,4 @@ ## Changed -* Material autogen now creates redstone in ingot form, allowing smaller than block quantities to be cast -* Removed the ancient ZPE blocks -* Drone hitboxes are now way smaller, which should cause them to get stuck when flying less -* The new FENSU now keeps its charge and installed muffler when broken -* Battery sockets are now compatible with comparator output -* Battery sockets now have a tooltip when a battery pack is installed -* Sef-charging batteries have been reworked - * They are now a new item with metadata (legacy ones still work) - * The base form is an empty selfcharger which is filled with two billets of material, i.e. no more upgrade recipes - * There are a few new variants like cobalt-60 and gold-198 - * New selfchargers have a model when plugged into a battery socket - * Selfchargers are a fair bit weaker than their old counterparts, but substantially cheaper too -* Old batteries now have the "LEGACY" tag -* Pneumatic pipe networks with multiple outputs, especially filtered ones, should now have much better throughput due to not constantly failing to send items in round robin mode -* The [N] calculator window now shows a history of previous operations -* Simplified the cyclotron recipe - -## Fixed -* Fixed the FEnSU, cyclotron and reliant robin missile being uncraftable due to stacksize limitations - * The system for detecting impossible recipe has been improved, instead of a fixed 64 item limit, it now uses the actual limit of the item (or 64 for ore dictionary inputs) -* Fixed yet another issue regarding addon fluids breaking on recipe reload -* Fixed YET ANOTHER issue regarding crates, AGAIN -* Fixed a rare issue where the fusion reactor could have negative fuel -* Fixed battery socket priority tooltip offset -* Fixed enchantability on many armor sets being incorrect - * Most power armors are intended to not be enchantable at all -* Fixed crash caused by the balefire bomb -* Fixed JSON gun reload animations becoming faster and faster with the trenchmaster set -* Fixed heat transfer rate labels on the boilers and coker unit being off by a magnitude of 10 -* Fixed crucible not having a heat transfer rate tooltip -* Fixed certain heliostat mirror rotations not showing the mirror -* Fixed chopper recipe creating eight choppers instead of one \ No newline at end of file +* Rad absorbers now use metadata, existing blocks will be converted automatically +* Fissure bombs that go off in crater biomes now create fissures with metadata 1 which creates radioactive volcanic lava + * If a crater biome is created on top of an existing fissue, it will keep producing normal volcanic lava \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index eaebd6f2b..ecf0b1879 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -2342,7 +2342,7 @@ public class ModBlocks { rad_absorber = new BlockAbsorber(Material.iron).setBlockName("rad_absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); decon = new BlockDecon(Material.iron).setBlockName("decon").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":decon_side"); - if (Loader.isModLoaded("OpenComputers")) { + if(Loader.isModLoaded("OpenComputers")) { oc_cable_paintable = new BlockOpenComputersCablePaintable().setBlockName("oc_cable_paintable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); } @@ -3612,15 +3612,15 @@ public class ModBlocks { } // Is this block a special structure handling block, so we can ignore it for blacklist selection, etc. - public static boolean isStructureBlock(Block block, boolean includeAir) { - if(block == null) return false; - if(block == wand_air) return includeAir; + public static boolean isStructureBlock(Block block, boolean includeAir) { + if(block == null) return false; + if(block == wand_air) return includeAir; if(block == wand_structure) return true; - if(block == wand_jigsaw) return true; - if(block == wand_logic) return true; - if(block == wand_tandem) return true; - if(block == wand_loot) return true; - return false; - } + if(block == wand_jigsaw) return true; + if(block == wand_logic) return true; + if(block == wand_tandem) return true; + if(block == wand_loot) return true; + return false; + } } diff --git a/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java b/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java index ca67eee3a..871c75293 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java @@ -3,6 +3,7 @@ package com.hbm.blocks.bomb; import com.hbm.blocks.ModBlocks; import com.hbm.entity.item.EntityTNTPrimedBase; import com.hbm.explosion.ExplosionNukeSmall; +import com.hbm.world.biome.BiomeGenCraterBase; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -16,6 +17,8 @@ public class BlockFissureBomb extends BlockTNTBase { int range = 5; + boolean crater = world.getBiomeGenForCoords((int) Math.floor(x), (int) Math.floor(z)) instanceof BiomeGenCraterBase; + for(int i = -range; i <= range; i++) { for(int j = -range; j <= range; j++) { for(int k = -range; k <= range; k++) { @@ -27,7 +30,7 @@ public class BlockFissureBomb extends BlockTNTBase { Block block = world.getBlock(a, b, c); if(block == ModBlocks.ore_bedrock) { - world.setBlock(a, b, c, ModBlocks.ore_volcano); + world.setBlock(a, b, c, ModBlocks.ore_volcano, crater ? 1 : 0, 3); } else if(block == ModBlocks.ore_bedrock_oil) { world.setBlock(a, b, c, Blocks.bedrock); } diff --git a/src/main/java/com/hbm/blocks/generic/BlockFissure.java b/src/main/java/com/hbm/blocks/generic/BlockFissure.java index 0f1dea15a..0b6904337 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockFissure.java +++ b/src/main/java/com/hbm/blocks/generic/BlockFissure.java @@ -55,7 +55,8 @@ public class BlockFissure extends BlockContainer implements IBlockMultiPass { @Override public void updateTick(World world, int x, int y, int z, Random rand) { - if(world.getBlock(x, y + 1, z).isReplaceable(world, x, y + 1, z)) world.setBlock(x, y + 1, z, ModBlocks.volcanic_lava_block); + boolean crater = world.getBlockMetadata(x, y, z) != 0; + if(world.getBlock(x, y + 1, z).isReplaceable(world, x, y + 1, z)) world.setBlock(x, y + 1, z, crater ? ModBlocks.rad_lava_block : ModBlocks.volcanic_lava_block); } @Override