diff --git a/changelog b/changelog index 14c34dd4d..7dadbb87a 100644 --- a/changelog +++ b/changelog @@ -3,6 +3,8 @@ * Electric boilers have been completely removed * Fired boilers no longer have an on-state, GUI or functionality * Fired boilers still sometimes spawn in certain structures as loot, they drop 3-6 steel scraps containing 1 ingot worth of steel each +* The rare earth chunk texture is now consistent with the bedrock ores +* Removed the unused watz control elements ## Fixed * Fixed automatic crafting table filters being broken diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 80a0912aa..ca511e9e3 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -899,7 +899,6 @@ public class ModBlocks { public static Block watz_pump; public static Block watz_element; - public static Block watz_control; public static Block watz_cooler; public static Block watz_end; public static Block watz_conductor; @@ -2010,7 +2009,6 @@ public class ModBlocks { icf_block = new BlockICF(Material.iron).setBlockName("icf_block").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":icf_block"); watz_element = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_element_top").setBlockName("watz_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_element_side"); - watz_control = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_control_top").setBlockName("watz_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_control_side"); watz_cooler = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_cooler_top").setBlockName("watz_cooler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_cooler_side"); watz_end = new BlockToolConversion(Material.iron).addVariant("_bolted").setBlockName("watz_end").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_casing"); watz_conductor = new BlockCableConnect(Material.iron).setBlockName("watz_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":watz_conductor_top"); @@ -3341,7 +3339,6 @@ public class ModBlocks { register(icf); GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName()); - GameRegistry.registerBlock(watz_control, watz_control.getUnlocalizedName()); GameRegistry.registerBlock(watz_cooler, watz_cooler.getUnlocalizedName()); register(watz_end); GameRegistry.registerBlock(watz_conductor, watz_conductor.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/tool/ItemWandD.java b/src/main/java/com/hbm/items/tool/ItemWandD.java index a5135de66..d23f5d5ed 100644 --- a/src/main/java/com/hbm/items/tool/ItemWandD.java +++ b/src/main/java/com/hbm/items/tool/ItemWandD.java @@ -49,7 +49,7 @@ public class ItemWandD extends Item { vnt.setBlockAllocator(new BlockAllocatorStandard(32)); vnt.explode(); - ExplosionCreator.composeEffect(world, pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5, 30, 6.5F, 2F, 65F, 25, 16, 50, 1.25F, 3F, -2F); + ExplosionCreator.composeEffectLarge(world, pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5); /*for(int i = 0; i < 10; i++) { NBTTagCompound data = new NBTTagCompound(); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index cf30eceaa..1ef4d7228 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1345,6 +1345,7 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.machine_boiler_on"); ignoreMappings.add("hbm:tile.machine_boiler_electric_off"); ignoreMappings.add("hbm:tile.machine_boiler_electric_on"); + ignoreMappings.add("hbm:tile.watz_control"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index e9a5a6bfd..03d3100b1 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -3,6 +3,7 @@ package com.hbm.main; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Random; @@ -154,6 +155,8 @@ public class ModEventHandlerClient { public static long flashTimestamp; public static final int shakeDuration = 1_500; public static long shakeTimestamp; + public static List delayedSounds = new ArrayList(); + public static boolean soundLock = false; // for thread safety or some bullshit @SubscribeEvent public void onOverlayRender(RenderGameOverlayEvent.Pre event) { @@ -921,7 +924,7 @@ public class ModEventHandlerClient { static boolean isRenderingItems = false; @SubscribeEvent - public void clentTick(ClientTickEvent event) { + public void clientTick(ClientTickEvent event) { Minecraft mc = Minecraft.getMinecraft(); ArmorNo9.updateWorldHook(mc.theWorld); @@ -1382,6 +1385,23 @@ public class ModEventHandlerClient { client.sendQueue.addToSendQueue(new C0CPacketInput(client.moveStrafing, client.moveForward, client.movementInput.jump, client.movementInput.sneak)); } } + + if(event.phase == event.phase.START) { + + while(soundLock); + soundLock = true; + Iterator it = delayedSounds.iterator(); + + while(it.hasNext()) { + DelayedSound sound = it.next(); + if(sound.delay == 0) { + MainRegistry.proxy.playSoundClient(sound.x, sound.y, sound.z, sound.sound, sound.volume, sound.pitch); + it.remove(); + } + sound.delay--; + } + soundLock = false; + } } @SubscribeEvent @@ -1412,4 +1432,21 @@ public class ModEventHandlerClient { else if(d < 0.2) main.splashText = "Can someone tell me what corrosive fumes the people on Reddit are huffing so I can avoid those more effectively?"; } } + + public static class DelayedSound { + public String sound; + public int delay; + public double x, y, z; + public float volume, pitch; + + public DelayedSound(String sound, int delay, double x, double y, double z, float volume, float pitch) { + this.sound = sound; + this.delay = delay; + this.x = x; + this.y = y; + this.z = z; + this.volume = volume; + this.pitch = pitch; + } + } } diff --git a/src/main/java/com/hbm/particle/helper/ExplosionCreator.java b/src/main/java/com/hbm/particle/helper/ExplosionCreator.java index ed6eddb6c..1eee1591d 100644 --- a/src/main/java/com/hbm/particle/helper/ExplosionCreator.java +++ b/src/main/java/com/hbm/particle/helper/ExplosionCreator.java @@ -2,6 +2,8 @@ package com.hbm.particle.helper; import java.util.Random; +import com.hbm.main.ModEventHandlerClient; +import com.hbm.main.ModEventHandlerClient.DelayedSound; import com.hbm.particle.ParticleDebris; import com.hbm.particle.ParticleMukeWave; import com.hbm.particle.ParticleRocketFlame; @@ -20,8 +22,10 @@ import net.minecraft.world.World; public class ExplosionCreator implements IParticleCreator { + public static final double speedOfSound = (17.15D) * 0.33; + public static void composeEffect(World world, double x, double y, double z, int cloudCount, float cloudScale, float cloudSpeedMult, float waveScale, - int debrisCount, int debrisSize, int debrisRetry, float debrisVelocity, float debrisHorizontalDeviation, float debrisVerticalOffset) { + int debrisCount, int debrisSize, int debrisRetry, float debrisVelocity, float debrisHorizontalDeviation, float debrisVerticalOffset, float soundRange) { NBTTagCompound data = new NBTTagCompound(); data.setString("type", "explosionLarge"); @@ -35,17 +39,18 @@ public class ExplosionCreator implements IParticleCreator { data.setFloat("debrisVelocity", debrisVelocity); data.setFloat("debrisHorizontalDeviation", debrisHorizontalDeviation); data.setFloat("debrisVerticalOffset", debrisVerticalOffset); - IParticleCreator.sendPacket(world, x, y, z, 200, data); + data.setFloat("soundRange", soundRange); + IParticleCreator.sendPacket(world, x, y, z, Math.max(200, (int) soundRange), data); } /** Downscaled for small bombs */ - public static void composeEffectSmall(World world, double x, double y, double z) { composeEffect(world, x, y, z, 10, 2F, 0.5F, 25F, 5, 8, 20, 0.75F, 1F, -2F); } + public static void composeEffectSmall(World world, double x, double y, double z) { composeEffect(world, x, y, z, 10, 2F, 0.5F, 25F, 5, 8, 20, 0.75F, 1F, -2F, 150); } /** Development version */ - public static void composeEffectStandard(World world, double x, double y, double z) { composeEffect(world, x, y, z, 15, 5F, 1F, 45F, 10, 16, 50, 1F, 3F, -2F); } + public static void composeEffectStandard(World world, double x, double y, double z) { composeEffect(world, x, y, z, 15, 5F, 1F, 45F, 10, 16, 50, 1F, 3F, -2F, 200); } /** Upscaled version, ATACMS go brrt */ - public static void composeEffectLarge(World world, double x, double y, double z) { composeEffect(world, x, y, z, 30, 6.5F, 2F, 65F, 25, 16, 50, 1.25F, 3F, -2F); } + public static void composeEffectLarge(World world, double x, double y, double z) { composeEffect(world, x, y, z, 30, 6.5F, 2F, 65F, 25, 16, 50, 1.25F, 3F, -2F, 350); } @Override @SideOnly(Side.CLIENT) @@ -61,6 +66,17 @@ public class ExplosionCreator implements IParticleCreator { float debrisVelocity = data.getFloat("debrisVelocity"); float debrisHorizontalDeviation = data.getFloat("debrisHorizontalDeviation"); float debrisVerticalOffset = data.getFloat("debrisVerticalOffset"); + float soundRange = data.getFloat("soundRange"); + + float dist = (float) player.getDistance(x, y, z); + + if(dist <= soundRange) { + while(ModEventHandlerClient.soundLock); + ModEventHandlerClient.soundLock = true; + String sound = dist <= soundRange * 0.33 ? "hbm:weapon.explosionLargeNear" : "hbm:weapon.explosionLargeFar"; + ModEventHandlerClient.delayedSounds.add(new DelayedSound(sound, (int) (dist / speedOfSound), x, y, z, 1000F, 1F)); + ModEventHandlerClient.soundLock = false; + } // WAVE ParticleMukeWave wave = new ParticleMukeWave(man, world, x, y + 2, z); diff --git a/src/main/resources/assets/hbm/sounds.json b/src/main/resources/assets/hbm/sounds.json index 6e79c347f..001fbd52e 100644 --- a/src/main/resources/assets/hbm/sounds.json +++ b/src/main/resources/assets/hbm/sounds.json @@ -210,6 +210,8 @@ "weapon.44Shoot": {"category": "player", "sounds": [{"name": "weapon/44Shoot", "stream": false}]}, "weapon.trainImpact": {"category": "player", "sounds": [{"name": "weapon/trainImpact", "stream": false}]}, "weapon.nuclearExplosion": {"category": "player", "sounds": [{"name": "weapon/nuclearExplosion", "stream": true}]}, + "weapon.explosionLargeNear": {"category": "player", "sounds": [{"name": "weapon/explosionLargeNear", "stream": false}]}, + "weapon.explosionLargeFar": {"category": "player", "sounds": [{"name": "weapon/explosionLargeFar", "stream": false}]}, "weapon.dFlash": {"category": "player", "sounds": [{"name": "weapon/dFlash", "stream": false}]}, diff --git a/src/main/resources/assets/hbm/sounds/weapon/explosionLargeFar.ogg b/src/main/resources/assets/hbm/sounds/weapon/explosionLargeFar.ogg new file mode 100644 index 000000000..c4b2d42d9 Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/weapon/explosionLargeFar.ogg differ diff --git a/src/main/resources/assets/hbm/sounds/weapon/explosionLargeNear.ogg b/src/main/resources/assets/hbm/sounds/weapon/explosionLargeNear.ogg new file mode 100644 index 000000000..693814cc6 Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/weapon/explosionLargeNear.ogg differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_front.png b/src/main/resources/assets/hbm/textures/blocks/battery_front.png deleted file mode 100644 index fe0c31d47..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_front.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_front_alt_old.png b/src/main/resources/assets/hbm/textures/blocks/battery_front_alt_old.png deleted file mode 100644 index fbece0fca..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_front_alt_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_front_old.png b/src/main/resources/assets/hbm/textures/blocks/battery_lithium_front_old.png deleted file mode 100644 index b18f7ac1a..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_front_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_side_old.png b/src/main/resources/assets/hbm/textures/blocks/battery_lithium_side_old.png deleted file mode 100644 index 8bba4f3e0..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_side_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_schrabidium_front_old.png b/src/main/resources/assets/hbm/textures/blocks/battery_schrabidium_front_old.png deleted file mode 100644 index f5e3084b2..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_schrabidium_front_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_side.png b/src/main/resources/assets/hbm/textures/blocks/battery_side.png deleted file mode 100644 index 7cfad2e99..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_side_alt_old.png b/src/main/resources/assets/hbm/textures/blocks/battery_side_alt_old.png deleted file mode 100644 index f46168c55..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_side_alt_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front.png deleted file mode 100644 index a780a61f3..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_alt.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_alt.png deleted file mode 100644 index 3aa01340e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_lit.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_lit.png deleted file mode 100644 index 6fade7b2d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_lit.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_lit_alt.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_lit_alt.png deleted file mode 100644 index b1414c365..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_electric_front_lit_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_front_lit.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_front_lit.png deleted file mode 100644 index f396630df..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_front_lit.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear.png deleted file mode 100644 index 6acf56292..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear_front.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear_front.png deleted file mode 100644 index ca198b3a0..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear_front.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear_front_lit.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear_front_lit.png deleted file mode 100644 index 751b376da..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_nuclear_front_lit.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_port.png b/src/main/resources/assets/hbm/textures/blocks/machine_boiler_port.png deleted file mode 100644 index 33be7b5a9..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_boiler_port.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_circuit_0.png b/src/main/resources/assets/hbm/textures/blocks/siege_circuit_0.png deleted file mode 100644 index 96f6f25ac..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_circuit_0.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_circuit_1.png b/src/main/resources/assets/hbm/textures/blocks/siege_circuit_1.png deleted file mode 100644 index 279ab42d3..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_circuit_1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_emergency.png b/src/main/resources/assets/hbm/textures/blocks/siege_emergency.png deleted file mode 100644 index 863212255..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_emergency.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_hole.png b/src/main/resources/assets/hbm/textures/blocks/siege_hole.png deleted file mode 100644 index 143933a9d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_hole.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_internal_0.png b/src/main/resources/assets/hbm/textures/blocks/siege_internal_0.png deleted file mode 100644 index 37846308d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_internal_0.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_internal_1.png b/src/main/resources/assets/hbm/textures/blocks/siege_internal_1.png deleted file mode 100644 index 895b906d9..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_internal_1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_shield_0.png b/src/main/resources/assets/hbm/textures/blocks/siege_shield_0.png deleted file mode 100644 index efaf1e1e8..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_shield_0.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_shield_1.png b/src/main/resources/assets/hbm/textures/blocks/siege_shield_1.png deleted file mode 100644 index 1a35293f2..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_shield_1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_shield_2.png b/src/main/resources/assets/hbm/textures/blocks/siege_shield_2.png deleted file mode 100644 index ca6a2d46d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_shield_2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_shield_3.png b/src/main/resources/assets/hbm/textures/blocks/siege_shield_3.png deleted file mode 100644 index 02d3213f8..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_shield_3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/siege_shield_overlay_66_ue.png b/src/main/resources/assets/hbm/textures/blocks/siege_shield_overlay_66_ue.png deleted file mode 100644 index 2e32a639d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/siege_shield_overlay_66_ue.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_computer.png b/src/main/resources/assets/hbm/textures/blocks/watz_computer.png deleted file mode 100644 index c23c3b1a6..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_computer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_conductor_side.png b/src/main/resources/assets/hbm/textures/blocks/watz_conductor_side.png deleted file mode 100644 index a7df37615..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_conductor_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_conductor_top.png b/src/main/resources/assets/hbm/textures/blocks/watz_conductor_top.png deleted file mode 100644 index 9278e278b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_conductor_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_control_side.png b/src/main/resources/assets/hbm/textures/blocks/watz_control_side.png deleted file mode 100644 index d0e20342b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_control_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_control_top.png b/src/main/resources/assets/hbm/textures/blocks/watz_control_top.png deleted file mode 100644 index f7c304a84..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_control_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/bedrock_ore.png b/src/main/resources/assets/hbm/textures/items/bedrock_ore.png index 1de4e8d85..470039b33 100644 Binary files a/src/main/resources/assets/hbm/textures/items/bedrock_ore.png and b/src/main/resources/assets/hbm/textures/items/bedrock_ore.png differ diff --git a/src/main/resources/assets/hbm/textures/items/chunk_base.png b/src/main/resources/assets/hbm/textures/items/chunk_base.png index d7e0ed298..dfe887423 100644 Binary files a/src/main/resources/assets/hbm/textures/items/chunk_base.png and b/src/main/resources/assets/hbm/textures/items/chunk_base.png differ diff --git a/src/main/resources/assets/hbm/textures/items/chunk_ore.rare.png b/src/main/resources/assets/hbm/textures/items/chunk_ore.rare.png index ca81964dd..0500f87b4 100644 Binary files a/src/main/resources/assets/hbm/textures/items/chunk_ore.rare.png and b/src/main/resources/assets/hbm/textures/items/chunk_ore.rare.png differ