From fb414ad80a5538a590e1acabfe65a627c0e03a7c Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 27 Feb 2025 16:38:40 +0100 Subject: [PATCH] yes we know your name now fuck off --- changelog | 9 ++++++++- .../com/hbm/items/weapon/sedna/factory/Orchestras.java | 6 +++--- src/main/java/com/hbm/main/ModEventHandlerClient.java | 5 +++++ src/main/resources/META-INF/HBM_at.cfg | 5 ++++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index c010641a1..aeab1a271 100644 --- a/changelog +++ b/changelog @@ -8,10 +8,17 @@ * All mass storage units (except wood) are now substantially cheaper * Reduced base spread for all 12 and 10 gauge buckshot shells from 0.05 to 0.035 * Reduced legendary 12 lever action's spread multiplier from x1.35 to x1.15 +* Bullet casings now spawn with randomized angular velocity +* Bullet casings now correctly bounce off walls, and change angles when bouncing ## Fixed * Fixed an issue where `/ntmreload` would load fluids after recipes, meaning that recipes using newly added fluids would not work correctly, as the fluids don't exist by the time the recipe is loaded * Fixed bedrock coltan being way too common, drowning out almost all other bedrock ores * Fixed rotary furnace not saving its output stack * Fixed strand caster water check being incorrect, creating negative water by allowing operations with insufficient cooling -* Fixed radar not using the small remaining amount of power, causing the animation getting stuck \ No newline at end of file +* Fixed radar not using the small remaining amount of power, causing the animation getting stuck +* Fixed the new system structures being way too common +* Fixed RBMKs losing all their flux when reloading the world +* Fixed issue where DODD fuel item stats would only update when the GUI was open +* Fixed muzzle flashes not being fullbright +* Fixed guns having their name permanently visible over the toolbar \ No newline at end of file diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java index 3a4a66a08..43aac6cfb 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java @@ -382,9 +382,9 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == AnimType.CYCLE) { - if(timer == 2) { + if(timer == 1) { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); - if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.18, -0.06, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 2.5F, 2.5F + (float)entity.getRNG().nextGaussian() * 2F, casing.getName(), true, 60, 0.5D, 20); + if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.21, -0.06, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 2.5F, 2.5F + (float)entity.getRNG().nextGaussian() * 2F, casing.getName(), true, 60, 0.5D, 20); } } if(type == AnimType.CYCLE_DRY) { @@ -1297,7 +1297,7 @@ public class Orchestras { if(timer == 1) { int cba = (stack.getItem() == ModItems.gun_aberrator_eott && ctx.configIndex == 0) ? -1 : 1; SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); - if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? -0.0625 : -0.25D * cba, -0.075, 0.25, 0, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 12.5F, casing.getName()); + if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? -0.0625 : -0.25D * cba, -0.05, 0.25, -0.05 * cba, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 12.5F, casing.getName()); } } diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 3de42e1ca..5272a545a 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -367,6 +367,11 @@ public class ModEventHandlerClient { RenderScreenOverlay.renderScope(resolution, cfg.getScopeTexture(held)); } } + + //prevents NBT changes (read: every fucking tick) on guns from bringing up the item's name over the hotbar + if(held != null && held.getItem() instanceof ItemGunBaseNT && Minecraft.getMinecraft().ingameGUI.highlightingItemStack != null && Minecraft.getMinecraft().ingameGUI.highlightingItemStack.getItem() == held.getItem()) { + Minecraft.getMinecraft().ingameGUI.highlightingItemStack = held; + } /// HANDLE FSB HUD /// ItemStack helmet = player.inventory.armorInventory[3]; diff --git a/src/main/resources/META-INF/HBM_at.cfg b/src/main/resources/META-INF/HBM_at.cfg index 9a2ecc5a5..60e1b0364 100644 --- a/src/main/resources/META-INF/HBM_at.cfg +++ b/src/main/resources/META-INF/HBM_at.cfg @@ -45,4 +45,7 @@ public net.minecraft.client.renderer.ItemRenderer field_78453_b # it public net.minecraft.client.resources.AbstractResourcePack field_110597_b # resourcePackFile # Container -public net.minecraft.inventory.Container * # fucking everything i hate this class \ No newline at end of file +public net.minecraft.inventory.Container * # fucking everything i hate this class + +# GuiIngame +public net.minecraft.client.gui.GuiIngame field_92016_l # highlightingItemStack \ No newline at end of file