diff --git a/changelog b/changelog index 4e94783ae..da1014a41 100644 --- a/changelog +++ b/changelog @@ -1,26 +1,8 @@ -## Added -* ICF pellet maker - * Can create custom ICF fuel pellets - * Pellets use binary fuels, meaning they need two different fluids, two different solids or a solid and a fluid - * Optionally, the pellet maker can accept muon capsules, each capsule can add muons to up to 16 pellets, reducing the laser input requirement - * Fuels currently only have default stats, custom stats will be added in the future - ## Changed -* To make balancing easier, ICFs will only directly convert 25% of incoming laser heat into output heat when there is no fuel pellet loaded, meaning when using fuel, direct heating does not apply -* The ICF should now display its relevant values using Energy Control screens -* Sodium and calcium are now valid crucible materials -* All RBMK models that render as TESRs now use VBOs which should make them somewhat less laggy -* Blocks like explosive charges, radioactive barrels and so on which used to explode instantly when destroyed by another explosion, now behave more like TNT, spawning a primed version of the block that is knocked back by the initial explosion - * This fixes an issue where spamming too many blocks like that could potentially crash servers - * Most explosives go off after a short delay, flammable barrels however will explode on impact -* Removed unused permanent wings -* Added recipes to the ICF parts, the ICF can now be made in survival mode (recipes are still subject to change) +* Updated russian localization +* Nerfed conventional explosives (dynamite, TNT, semtex, C4) in order to not outclass small nukes +* Plastic explosive blocks no longer drop and blocks ## Fixed -* Fixed ICF laser parts being considered valid when bordering an otherwise invalid dependency block -* Fixed soyuz launcher NEI recipe showing the wrong amount of items -* Fixed infinite xp exploit by constantly smelting and cooling things like meteorite ingots -* Fixed centrifuge speed upgrade tooltip -* Fixed smokestacks not working with a lot of machines -* Fixed soot values being completely off for most machines -* Fixed glyphid scouts not spawning in the daylight in rampant mode \ No newline at end of file +* Fixed missing localization for meteorite ores +* Removed the starmetal crystallization recipe, despite starmetal ore no longer existing diff --git a/src/main/java/com/hbm/blocks/bomb/BlockC4.java b/src/main/java/com/hbm/blocks/bomb/BlockC4.java index 6fd3ce025..9486c40e4 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockC4.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockC4.java @@ -8,6 +8,6 @@ public class BlockC4 extends BlockTNTBase { @Override public void explodeEntity(World world, double x, double y, double z, EntityTNTPrimedBase entity) { - world.createExplosion(entity, x, y, z, 26F, true); + world.createExplosion(entity, x, y, z, 15F, true); } } diff --git a/src/main/java/com/hbm/blocks/bomb/BlockPlasticExplosive.java b/src/main/java/com/hbm/blocks/bomb/BlockPlasticExplosive.java index b67d4d595..a9be990fc 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockPlasticExplosive.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockPlasticExplosive.java @@ -1,8 +1,8 @@ package com.hbm.blocks.bomb; import com.hbm.entity.item.EntityTNTPrimedBase; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNT; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.standard.BlockProcessorStandard; import com.hbm.interfaces.IBomb; import cpw.mods.fml.relauncher.Side; @@ -78,8 +78,7 @@ public class BlockPlasticExplosive extends BlockDetonatable implements IBomb { public BombReturnCode explode(World world, int x, int y, int z) { if(!world.isRemote) { - new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 50).overrideResolution(64).explode(); - ExplosionLarge.spawnParticles(world, x, y, z, ExplosionLarge.cloudFunction(15)); + new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 20).makeStandard().setBlockProcessor(new BlockProcessorStandard().setNoDrop()).explode(); } return BombReturnCode.DETONATED; diff --git a/src/main/java/com/hbm/blocks/bomb/BlockSemtex.java b/src/main/java/com/hbm/blocks/bomb/BlockSemtex.java index b921891b9..df0b3ba26 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockSemtex.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockSemtex.java @@ -8,6 +8,6 @@ public class BlockSemtex extends BlockTNTBase { @Override public void explodeEntity(World world, double x, double y, double z, EntityTNTPrimedBase entity) { - world.createExplosion(entity, x, y, z, 20F, true); + world.createExplosion(entity, x, y, z, 12F, true); } } diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTNT.java b/src/main/java/com/hbm/blocks/bomb/BlockTNT.java index ddb8fdbb5..5dd5219d7 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockTNT.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockTNT.java @@ -8,6 +8,6 @@ public class BlockTNT extends BlockTNTBase { @Override public void explodeEntity(World world, double x, double y, double z, EntityTNTPrimedBase entity) { - world.createExplosion(entity, x, y, z, 12F, true); + world.createExplosion(entity, x, y, z, 10F, true); } } diff --git a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java index 95f88f353..8a14ed96f 100644 --- a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java @@ -72,7 +72,7 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(PB.ore(), new CrystallizerRecipe(ModItems.crystal_lead, baseTime)); registerRecipe(SA326.ore(), new CrystallizerRecipe(ModItems.crystal_schrabidium, baseTime), sulfur); registerRecipe(LI.ore(), new CrystallizerRecipe(ModItems.crystal_lithium, baseTime), sulfur); - registerRecipe(STAR.ore(), new CrystallizerRecipe(ModItems.crystal_starmetal, baseTime), sulfur); + //registerRecipe(STAR.ore(), new CrystallizerRecipe(ModItems.crystal_starmetal, baseTime), sulfur); registerRecipe(CO.ore(), new CrystallizerRecipe(ModItems.crystal_cobalt, baseTime), sulfur); registerRecipe("oreRareEarth", new CrystallizerRecipe(ModItems.crystal_rare, baseTime), sulfur); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java index 3ee61d608..c4e930c6d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java @@ -99,7 +99,7 @@ public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider if(slots[5] != null && slots[5].getItem() == ModItems.icf_pellet) { if(ItemICFPellet.getFusingDifficulty(slots[5]) <= this.laser) { this.heatup = ItemICFPellet.react(slots[5], this.laser); - this.heat += heat; + this.heat += heatup; if(ItemICFPellet.getDepletion(slots[5]) >= ItemICFPellet.getMaxDepletion(slots[5])) { slots[5] = new ItemStack(ModItems.icf_pellet_depleted); markDirty = true; diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index cabde0f6a..9b1629a20 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -4366,6 +4366,11 @@ tile.ore_gneiss_uranium.name=Schiefer-Uranerz tile.ore_gneiss_uranium_scorched.name=Verschmortes Schiefer-Uranerz tile.ore_lead.name=Bleierz tile.ore_lignite.name=Braunkohleerz +tile.ore_meteor.aluminium.name=Meteoriten-Aluminiumerz +tile.ore_meteor.cobalt.name=Meteoriten-Kobalterz +tile.ore_meteor.copper.name=Meteoriten-Kupfererz +tile.ore_meteor.iron.name=Meteoriten-Eisenerz +tile.ore_meteor.rareearth.name=Meteoriten-Seltenerdenerz tile.ore_meteor_aluminium.name=Meteoriten-Aluminiumerz tile.ore_meteor_copper.name=Meteoriten-Kupfererz tile.ore_meteor_lead.name=Meteoriten-Bleierz diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e09490ab8..f12535574 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5431,6 +5431,11 @@ tile.ore_gneiss_uranium.name=Schist Uranium Ore tile.ore_gneiss_uranium_scorched.name=Scorched Schist Uranium Ore tile.ore_lead.name=Lead Ore tile.ore_lignite.name=Lignite Ore +tile.ore_meteor.aluminium.name=Meteor Aluminium Ore +tile.ore_meteor.cobalt.name=Meteor Cobalt Ore +tile.ore_meteor.copper.name=Meteor Copper Ore +tile.ore_meteor.iron.name=Meteor Iron Ore +tile.ore_meteor.rareearth.name=Meteor Rare Earth Ore tile.ore_meteor_aluminium.name=Meteor Aluminium Ore tile.ore_meteor_copper.name=Meteor Copper Ore tile.ore_meteor_lead.name=Meteor Lead Ore diff --git a/src/main/resources/assets/hbm/textures/items/circuit.advanced.png b/src/main/resources/assets/hbm/textures/items/circuit.advanced.png new file mode 100644 index 000000000..9a63ae15f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.advanced.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.basic.png b/src/main/resources/assets/hbm/textures/items/circuit.basic.png new file mode 100644 index 000000000..3de11aab1 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.basic.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.png b/src/main/resources/assets/hbm/textures/items/circuit.png index ea79ff8ec..c6ab4fd6e 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.png and b/src/main/resources/assets/hbm/textures/items/circuit.png differ