From ad3c4e20ca68a02c211b39dc086c3f8b6af8a40f Mon Sep 17 00:00:00 2001 From: Boblet Date: Mon, 30 Sep 2024 16:55:43 +0200 Subject: [PATCH] it's fucking lego! --- src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java | 2 +- .../java/com/hbm/items/weapon/sedna/factory/GunFactory.java | 2 +- .../com/hbm/items/weapon/sedna/factory/GunFactoryClient.java | 4 ++++ .../hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java | 2 +- src/main/java/com/hbm/render/anim/BusAnimationKeyframe.java | 5 +++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java b/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java index 886bdb89e..8f3169d6d 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java +++ b/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java @@ -65,7 +65,7 @@ public class ItemGunBaseNT extends Item implements IKeybindReceiver, IEquipRecei public static float aimingProgress; /** NEVER ACCESS DIRECTLY - USE GETTER */ - private GunConfig config_DNA; + public GunConfig config_DNA; public GunConfig getConfig(ItemStack stack) { return WeaponUpgradeManager.eval(config_DNA, stack, O_GUNCONFIG, this); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java index 30e1c9c74..dcc1aa49a 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java @@ -35,7 +35,7 @@ public class GunFactory { /// GUNS /// ModItems.gun_debug = new ItemGunBaseNT(new GunConfig() - .dura(600F).draw(15).jam(23).inspect(23).crosshair(Crosshair.L_CLASSIC).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO).smoke(true).orchestra(Orchestras.DEBUG_ORCHESTRA) + .dura(600F).draw(15).jam(23).inspect(23).crosshair(Crosshair.L_CLASSIC).smoke(true).orchestra(Orchestras.DEBUG_ORCHESTRA) .rec(new Receiver(0) .dmg(10F).delay(14).reload(46).sound("hbm:weapon.44Shoot", 1.0F, 1.0F) .mag(new MagazineFullReload(0, 12).addConfigs(ammo_debug, ammo_debug_buckshot)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java index 8d584f367..a4b66a0c8 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.entity.projectile.EntityBulletBaseMK4; import com.hbm.items.ModItems; +import com.hbm.items.weapon.sedna.ItemGunBaseNT; import com.hbm.render.item.weapon.sedna.ItemRenderDebug; import com.hbm.render.item.weapon.sedna.ItemRenderPepperbox; @@ -23,6 +24,9 @@ public class GunFactoryClient { //PROJECTILES ammo_debug.setRenderer(RENDER_STANDARD_BULLET); ammo_debug_buckshot.setRenderer(RENDER_STANDARD_BULLET); + //HUDS + ((ItemGunBaseNT) ModItems.gun_debug).config_DNA.hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); + ((ItemGunBaseNT) ModItems.gun_pepperbox).config_DNA.hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); } public static BiConsumer RENDER_STANDARD_BULLET = (bullet, interp) -> { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java index 1f39386a4..1c4668282 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java @@ -28,7 +28,7 @@ public class XFactoryBlackPowder { BulletConfig shot = new BulletConfig().setItem(EnumAmmo.STONE_SHOT).setSpread(0.1F).setRicochetAngle(45).setProjectiles(6, 6).setDamage(0.5F); ModItems.gun_pepperbox = new ItemGunBaseNT(new GunConfig() - .dura(300).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO).smoke(true).orchestra(Orchestras.ORCHESTRA_PEPPERBOX) + .dura(300).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(true).orchestra(Orchestras.ORCHESTRA_PEPPERBOX) .rec(new Receiver(0) .dmg(5F).delay(27).reload(67).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) .mag(new MagazineFullReload(0, 6).addConfigs(stone, flint, iron, shot)) diff --git a/src/main/java/com/hbm/render/anim/BusAnimationKeyframe.java b/src/main/java/com/hbm/render/anim/BusAnimationKeyframe.java index e04fa11a2..8762d0d42 100644 --- a/src/main/java/com/hbm/render/anim/BusAnimationKeyframe.java +++ b/src/main/java/com/hbm/render/anim/BusAnimationKeyframe.java @@ -7,10 +7,15 @@ public class BusAnimationKeyframe { //it's an enum so stuff like accelerated animations between just //two frames could be implemented public static enum IType { + /** Teleport */ CONSTANT, + /** Linear interpolation */ LINEAR, + /** "Sine wave up", quarter of a sine peak that goes from neutral to rising */ SIN_UP, + /** "Sine wave down", quarter of a sine peak that goes from rising back to neutral */ SIN_DOWN, + /** "Sine wave", first half of a sine peak, accelerating up and then decelerating, makes for smooth movement */ SIN_FULL, }