From 6865f59519ded1d3bac1db0bbca3827879fa4947 Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 16 Jan 2024 15:51:24 +0100 Subject: [PATCH] small foxes --- changelog | 28 ++----------------- .../hbm/entity/effect/EntityFalloutRain.java | 2 +- .../com/hbm/inventory/OreDictManager.java | 2 +- .../entity/rocket/RenderMissileNuclear.java | 1 + 4 files changed, 6 insertions(+), 27 deletions(-) diff --git a/changelog b/changelog index 4ed8554c2..0743f38db 100644 --- a/changelog +++ b/changelog @@ -1,27 +1,5 @@ -## Added -* Pipettes - * Precision tools for carrying small amounts of liquids - * Come in three variants, normal, boron (corrosion-resistant) and laboratory (smaller capacity, more precision) - * Unlike most fluid containers, can be partially filled - * Capacity can be changed by right-clicking if the pipette is empty - -## Changed -* Updated russian localization -* There is now a config option to disable the biome change caused by fallout. The config will also determine whether the biomes are registered at all, which prevents them from conflicting with other mods' biomes when disabled. -* Chemical plants now have a timer that starts after loading/unloading fluids using item fluid containers from the input buffers, this creates a delay between switching from loading and unloading, making it possible to retrieve fluids using pipettes. -* In addition to delaying overheats, efficiency upgrades now reduce the cyclotron's coolant demand -* Removed the tooltips from common upgrades, as the info was incomplete and outdated anyway -* Meteorite swords now render their variant glint in first person view -* Meteorite swords are now a lot larger, similar to most other NTM swords -* Non-custom missile items now render in 3D -* Combinator funnels can now be configured whether to only do 3x3, 2x2 or both recipe types ## Fixed -* Fixed trenchmaster armor not doing most of the armor calculation, making it the worst armor -* Fixed glowing mushrooms not being able to be bonemealed -* Fixed strand caster having one port that does not work with certain rotations -* Fixed fallout being able to replace bedrock -* Fixed the upgrade info of the large mining drill being incorrect -* Fixed cyclotron not having the new upgrade info tooltip -* Fixed the large radar not actually having a larger scan range -* Fixed radar blips going out of bounds when using a radar screen with a large radar or a radar with a different config +* Fixed sellafite emerald ore being oredicted as emerald dust +* Fixed fire replacing petrified wood, creating tons of dead trees with holes in them +* Fixed inconsistent scaling with nuclear missiles diff --git a/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java b/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java index 2f59a0408..70ebac3dc 100644 --- a/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java +++ b/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java @@ -178,7 +178,7 @@ public class EntityFalloutRain extends Entity { } if(dist < 65 && b.isFlammable(worldObj, x, y, z, ForgeDirection.UP)) { - if(rand.nextInt(5) == 0) + if(rand.nextInt(5) == 0 && worldObj.getBlock(x, y + 1, z).isAir(worldObj, x, y + 1, z)) setBlock(x, y + 1, z, Blocks.fire); } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index a5ffef0e6..4995290e8 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -315,7 +315,7 @@ public class OreDictManager { LAPIS.dust(powder_lapis); NETHERQUARTZ.gem(Items.quartz).dust(powder_quartz).ore(Blocks.quartz_ore); DIAMOND.dust(powder_diamond).ore(gravel_diamond, ore_sellafield_diamond); - EMERALD.dust(powder_emerald, ore_sellafield_emerald); + EMERALD.dust(powder_emerald).ore(ore_sellafield_emerald); /* * RADIOACTIVE diff --git a/src/main/java/com/hbm/render/entity/rocket/RenderMissileNuclear.java b/src/main/java/com/hbm/render/entity/rocket/RenderMissileNuclear.java index f69443b8f..9282833db 100644 --- a/src/main/java/com/hbm/render/entity/rocket/RenderMissileNuclear.java +++ b/src/main/java/com/hbm/render/entity/rocket/RenderMissileNuclear.java @@ -18,6 +18,7 @@ public class RenderMissileNuclear extends Render { GL11.glPushMatrix(); GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_); + GL11.glScalef(1.5F, 1.5F, 1.5F); GL11.glRotatef(missile.prevRotationYaw + (missile.rotationYaw - missile.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(missile.prevRotationPitch + (missile.rotationPitch - missile.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);