From 89e48bb9907bbd94fb686c206948634e33a01e05 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 29 Jan 2023 17:47:30 +0100 Subject: [PATCH] higher 5mm recipe yield, fixed ammo sync vals shifitng, new 5mm textures --- .../java/com/hbm/handler/WeaponAbility.java | 23 +- .../hbm/handler/guncfg/Gun12GaugeFactory.java | 13 +- .../hbm/handler/guncfg/Gun20GaugeFactory.java | 22 +- .../hbm/handler/guncfg/Gun22LRFactory.java | 5 +- .../handler/guncfg/Gun357MagnumFactory.java | 19 +- .../handler/guncfg/Gun44MagnumFactory.java | 20 +- .../hbm/handler/guncfg/Gun45ACPFactory.java | 12 +- .../hbm/handler/guncfg/Gun4GaugeFactory.java | 30 +- .../hbm/handler/guncfg/Gun50AEFactory.java | 10 +- .../hbm/handler/guncfg/Gun50BMGFactory.java | 34 +- .../hbm/handler/guncfg/Gun556mmFactory.java | 29 +- .../com/hbm/handler/guncfg/Gun5mmFactory.java | 20 +- .../hbm/handler/guncfg/Gun75BoltFactory.java | 8 +- .../hbm/handler/guncfg/Gun762mmFactory.java | 13 +- .../com/hbm/handler/guncfg/Gun9mmFactory.java | 9 +- .../hbm/handler/guncfg/GunCannonFactory.java | 12 +- .../hbm/handler/guncfg/GunDartFactory.java | 7 +- .../hbm/handler/guncfg/GunEnergyFactory.java | 20 +- .../hbm/handler/guncfg/GunFatmanFactory.java | 27 +- .../hbm/handler/guncfg/GunGrenadeFactory.java | 24 +- .../hbm/handler/guncfg/GunRocketFactory.java | 44 +- .../guncfg/GunRocketHomingFactory.java | 12 +- .../hbm/inventory/recipes/PressRecipes.java | 2 +- .../inventory/recipes/anvil/AnvilRecipes.java | 16 +- .../java/com/hbm/items/ItemAmmoEnums.java | 596 ++++++------------ src/main/java/com/hbm/items/ModItems.java | 9 +- .../com/hbm/items/weapon/ItemGunBase.java | 20 +- src/main/java/com/hbm/lib/HbmCollection.java | 3 +- src/main/java/com/hbm/util/InventoryUtil.java | 26 +- .../gui/weapon/gui_turret_friendly.png | Bin 3905 -> 3959 bytes .../textures/gui/weapon/gui_turret_sentry.png | Bin 4011 -> 4063 bytes .../assets/hbm/textures/items/ammo_5mm.png | Bin 221 -> 485 bytes .../hbm/textures/items/ammo_5mm_alt2.png | Bin 485 -> 0 bytes .../textures/items/ammo_5mm_chlorophyte.png | Bin 256 -> 456 bytes .../assets/hbm/textures/items/ammo_5mm_du.png | Bin 230 -> 494 bytes .../hbm/textures/items/ammo_5mm_explosive.png | Bin 264 -> 486 bytes .../hbm/textures/items/ammo_5mm_star.png | Bin 266 -> 539 bytes 37 files changed, 437 insertions(+), 648 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/ammo_5mm_alt2.png diff --git a/src/main/java/com/hbm/handler/WeaponAbility.java b/src/main/java/com/hbm/handler/WeaponAbility.java index 26a82cc4f..60a8ae6b7 100644 --- a/src/main/java/com/hbm/handler/WeaponAbility.java +++ b/src/main/java/com/hbm/handler/WeaponAbility.java @@ -209,36 +209,25 @@ public abstract class WeaponAbility { WeightedRandomObject[] ammo = new WeightedRandomObject[] { new WeightedRandomObject(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.STOCK), 10), new WeightedRandomObject(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.SHRAPNEL), 5), - new WeightedRandomObject(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.DU), 3), new WeightedRandomObject(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.STOCK), 10), new WeightedRandomObject(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.FLECHETTE), 5), new WeightedRandomObject(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.SLUG), 5), new WeightedRandomObject(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.AP), 5), new WeightedRandomObject(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.DU), 3), new WeightedRandomObject(ModItems.ammo_556.stackFromEnum(Ammo556mm.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_556.stackFromEnum(Ammo556mm.PHOSPHORUS), 5), new WeightedRandomObject(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE), 10), - new WeightedRandomObject(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE_PHOSPHORUS), 5), - new WeightedRandomObject(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.INCENDIARY), 5), - new WeightedRandomObject(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.AP), 5), - new WeightedRandomObject(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.STOCK), 5), - new WeightedRandomObject(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.CONCUSSION), 3), - new WeightedRandomObject(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.PHOSPHORUS), 3), - new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.STOCK), 5), - new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.GLARE), 5), - new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.PHOSPHORUS), 5), - new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.RPC), 1), - new WeightedRandomObject(ModItems.syringe_metal_stimpak, 25), + new WeightedRandomObject(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.STOCK), 3), + new WeightedRandomObject(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.STOCK), 3), + new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.STOCK), 1), + new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.GLARE), 1), + new WeightedRandomObject(new ItemStack(ModItems.syringe_metal_stimpak), 20), }; int count = Math.min((int)Math.ceil(living.getMaxHealth() / divider), 250); //safeguard to prevent funnies from bosses with obscene health for(int i = 0; i < count; i++) { - living.dropItem(((WeightedRandomObject)WeightedRandom.getRandomItem(living.getRNG(), ammo)).asItem(), 1); + living.entityDropItem(((WeightedRandomObject)WeightedRandom.getRandomItem(living.getRNG(), ammo)).asStack(), 1); world.spawnEntityInWorld(new EntityXPOrb(world, living.posX, living.posY, living.posZ, 1)); } diff --git a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java index 52d2114be..4d8a728d8 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java @@ -8,6 +8,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletHurtBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.Ammo12Gauge; import com.hbm.items.ModItems; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; @@ -175,7 +176,7 @@ public static GunConfiguration getSpas12AltConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_12gauge, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.STOCK)); bullet.dmgMin = 5; bullet.dmgMax = 7; @@ -186,7 +187,7 @@ public static GunConfiguration getSpas12AltConfig() { BulletConfiguration bullet = get12GaugeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_12gauge, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.INCENDIARY)); bullet.wear = 15; bullet.dmgMin = 5; bullet.dmgMax = 7; @@ -199,7 +200,7 @@ public static GunConfiguration getSpas12AltConfig() { BulletConfiguration bullet = get12GaugeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_12gauge, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.SHRAPNEL)); bullet.wear = 15; bullet.dmgMin = 10; bullet.dmgMax = 17; @@ -214,7 +215,7 @@ public static GunConfiguration getSpas12AltConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_12gauge, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.DU)); bullet.wear = 20; bullet.dmgMin = 18; bullet.dmgMax = 22; @@ -228,7 +229,7 @@ public static GunConfiguration getSpas12AltConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_12gauge, 1, 4); + bullet.ammo = new ComparableStack(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.MARAUDER)); bullet.wear = 20; bullet.dmgMin = 100; bullet.dmgMax = 500; @@ -252,7 +253,7 @@ public static GunConfiguration getSpas12AltConfig() { BulletConfiguration bullet = BulletConfigFactory.standardAirstrikeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_12gauge, 1, 5); + bullet.ammo = new ComparableStack(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.SLEEK)); return bullet; } diff --git a/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java index 85ddca986..fde72bcca 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java @@ -6,6 +6,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo20Gauge; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.anim.BusAnimation; @@ -197,12 +198,11 @@ public class Gun20GaugeFactory { return config; } - private static int i = 0; public static BulletConfiguration get20GaugeConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.STOCK)); bullet.dmgMin = 3; bullet.dmgMax = 5; @@ -213,7 +213,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.SLUG)); bullet.dmgMin = 18; bullet.dmgMax = 22; bullet.wear = 7; @@ -226,7 +226,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.FLECHETTE)); bullet.dmgMin = 8; bullet.dmgMax = 15; bullet.wear = 15; @@ -241,7 +241,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.INCENDIARY)); bullet.dmgMin = 3; bullet.dmgMax = 6; bullet.wear = 15; @@ -254,7 +254,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.SHRAPNEL)); bullet.wear = 15; bullet.dmgMin = 7; bullet.dmgMax = 12; @@ -269,7 +269,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.EXPLOSIVE)); bullet.dmgMin = 7; bullet.dmgMax = 12; bullet.wear = 25; @@ -282,7 +282,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.CAUSTIC)); bullet.dmgMin = 3; bullet.dmgMax = 7; bullet.wear = 25; @@ -301,7 +301,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.SHOCK)); bullet.dmgMin = 4; bullet.dmgMax = 8; bullet.wear = 25; @@ -321,7 +321,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.WITHER)); bullet.dmgMin = 4; bullet.dmgMax = 8; @@ -335,7 +335,7 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardAirstrikeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_20gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.SLEEK)); return bullet; } diff --git a/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java index b54b087d8..64e879453 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java @@ -4,6 +4,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo22LR; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.util.RenderScreenOverlay.Crosshair; @@ -57,7 +58,7 @@ public class Gun22LRFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_22lr, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_22lr.stackFromEnum(Ammo22LR.STOCK)); bullet.spread *= inaccuracy; bullet.dmgMin = 6; bullet.dmgMax = 8; @@ -69,7 +70,7 @@ public class Gun22LRFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_22lr, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_22lr.stackFromEnum(Ammo22LR.AP)); bullet.spread *= inaccuracy; bullet.dmgMin = 12; bullet.dmgMax = 16; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java index 2a28a1b27..0fcd9e1dd 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java @@ -7,6 +7,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo357Magnum; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.lib.ModDamageSource; import com.hbm.potion.HbmPotion; @@ -218,7 +219,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.IRON)); bullet.dmgMin = 8; bullet.dmgMax = 10; @@ -229,7 +230,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.LEAD)); bullet.dmgMin = 18; bullet.dmgMax = 22; @@ -240,7 +241,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.NUCLEAR)); bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -254,7 +255,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.GOLD)); bullet.dmgMin = 25; bullet.dmgMax = 28; @@ -265,7 +266,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 4); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.DESH)); bullet.dmgMin = 30; bullet.dmgMax = 33; @@ -276,7 +277,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 5); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.SCHRABIDIUM)); bullet.dmgMin = 10000; bullet.dmgMax = 100000; bullet.instakill = true; @@ -288,7 +289,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 6); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.STEEL)); bullet.dmgMin = 18; bullet.dmgMax = 25; @@ -299,7 +300,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 7); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.NIGHTMARE1)); bullet.dmgMin = 1; bullet.dmgMax = 100; @@ -310,7 +311,7 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_357, 1, 8); + bullet.ammo = new ComparableStack(ModItems.ammo_357.stackFromEnum(Ammo357Magnum.NIGHTMARE2)); bullet.spread *= 10; bullet.bulletsMin = 4; bullet.bulletsMax = 6; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java index 2e3b29746..ff3a7cc22 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java @@ -14,6 +14,7 @@ import com.hbm.interfaces.IBulletHitBehavior; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo44Magnum; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.packet.AuxParticlePacketNT; @@ -136,12 +137,11 @@ public class Gun44MagnumFactory { return config; } - static byte i = 0; public static BulletConfiguration getNoPipConfig() { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.STOCK)); bullet.dmgMin = 18; bullet.dmgMax = 26; @@ -152,7 +152,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.AP)); bullet.dmgMin = 25; bullet.dmgMax = 32; bullet.wear = 15; @@ -165,7 +165,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.DU)); bullet.dmgMin = 28; bullet.dmgMax = 40; bullet.wear = 25; @@ -178,7 +178,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.PHOSPHORUS)); bullet.dmgMin = 18; bullet.dmgMax = 26; bullet.wear = 15; @@ -212,7 +212,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.STAR)); bullet.dmgMin = 42; bullet.dmgMax = 50; bullet.wear = 25; @@ -225,7 +225,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.PIP)); bullet.dmgMin = 30; bullet.dmgMax = 36; bullet.wear = 25; @@ -262,7 +262,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.BJ)); bullet.dmgMin = 30; bullet.dmgMax = 36; bullet.wear = 25; @@ -300,7 +300,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.SILVER)); bullet.dmgMin = 30; bullet.dmgMax = 36; bullet.wear = 25; @@ -338,7 +338,7 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_44, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_44.stackFromEnum(Ammo44Magnum.ROCKET)); bullet.velocity = 5; bullet.explosive = 15F; bullet.trail = 1; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun45ACPFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun45ACPFactory.java index 67815f229..5444c3b35 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun45ACPFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun45ACPFactory.java @@ -6,6 +6,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo45ACP; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.anim.BusAnimation; @@ -107,10 +108,13 @@ public class Gun45ACPFactory { return config; } + + static float inaccuracy = 5; public static BulletConfiguration get45AutoConfig() { - BulletConfiguration bullet = Gun9mmFactory.get9mmConfig(); + BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_45, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_45.stackFromEnum(Ammo45ACP.STOCK)); + bullet.spread *= inaccuracy; bullet.dmgMax = 30; bullet.dmgMin = 27; @@ -120,7 +124,7 @@ public class Gun45ACPFactory { public static BulletConfiguration get45AutoAPConfig() { BulletConfiguration bullet = get45AutoConfig().clone(); - bullet.ammo = new ComparableStack(ModItems.ammo_45, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_45.stackFromEnum(Ammo45ACP.AP)); bullet.dmgMax *= 1.5; bullet.dmgMin *= 1.5; @@ -130,7 +134,7 @@ public class Gun45ACPFactory { public static BulletConfiguration get45AutoDUConfig() { BulletConfiguration bullet = get45AutoAPConfig().clone(); - bullet.ammo = new ComparableStack(ModItems.ammo_45, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_45.stackFromEnum(Ammo45ACP.DU)); bullet.dmgMax *= 1.5; bullet.dmgMin *= 1.5; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java index de7dc6044..2bd0edd11 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -16,6 +16,7 @@ import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.interfaces.IBulletUpdateBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo4Gauge; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.lib.ModDamageSource; @@ -121,12 +122,11 @@ public class Gun4GaugeFactory { return config; } - private static byte i = 0; public static BulletConfiguration get4GaugeConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.STOCK)); bullet.dmgMin = 5; bullet.dmgMax = 8; bullet.bulletsMin *= 2; @@ -139,7 +139,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.SLUG)); bullet.dmgMin = 25; bullet.dmgMax = 32; bullet.wear = 7; @@ -152,7 +152,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.FLECHETTE)); bullet.dmgMin = 8; bullet.dmgMax = 15; bullet.bulletsMin *= 2; @@ -169,7 +169,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.FLECHETTE_PHOSPHORUS)); bullet.dmgMin = 8; bullet.dmgMax = 15; bullet.bulletsMin *= 2; @@ -207,7 +207,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.EXPLOSIVE)); bullet.velocity *= 2; bullet.gravity *= 2; bullet.dmgMin = 20; @@ -222,7 +222,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.MINING)); bullet.velocity *= 2; bullet.gravity *= 2; bullet.dmgMin = 10; @@ -256,7 +256,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.BALEFIRE)); bullet.velocity *= 2; bullet.gravity *= 2; bullet.dmgMin = 50; @@ -289,7 +289,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.KAMPF)); bullet.spread = 0.0F; bullet.gravity = 0.0D; bullet.wear = 15; @@ -305,7 +305,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.CANISTER)); bullet.spread = 0.0F; bullet.gravity = 0.0D; bullet.wear = 15; @@ -343,7 +343,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardAirstrikeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.SLEEK)); return bullet; } @@ -352,7 +352,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.CLAW)); bullet.dmgMin = 6; bullet.dmgMax = 9; bullet.bulletsMin *= 2; @@ -389,7 +389,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.VAMPIRE)); bullet.dmgMin = 6; bullet.dmgMax = 9; bullet.bulletsMin *= 2; @@ -427,7 +427,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.VOID)); bullet.dmgMin = 6; bullet.dmgMax = 9; bullet.bulletsMin *= 2; @@ -458,7 +458,7 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_4gauge, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_4gauge.stackFromEnum(Ammo4Gauge.QUACK)); bullet.velocity *= 2D; bullet.spread = 0.0F; bullet.gravity = 0.0D; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java index 94c7d03cb..7b1cca443 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java @@ -4,6 +4,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo50AE; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.util.RenderScreenOverlay.Crosshair; @@ -47,12 +48,11 @@ public class Gun50AEFactory { } private static float inaccuracy = 0.0005F; - private static byte i = 0; public static BulletConfiguration get50AEConfig() { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50ae, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_50ae.stackFromEnum(Ammo50AE.STOCK)); bullet.spread *= inaccuracy; bullet.dmgMin = 28; bullet.dmgMax = 32; @@ -64,7 +64,7 @@ public class Gun50AEFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50ae, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_50ae.stackFromEnum(Ammo50AE.AP)); bullet.spread *= inaccuracy; bullet.dmgMin = 30; bullet.dmgMax = 36; @@ -78,7 +78,7 @@ public class Gun50AEFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50ae, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_50ae.stackFromEnum(Ammo50AE.DU)); bullet.spread *= inaccuracy; bullet.dmgMin = 38; bullet.dmgMax = 46; @@ -92,7 +92,7 @@ public class Gun50AEFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50ae, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_50ae.stackFromEnum(Ammo50AE.STAR)); bullet.spread *= inaccuracy; bullet.dmgMin = 52; bullet.dmgMax = 60; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java index 7e59ecbc5..ae12c9ba3 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java @@ -10,6 +10,8 @@ import com.hbm.interfaces.IBulletHitBehavior; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo50BMG; +import com.hbm.items.ItemAmmoEnums.AmmoLunaticSniper; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.packet.AuxParticlePacketNT; @@ -102,7 +104,7 @@ public class Gun50BMGFactory { public static BulletConfiguration getLunaticSabotRound() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_luna_sniper, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_luna_sniper.stackFromEnum(AmmoLunaticSniper.SABOT)); bullet.spread = 0.0F; bullet.dmgMax = 500F; bullet.dmgMin = 450F; @@ -122,6 +124,8 @@ public class Gun50BMGFactory { public static BulletConfiguration getLunaticIncendiaryRound() { BulletConfiguration bullet = getLunaticSabotRound().clone(); + bullet.ammo = new ComparableStack(ModItems.ammo_luna_sniper.stackFromEnum(AmmoLunaticSniper.INCENDIARY)); + bullet.ammo.meta = 1; bullet.incendiary = 50; @@ -131,6 +135,8 @@ public class Gun50BMGFactory { public static BulletConfiguration getLunaticExplosiveRound() { BulletConfiguration bullet = getLunaticSabotRound().clone(); + bullet.ammo = new ComparableStack(ModItems.ammo_luna_sniper.stackFromEnum(AmmoLunaticSniper.EXPLOSIVE)); + bullet.ammo.meta = 2; bullet.explosive = 25; bullet.bImpact = (projectile, x, y, z) -> projectile.worldObj.newExplosion(projectile, x, y, z, 25.0F, true, false); @@ -181,7 +187,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.STOCK)); bullet.spread *= inaccuracy; bullet.dmgMin = 30; bullet.dmgMax = 36; @@ -193,7 +199,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.INCENDIARY)); bullet.spread *= inaccuracy; bullet.dmgMin = 30; bullet.dmgMax = 36; @@ -207,7 +213,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.PHOSPHORUS)); bullet.spread *= inaccuracy; bullet.dmgMin = 30; bullet.dmgMax = 36; @@ -242,7 +248,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.EXPLOSIVE)); bullet.spread *= inaccuracy; bullet.dmgMin = 60; bullet.dmgMax = 64; @@ -256,7 +262,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 4); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.AP)); bullet.spread *= inaccuracy; bullet.dmgMin = 62; bullet.dmgMax = 68; @@ -270,7 +276,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 5); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.DU)); bullet.spread *= inaccuracy; bullet.dmgMin = 80; bullet.dmgMax = 86; @@ -284,7 +290,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 6); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.STAR)); bullet.spread *= inaccuracy; bullet.dmgMin = 98; bullet.dmgMax = 102; @@ -298,7 +304,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 8); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.SLEEK)); bullet.spread *= inaccuracy; bullet.dmgMin = 50; bullet.dmgMax = 70; @@ -348,7 +354,7 @@ public class Gun50BMGFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 9); + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.FLECHETTE)); bullet.spread *= inaccuracy; bullet.dmgMin = 50; bullet.dmgMax = 54; @@ -360,8 +366,8 @@ public class Gun50BMGFactory { public static BulletConfiguration get50BMGFlechetteAMConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 10); + + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.FLECHETTE_AM)); bullet.spread *= inaccuracy; bullet.dmgMin = 60; bullet.dmgMax = 64; @@ -387,8 +393,8 @@ public class Gun50BMGFactory { public static BulletConfiguration get50BMGFlechettePOConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_50bmg, 1, 11); + + bullet.ammo = new ComparableStack(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.FLECHETTE_PO)); bullet.spread *= inaccuracy; bullet.dmgMin = 60; bullet.dmgMax = 64; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java index ee72c8f33..fc5be0d11 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java @@ -9,6 +9,7 @@ import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletHitBehavior; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.Ammo556mm; import com.hbm.items.ModItems; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; @@ -126,7 +127,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.STOCK)); bullet.spread *= inaccuracy; bullet.dmgMin = 16; bullet.dmgMax = 20; @@ -138,7 +139,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.GOLD)); bullet.dmgMin = 250; bullet.dmgMax = 320; bullet.spread = 0.0F; @@ -150,7 +151,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.PHOSPHORUS)); bullet.wear = 15; bullet.incendiary = 5; bullet.doesPenetrate = false; @@ -182,7 +183,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.AP)); bullet.dmgMin = 20; bullet.dmgMax = 26; bullet.wear = 15; @@ -195,7 +196,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 4); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.DU)); bullet.dmgMin = 24; bullet.dmgMax = 32; bullet.wear = 25; @@ -208,7 +209,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 5); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.STAR)); bullet.dmgMin = 30; bullet.dmgMax = 36; bullet.wear = 25; @@ -221,7 +222,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 7); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.SLEEK)); bullet.dmgMin = 45; bullet.dmgMax = 50; bullet.wear = 10; @@ -270,7 +271,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 8); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.TRACER)); bullet.vPFX = "reddust"; return bullet; @@ -280,7 +281,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 9); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE)); bullet.dmgMin = 26; bullet.dmgMax = 32; bullet.HBRC = 2; @@ -296,7 +297,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556FlechetteConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 10); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE_INCENDIARY)); bullet.incendiary = 5; return bullet; @@ -306,7 +307,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556FlechetteConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 11); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE_PHOSPHORUS)); bullet.incendiary = 5; PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, 20 * 20, 0, true); @@ -336,7 +337,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556FlechetteConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 12); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE_DU)); bullet.dmgMin = 46; bullet.dmgMax = 52; bullet.wear = 25; @@ -350,7 +351,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556FlechetteConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 13); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE_SLEEK)); bullet.dmgMin = 45; bullet.dmgMax = 50; bullet.wear = 10; @@ -399,7 +400,7 @@ public class Gun556mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_556, 1, 14); + bullet.ammo = new ComparableStack(ModItems.ammo_556.stackFromEnum(Ammo556mm.K)); bullet.dmgMin = 0; bullet.dmgMax = 0; bullet.maxAge = 0; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java index c579578cf..b7ec074fd 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java @@ -1,11 +1,9 @@ package com.hbm.handler.guncfg; -import java.util.ArrayList; - -import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.Ammo5mm; import com.hbm.items.ModItems; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; @@ -64,23 +62,17 @@ public class Gun5mmFactory { config.name = "lacunae"; config.manufacturer = EnumGunManufacturer.ROCKWELL_U; - config.config = new ArrayList(); - config.config.add(BulletConfigSyncingUtil.R5_NORMAL_BOLT); - config.config.add(BulletConfigSyncingUtil.R5_EXPLOSIVE_BOLT); - config.config.add(BulletConfigSyncingUtil.R5_DU_BOLT); - config.config.add(BulletConfigSyncingUtil.R5_STAR_BOLT); - config.config.add(BulletConfigSyncingUtil.CHL_R5_BOLT); + config.config = HbmCollection.fiveMMBolt; return config; } private static float inaccuracy = 10; - private static byte i = 0; public static BulletConfiguration get5mmConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_5mm, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.STOCK)); bullet.spread *= inaccuracy; bullet.dmgMin = 12; bullet.dmgMax = 14; @@ -92,7 +84,7 @@ public class Gun5mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_5mm, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.EXPLOSIVE)); bullet.spread *= inaccuracy; bullet.dmgMin = 30; bullet.dmgMax = 32; @@ -106,7 +98,7 @@ public class Gun5mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_5mm, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.DU)); bullet.spread *= inaccuracy; bullet.dmgMin = 36; bullet.dmgMax = 40; @@ -120,7 +112,7 @@ public class Gun5mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_5mm, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.STAR)); bullet.spread *= inaccuracy; bullet.dmgMin = 46; bullet.dmgMax = 50; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java index fbe88baa0..95d478fa0 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java @@ -8,6 +8,7 @@ import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletHurtBehavior; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.Ammo75Bolt; import com.hbm.items.ModItems; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; @@ -83,12 +84,11 @@ public class Gun75BoltFactory { } private static float inaccuracy = 0.5F; - private static byte i = 0; public static BulletConfiguration get75BoltConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_75bolt, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_75bolt.stackFromEnum(Ammo75Bolt.STOCK)); bullet.ammoCount = 30; bullet.spread *= inaccuracy; bullet.dmgMin = 74; @@ -126,7 +126,7 @@ public class Gun75BoltFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_75bolt, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_75bolt.stackFromEnum(Ammo75Bolt.INCENDIARY)); bullet.ammoCount = 30; bullet.spread *= inaccuracy; bullet.dmgMin = 72; @@ -164,7 +164,7 @@ public class Gun75BoltFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_75bolt, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_75bolt.stackFromEnum(Ammo75Bolt.HE)); bullet.ammoCount = 30; bullet.spread *= inaccuracy; bullet.dmgMin = 94; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun762mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun762mmFactory.java index 75cdc9c05..24d40cefe 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun762mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun762mmFactory.java @@ -6,6 +6,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo762NATO; import com.hbm.lib.HbmCollection; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.potion.HbmPotion; @@ -98,7 +99,7 @@ public class Gun762mmFactory { public static BulletConfiguration get762NATOConfig() { final BulletConfiguration bullet = Gun556mmFactory.get556Config().clone(); - bullet.ammo = new ComparableStack(ModItems.ammo_308, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_762.stackFromEnum(Ammo762NATO.STOCK)); bullet.dmgMax *= 2; bullet.dmgMin *= 2; bullet.velocity *= 2.5; @@ -111,7 +112,7 @@ public class Gun762mmFactory { public static BulletConfiguration get762APConfig() { final BulletConfiguration bullet = get762NATOConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_308, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_762.stackFromEnum(Ammo762NATO.AP)); bullet.dmgMax *= 1.5; bullet.dmgMin *= 1.5; @@ -121,7 +122,7 @@ public class Gun762mmFactory { public static BulletConfiguration get762DUConfig() { final BulletConfiguration bullet = get762NATOConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_308, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_762.stackFromEnum(Ammo762NATO.DU)); bullet.dmgMax *= 2; bullet.dmgMin *= 2; @@ -131,7 +132,7 @@ public class Gun762mmFactory { public static BulletConfiguration get762TracerConfig() { final BulletConfiguration bullet = get762NATOConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_308, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_762.stackFromEnum(Ammo762NATO.TRACER)); bullet.vPFX = "reddust"; return bullet; @@ -140,7 +141,7 @@ public class Gun762mmFactory { public static BulletConfiguration get762WPConfig() { final BulletConfiguration bullet = get762NATOConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_308, 1, 4); + bullet.ammo = new ComparableStack(ModItems.ammo_762.stackFromEnum(Ammo762NATO.PHOSPHORUS)); bullet.setToFire(20 * 5); bullet.vPFX = "reddust"; final PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, 20 * 20, 0, true); @@ -154,7 +155,7 @@ public class Gun762mmFactory { public static BulletConfiguration get762BlankConfig() { final BulletConfiguration bullet = get762NATOConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_308, 1, 5); + bullet.ammo = new ComparableStack(ModItems.ammo_762.stackFromEnum(Ammo762NATO.BLANK)); bullet.dmgMax = 0; bullet.dmgMin = 0; bullet.maxAge = 0; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java index 92cc95830..404bc673f 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java @@ -7,6 +7,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.Ammo9mm; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.util.RenderScreenOverlay.Crosshair; @@ -81,7 +82,7 @@ public class Gun9mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_9mm, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.STOCK)); bullet.spread *= inaccuracy; bullet.dmgMin = 10; bullet.dmgMax = 14; @@ -93,7 +94,7 @@ public class Gun9mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_9mm, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.AP)); bullet.spread *= inaccuracy; bullet.dmgMin = 18; bullet.dmgMax = 20; @@ -107,7 +108,7 @@ public class Gun9mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardPistolConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_9mm, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.DU)); bullet.spread *= inaccuracy; bullet.dmgMin = 22; bullet.dmgMax = 26; @@ -121,7 +122,7 @@ public class Gun9mmFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_9mm, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.ROCKET)); bullet.velocity = 5; bullet.explosive = 7.5F; bullet.trail = 5; diff --git a/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java b/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java index 5ec056e37..1012f7147 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java @@ -4,16 +4,16 @@ import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfiguration; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.Ammo240Shell; import com.hbm.items.ModItems; public class GunCannonFactory { - private static byte i = 0; public static BulletConfiguration getShellConfig() { BulletConfiguration bullet = BulletConfigFactory.standardShellConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_shell, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_shell.stackFromEnum(Ammo240Shell.STOCK)); bullet.dmgMin = 25; bullet.dmgMax = 35; bullet.explosive = 4F; @@ -26,7 +26,7 @@ public class GunCannonFactory { BulletConfiguration bullet = BulletConfigFactory.standardShellConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_shell, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_shell.stackFromEnum(Ammo240Shell.EXPLOSIVE)); bullet.dmgMin = 35; bullet.dmgMax = 45; bullet.explosive = 4F; @@ -39,7 +39,7 @@ public class GunCannonFactory { BulletConfiguration bullet = BulletConfigFactory.standardShellConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_shell, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_shell.stackFromEnum(Ammo240Shell.APFSDS_T)); bullet.dmgMin = 50; bullet.dmgMax = 55; bullet.doesPenetrate = true; @@ -52,7 +52,7 @@ public class GunCannonFactory { BulletConfiguration bullet = BulletConfigFactory.standardShellConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_shell, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_shell.stackFromEnum(Ammo240Shell.APFSDS_DU)); bullet.dmgMin = 70; bullet.dmgMax = 80; bullet.doesPenetrate = true; @@ -65,7 +65,7 @@ public class GunCannonFactory { BulletConfiguration bullet = BulletConfigFactory.standardShellConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_shell, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_shell.stackFromEnum(Ammo240Shell.W9)); bullet.dmgMin = 100; bullet.dmgMax = 150; diff --git a/src/main/java/com/hbm/handler/guncfg/GunDartFactory.java b/src/main/java/com/hbm/handler/guncfg/GunDartFactory.java index a59e2c348..70c743232 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunDartFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunDartFactory.java @@ -9,6 +9,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletHurtBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.AmmoDart; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGunDart; import com.hbm.lib.HbmCollection.EnumGunManufacturer; @@ -89,7 +90,7 @@ public class GunDartFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_dart, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_dart.stackFromEnum(AmmoDart.GPS)); bullet.velocity = 5.0F; bullet.spread = 0; bullet.dmgMin = 1; @@ -135,7 +136,7 @@ public class GunDartFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_dart, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_dart.stackFromEnum(AmmoDart.NUCLEAR)); bullet.velocity = 5.0F; bullet.spread = 0; bullet.dmgMin = 1; @@ -172,7 +173,7 @@ public class GunDartFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_dart, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_dart.stackFromEnum(AmmoDart.NERF)); bullet.velocity = 1.0F; bullet.gravity = 0.04D; bullet.dmgMin = 0; diff --git a/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java b/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java index 534175c5a..27bc4ad4e 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java @@ -12,6 +12,8 @@ import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.interfaces.IBulletUpdateBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.AmmoFireExt; +import com.hbm.items.ItemAmmoEnums.AmmoFlamethrower; import com.hbm.items.ModItems; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.lib.ModDamageSource; @@ -215,12 +217,11 @@ public class GunEnergyFactory { return bullet; } - private static byte i1 = 0; public static BulletConfiguration getFlameConfig() { BulletConfiguration bullet = new BulletConfiguration(); - bullet.ammo = new ComparableStack(ModItems.ammo_fuel, 1, i1++);; + bullet.ammo = new ComparableStack(ModItems.ammo_fuel.stackFromEnum(AmmoFlamethrower.DIESEL)); bullet.ammoCount = 100; bullet.velocity = 0.75F; @@ -268,7 +269,7 @@ public class GunEnergyFactory { BulletConfiguration bullet = getFlameConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_fuel, 1, i1++); + bullet.ammo = new ComparableStack(ModItems.ammo_fuel.stackFromEnum(AmmoFlamethrower.NAPALM)); bullet.wear = 2; bullet.dmgMin = 4; bullet.dmgMax = 6; @@ -281,7 +282,7 @@ public class GunEnergyFactory { BulletConfiguration bullet = getFlameConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_fuel, 1, i1++); + bullet.ammo = new ComparableStack(ModItems.ammo_fuel.stackFromEnum(AmmoFlamethrower.PHOSPHORUS)); bullet.wear = 2; bullet.spread = 0.0F; bullet.bulletsMin = 1; @@ -300,7 +301,7 @@ public class GunEnergyFactory { BulletConfiguration bullet = getFlameConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_fuel, 1, i1++); + bullet.ammo = new ComparableStack(ModItems.ammo_fuel.stackFromEnum(AmmoFlamethrower.VAPORIZER)); bullet.wear = 4; bullet.spread = 0.25F; bullet.bulletsMin = 8; @@ -325,7 +326,7 @@ public class GunEnergyFactory { BulletConfiguration bullet = getFlameConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_fuel, 1, i1++); + bullet.ammo = new ComparableStack(ModItems.ammo_fuel.stackFromEnum(AmmoFlamethrower.CHLORINE)); bullet.wear = 1; bullet.spread = 0.05F; bullet.gravity = 0D; @@ -343,12 +344,11 @@ public class GunEnergyFactory { return bullet; } - private static byte i2 = 0; public static BulletConfiguration getFextConfig() { BulletConfiguration bullet = new BulletConfiguration(); - bullet.ammo = new ComparableStack(ModItems.ammo_fireext, 1, i2++); + bullet.ammo = new ComparableStack(ModItems.ammo_fireext.stackFromEnum(AmmoFireExt.WATER)); bullet.ammoCount = 300; bullet.velocity = 0.75F; @@ -436,7 +436,7 @@ public class GunEnergyFactory { BulletConfiguration bullet = getFextConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_fireext, 1, i2++); + bullet.ammo = new ComparableStack(ModItems.ammo_fireext.stackFromEnum(AmmoFireExt.FOAM)); bullet.spread = 0.05F; bullet.bImpact = new IBulletImpactBehavior() { @@ -517,7 +517,7 @@ public class GunEnergyFactory { BulletConfiguration bullet = getFextConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_fireext, 1, i2++); + bullet.ammo = new ComparableStack(ModItems.ammo_fireext.stackFromEnum(AmmoFireExt.SAND)); bullet.spread = 0.1F; bullet.bImpact = new IBulletImpactBehavior() { diff --git a/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java b/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java index 85c7aee93..b11625a66 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java @@ -15,6 +15,7 @@ import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.interfaces.IBulletUpdateBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.AmmoFatman; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; @@ -129,7 +130,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukeConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 0); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.STOCK)); bullet.bImpact = new IBulletImpactBehavior() { @@ -145,7 +146,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukeLowConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 1); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.LOW)); bullet.bImpact = new IBulletImpactBehavior() { @@ -161,7 +162,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukeHighConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 2); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.HIGH)); bullet.bImpact = new IBulletImpactBehavior() { @@ -177,7 +178,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukeTotsConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 3); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.TOTS)); bullet.bulletsMin = 8; bullet.bulletsMax = 8; bullet.spread = 0.1F; @@ -197,7 +198,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukeSafeConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 4); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.SAFE)); bullet.bImpact = new IBulletImpactBehavior() { @@ -213,7 +214,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukePumpkinConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 5); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.PUMPKIN)); bullet.explosive = 10F; bullet.bImpact = new IBulletImpactBehavior() { @@ -244,7 +245,7 @@ public class GunFatmanFactory { public static BulletConfiguration getNukeBarrelConfig() { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 6); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.BARREL)); bullet.explosive = 3F; bullet.style = bullet.STYLE_BARREL; @@ -302,7 +303,7 @@ public class GunFatmanFactory { BulletConfiguration bullet = getNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 7); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV)); bullet.style = BulletConfiguration.STYLE_MIRV; bullet.velocity *= 3; @@ -339,7 +340,7 @@ public class GunFatmanFactory { BulletConfiguration bullet = getNukeLowConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 8); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_LOW)); bullet.style = BulletConfiguration.STYLE_MIRV; bullet.velocity *= 3; @@ -376,7 +377,7 @@ public class GunFatmanFactory { BulletConfiguration bullet = getNukeHighConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 9); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_HIGH)); bullet.style = BulletConfiguration.STYLE_MIRV; bullet.velocity *= 3; @@ -413,7 +414,7 @@ public class GunFatmanFactory { BulletConfiguration bullet = getNukeSafeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 10); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_SAFE)); bullet.style = BulletConfiguration.STYLE_MIRV; bullet.velocity *= 3; @@ -450,7 +451,7 @@ public class GunFatmanFactory { BulletConfiguration bullet = getNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 11); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_SPECIAL)); bullet.style = BulletConfiguration.STYLE_MIRV; bullet.velocity *= 3; @@ -498,7 +499,7 @@ public class GunFatmanFactory { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_nuke, 1, 12); + bullet.ammo = new ComparableStack(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.BALEFIRE)); bullet.style = BulletConfiguration.STYLE_BF; bullet.bImpact = new IBulletImpactBehavior() { diff --git a/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java b/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java index d62e4a983..0ad90be49 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java @@ -9,6 +9,7 @@ import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.AmmoGrenade; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.util.RenderScreenOverlay.Crosshair; @@ -53,12 +54,11 @@ public class GunGrenadeFactory { return config; } - private static byte i = 0; public static BulletConfiguration getGrenadeConfig() { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.STOCK)); bullet.velocity = 2.0F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -72,7 +72,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.HE)); bullet.velocity = 2.0F; bullet.dmgMin = 20; bullet.dmgMax = 15; @@ -87,7 +87,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.INCENDIARY)); bullet.velocity = 2.0F; bullet.dmgMin = 15; bullet.dmgMax = 15; @@ -102,7 +102,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.PHOSPHORUS)); bullet.velocity = 2.0F; bullet.dmgMin = 15; bullet.dmgMax = 15; @@ -119,7 +119,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.CHLORINE)); bullet.velocity = 2.0F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -135,7 +135,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.SLEEK)); bullet.velocity = 2.0F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -151,7 +151,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.CONCUSSION)); bullet.velocity = 2.0F; bullet.dmgMin = 15; bullet.dmgMax = 20; @@ -166,7 +166,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = getGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.FINNED)); bullet.gravity = 0.02; bullet.explosive = 1.5F; bullet.trail = 5; @@ -178,7 +178,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = getGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.NUCLEAR)); bullet.velocity = 4; bullet.explosive = 0.0F; @@ -197,7 +197,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.TRACER)); bullet.velocity = 2.0F; bullet.wear = 10; bullet.explosive = 0F; @@ -211,7 +211,7 @@ public class GunGrenadeFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_grenade, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.KAMPF)); bullet.spread = 0.0F; bullet.gravity = 0.0D; bullet.wear = 15; diff --git a/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java b/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java index 178c3e66d..42df5aa30 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java @@ -12,6 +12,7 @@ import com.hbm.interfaces.IBulletRicochetBehavior; import com.hbm.interfaces.IBulletUpdateBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.ItemAmmoEnums.AmmoRocket; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationKeyframe; @@ -171,12 +172,11 @@ public class GunRocketFactory { return config; } - private static byte i = 0; public static BulletConfiguration getRocketConfig() { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.STOCK)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.explosive = 4F; @@ -189,7 +189,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.HE)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.wear = 15; @@ -203,7 +203,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.INCENDIARY)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.wear = 15; @@ -218,7 +218,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.EMP)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.explosive = 2.5F; @@ -232,7 +232,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.SLEEK)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.explosive = 10F; @@ -247,7 +247,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.SHRAPNEL)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.explosive = 4F; @@ -261,7 +261,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.GLARE)); bullet.velocity = 5.0F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -277,7 +277,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.NUCLEAR)); bullet.velocity = 1.5F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -301,7 +301,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.CHLORINE)); bullet.velocity = 1.5F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -317,7 +317,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.RPC)); bullet.velocity = 3.0F; bullet.dmgMin = 20; bullet.dmgMax = 25; @@ -351,7 +351,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.PHOSPHORUS)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.wear = 15; @@ -368,7 +368,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.CANISTER)); bullet.dmgMin = 10; bullet.dmgMax = 15; bullet.explosive = 2F; @@ -403,7 +403,7 @@ public class GunRocketFactory { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.DIGAMMA)); bullet.velocity = 0.5F; bullet.dmgMin = 10; bullet.dmgMax = 15; @@ -426,22 +426,6 @@ public class GunRocketFactory { spear.posY = bullet.posY + 100; bullet.worldObj.spawnEntityInWorld(spear); - - /*for(int i = 0; i < 250; i++) { - - double ix = bullet.posX + bullet.worldObj.rand.nextGaussian() * 15; - double iy = bullet.posY + bullet.worldObj.rand.nextGaussian() * 2; - double iz = bullet.posZ + bullet.worldObj.rand.nextGaussian() * 15; - - ExAttrib at = Vec3.createVectorHelper(ix - bullet.posX, 0, iz - bullet.posZ).lengthVector() < 20 ? ExAttrib.DIGAMMA_CIRCUIT : ExAttrib.DIGAMMA; - - new ExplosionNT(bullet.worldObj, bullet, ix, iy, iz, 7.5F) - .addAttrib(ExAttrib.NOHURT) - .addAttrib(ExAttrib.NOPARTICLE) - .addAttrib(ExAttrib.NODROP) - .addAttrib(ExAttrib.NOSOUND) - .addAttrib(at).explode(); - }*/ } }; diff --git a/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java b/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java index 6aa983228..919797412 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java @@ -9,6 +9,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletUpdateBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.items.ItemAmmoEnums.AmmoStinger; import com.hbm.items.ModItems; import com.hbm.lib.HbmCollection.EnumGunManufacturer; import com.hbm.render.util.RenderScreenOverlay.Crosshair; @@ -88,11 +89,10 @@ GunConfiguration config = new GunConfiguration(); return config; } - private static byte i = 0; public static BulletConfiguration getRocketStingerConfig() { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.STOCK)); bullet.dmgMin = 20; bullet.dmgMax = 25; bullet.explosive = 4F; @@ -128,7 +128,7 @@ GunConfiguration config = new GunConfiguration(); public static BulletConfiguration getRocketStingerHEConfig() { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.HE)); bullet.dmgMin = 30; bullet.dmgMax = 35; bullet.explosive = 8F; @@ -165,7 +165,7 @@ GunConfiguration config = new GunConfiguration(); public static BulletConfiguration getRocketStingerIncendiaryConfig() { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.INCENDIARY)); bullet.dmgMin = 15; bullet.dmgMax = 20; bullet.explosive = 4F; @@ -202,7 +202,7 @@ GunConfiguration config = new GunConfiguration(); public static BulletConfiguration getRocketStingerNuclearConfig() { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.NUCLEAR)); bullet.dmgMin = 50; bullet.dmgMax = 55; bullet.explosive = 15F; @@ -239,7 +239,7 @@ GunConfiguration config = new GunConfiguration(); public static BulletConfiguration getRocketStingerBonesConfig() { BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket, 1, i++); + bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.BONES)); bullet.dmgMin = 20; bullet.dmgMax = 25; bullet.explosive = 8F; diff --git a/src/main/java/com/hbm/inventory/recipes/PressRecipes.java b/src/main/java/com/hbm/inventory/recipes/PressRecipes.java index 6dd6e1028..0f937cba8 100644 --- a/src/main/java/com/hbm/inventory/recipes/PressRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/PressRecipes.java @@ -106,7 +106,7 @@ public class PressRecipes { makeRecipe(StampType.C50, new ComparableStack(ModItems.assembly_calamity), ModItems.ammo_50bmg); makeRecipe(StampType.C50, new ComparableStack(ModItems.assembly_actionexpress), ModItems.ammo_50ae); makeRecipe(StampType.C50, new ComparableStack(ModItems.assembly_luna_sniper), ModItems.ammo_luna_sniper.stackFromEnum(AmmoLunaticSniper.SABOT)); - makeRecipe(StampType.C50, new ComparableStack(ModItems.assembly_308), ModItems.ammo_308); + makeRecipe(StampType.C50, new ComparableStack(ModItems.assembly_308), ModItems.ammo_762); } public static void makeRecipe(StampType type, AStack in, Item out) { diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index e4bbd2c4e..d0f854555 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -530,10 +530,10 @@ public class AnvilRecipes { {ModItems.ammo_45.stackFromEnum(20, Ammo45ACP.STOCK), DURA.ingot(), ModItems.ammo_45.stackFromEnum(20, Ammo45ACP.AP), 3}, {ModItems.ammo_45.stackFromEnum(10, Ammo45ACP.DU), U238.ingot(), ModItems.ammo_45.stackFromEnum(10, Ammo45ACP.DU), 3}, - {ModItems.ammo_5mm.stackFromEnum(20, Ammo5mm.STOCK), ModItems.ingot_semtex, ModItems.ammo_5mm.stackFromEnum(20, Ammo5mm.EXPLOSIVE), 2}, - {ModItems.ammo_5mm.stackFromEnum(20, Ammo5mm.STOCK), U238.ingot(), ModItems.ammo_5mm.stackFromEnum(20, Ammo5mm.DU), 2}, - {ModItems.ammo_5mm.stackFromEnum(10, Ammo5mm.STOCK), STAR.ingot(), ModItems.ammo_5mm.stackFromEnum(10, Ammo5mm.STAR), 3}, - {ModItems.ammo_5mm.stackFromEnum(10, Ammo5mm.STOCK), ModItems.pellet_chlorophyte, ModItems.ammo_5mm.stackFromEnum(10, Ammo5mm.CHLOROPHYTE), 3}, + {ModItems.ammo_5mm.stackFromEnum(100, Ammo5mm.STOCK), ModItems.ingot_semtex, ModItems.ammo_5mm.stackFromEnum(100, Ammo5mm.EXPLOSIVE), 2}, + {ModItems.ammo_5mm.stackFromEnum(100, Ammo5mm.STOCK), U238.ingot(), ModItems.ammo_5mm.stackFromEnum(100, Ammo5mm.DU), 2}, + {ModItems.ammo_5mm.stackFromEnum(25, Ammo5mm.DU), STAR.ingot(), ModItems.ammo_5mm.stackFromEnum(25, Ammo5mm.STAR), 3}, + {ModItems.ammo_5mm.stackFromEnum(100, Ammo5mm.STOCK), ModItems.pellet_chlorophyte, ModItems.ammo_5mm.stackFromEnum(100, Ammo5mm.CHLOROPHYTE), 3}, {ModItems.ammo_9mm.stackFromEnum(20, Ammo9mm.STOCK), DURA.ingot(), ModItems.ammo_9mm.stackFromEnum(20, Ammo9mm.AP), 2}, {ModItems.ammo_9mm.stackFromEnum(20, Ammo9mm.STOCK), U238.ingot(), ModItems.ammo_9mm.stackFromEnum(20, Ammo9mm.DU), 2}, @@ -573,10 +573,10 @@ public class AnvilRecipes { {ModItems.ammo_556.stackFromEnum(100, Ammo556mm.FLECHETTE), ModItems.coin_maskman, ModItems.ammo_556.stackFromEnum(100, Ammo556mm.FLECHETTE_SLEEK), 4}, {ModItems.ammo_556.stackFromEnum(10, Ammo556mm.FLECHETTE), ModItems.pellet_chlorophyte, ModItems.ammo_556.stackFromEnum(10, Ammo556mm.FLECHETTE_CHLOROPHYTE), 3}, - {ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.STOCK), Items.redstone, ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.TRACER), 2}, - {ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.STOCK), DURA.ingot(), ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.AP), 2}, - {ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.STOCK), P_WHITE.ingot(), ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.PHOSPHORUS), 2}, - {ModItems.ammo_308.stackFromEnum(10, Ammo762NATO.STOCK), U238.ingot(), ModItems.ammo_308.stackFromEnum(20, Ammo762NATO.DU), 2} + {ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.STOCK), Items.redstone, ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.TRACER), 2}, + {ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.STOCK), DURA.ingot(), ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.AP), 2}, + {ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.STOCK), P_WHITE.ingot(), ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.PHOSPHORUS), 2}, + {ModItems.ammo_762.stackFromEnum(10, Ammo762NATO.STOCK), U238.ingot(), ModItems.ammo_762.stackFromEnum(20, Ammo762NATO.DU), 2} }; for(Object[] objs : recs) { diff --git a/src/main/java/com/hbm/items/ItemAmmoEnums.java b/src/main/java/com/hbm/items/ItemAmmoEnums.java index e284cd76d..cca1a399b 100644 --- a/src/main/java/com/hbm/items/ItemAmmoEnums.java +++ b/src/main/java/com/hbm/items/ItemAmmoEnums.java @@ -3,24 +3,20 @@ package com.hbm.items; import java.util.Set; import com.google.common.collect.ImmutableSet; -import com.hbm.handler.BulletConfiguration; -import com.hbm.handler.guncfg.*; import com.hbm.items.weapon.ItemAmmo.AmmoItemTrait; import com.hbm.lib.HbmCollection; public class ItemAmmoEnums { public enum AmmoLunaticSniper implements IAmmoItemEnum { - SABOT("ammo_lunar", Gun50BMGFactory.getLunaticSabotRound()), - INCENDIARY("ammo_lunar_incendiary", Gun50BMGFactory.getLunaticIncendiaryRound()), - EXPLOSIVE("ammo_lunar_explosive", Gun50BMGFactory.getLunaticSabotRound()); + SABOT("ammo_lunar"), + INCENDIARY("ammo_lunar_incendiary"), + EXPLOSIVE("ammo_lunar_explosive"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoLunaticSniper(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoLunaticSniper(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -30,11 +26,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -42,16 +33,14 @@ public class ItemAmmoEnums { } public enum AmmoFireExt implements IAmmoItemEnum { - WATER("ammo_fireext", GunEnergyFactory.getFextConfig()), - FOAM("ammo_fireext_foam", GunEnergyFactory.getFextFoamConfig()), - SAND("ammo_fireext_sand", GunEnergyFactory.getFextSandConfig()); + WATER("ammo_fireext"), + FOAM("ammo_fireext_foam"), + SAND("ammo_fireext_sand"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoFireExt(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoFireExt(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -61,11 +50,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -73,18 +57,16 @@ public class ItemAmmoEnums { } public enum AmmoFlamethrower implements IAmmoItemEnum { - DIESEL("ammo_fuel", GunEnergyFactory.getFlameConfig()), - NAPALM("ammo_fuel_napalm", GunEnergyFactory.getNapalmConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.CON_HEAVY_WEAR), - PHOSPHORUS("ammo_fuel_phosphorus", GunEnergyFactory.getPhosphorusConfig(), AmmoItemTrait.PRO_PHOSPHORUS_SPLASH, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.PRO_ACCURATE1, AmmoItemTrait.NEU_WARCRIME1, AmmoItemTrait.CON_SING_PROJECTILE, AmmoItemTrait.CON_HEAVY_WEAR), - VAPORIZER("ammo_fuel_vaporizer", GunEnergyFactory.getVaporizerConfig(), AmmoItemTrait.PRO_PHOSPHORUS, AmmoItemTrait.PRO_FLAMES, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_ERASER, AmmoItemTrait.CON_ACCURACY2, AmmoItemTrait.CON_RANGE2, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_LING_FIRE), - CHLORINE("ammo_fuel_gas", GunEnergyFactory.getGasConfig(), AmmoItemTrait.PRO_NO_GRAVITY, AmmoItemTrait.PRO_POISON_GAS, AmmoItemTrait.CON_NO_DAMAGE, AmmoItemTrait.CON_NO_FIRE); + DIESEL("ammo_fuel"), + NAPALM("ammo_fuel_napalm", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.CON_HEAVY_WEAR), + PHOSPHORUS("ammo_fuel_phosphorus", AmmoItemTrait.PRO_PHOSPHORUS_SPLASH, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.PRO_ACCURATE1, AmmoItemTrait.NEU_WARCRIME1, AmmoItemTrait.CON_SING_PROJECTILE, AmmoItemTrait.CON_HEAVY_WEAR), + VAPORIZER("ammo_fuel_vaporizer", AmmoItemTrait.PRO_PHOSPHORUS, AmmoItemTrait.PRO_FLAMES, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_ERASER, AmmoItemTrait.CON_ACCURACY2, AmmoItemTrait.CON_RANGE2, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_LING_FIRE), + CHLORINE("ammo_fuel_gas", AmmoItemTrait.PRO_NO_GRAVITY, AmmoItemTrait.PRO_POISON_GAS, AmmoItemTrait.CON_NO_DAMAGE, AmmoItemTrait.CON_NO_FIRE); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoFlamethrower(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoFlamethrower(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -94,11 +76,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -107,14 +84,12 @@ public class ItemAmmoEnums { public enum AmmoMisc implements IAmmoItemEnum { //LUNA_SNIPER("ammo_lunar", Gun50BMGFactory.getLunaticSabotRound(), AmmoItemTrait.PRO_HEAVY_DAMAGE, AmmoItemTrait.PRO_ACCURATE2, AmmoItemTrait.NEU_HEAVY_METAL), - DGK("ammo_dkg", GunDGKFactory.getDGKConfig()); + DGK("ammo_dkg"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoMisc(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoMisc(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -124,11 +99,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -136,24 +106,21 @@ public class ItemAmmoEnums { } public enum AmmoStinger implements IAmmoItemEnum { - STOCK("ammo_stinger_rocket", GunRocketHomingFactory.getRocketStingerConfig()), - HE("ammo_stinger_rocket_he", GunRocketHomingFactory.getRocketStingerHEConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_WEAR), - INCENDIARY("ammo_stinger_rocket_incendiary", GunRocketHomingFactory.getRocketStingerIncendiaryConfig(), HbmCollection.IncendiaryType), - NUCLEAR("ammo_stinger_rocket_nuclear", GunRocketHomingFactory.getRocketStingerNuclearConfig(), AmmoItemTrait.PRO_NUCLEAR, AmmoItemTrait.CON_SUPER_WEAR), - BONES("ammo_stinger_rocket_bones", GunRocketHomingFactory.getRocketStingerBonesConfig()); + STOCK("ammo_stinger_rocket"), + HE("ammo_stinger_rocket_he", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_WEAR), + INCENDIARY("ammo_stinger_rocket_incendiary", HbmCollection.IncendiaryType), + NUCLEAR("ammo_stinger_rocket_nuclear", AmmoItemTrait.PRO_NUCLEAR, AmmoItemTrait.CON_SUPER_WEAR), + BONES("ammo_stinger_rocket_bones"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoStinger(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoStinger(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private AmmoStinger(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private AmmoStinger(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -163,11 +130,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -175,32 +137,29 @@ public class ItemAmmoEnums { } public enum AmmoRocket implements IAmmoItemEnum { - STOCK("ammo_rocket", GunRocketFactory.getRocketConfig()), - HE("ammo_rocket_he", GunRocketFactory.getRocketHEConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_WEAR), - INCENDIARY("ammo_rocket_incendiary", GunRocketFactory.getRocketIncendiaryConfig(), HbmCollection.IncendiaryType), - EMP("ammo_rocket_emp", GunRocketFactory.getRocketEMPConfig(), AmmoItemTrait.PRO_EMP, AmmoItemTrait.CON_RADIUS), - SLEEK("ammo_rocket_sleek", GunRocketFactory.getRocketSleekConfig(), AmmoItemTrait.PRO_RADIUS_HIGH, AmmoItemTrait.PRO_NO_GRAVITY, AmmoItemTrait.CON_SPEED), - SHRAPNEL("ammo_rocket_shrapnel", GunRocketFactory.getRocketShrapnelConfig(), AmmoItemTrait.PRO_SHRAPNEL), - GLARE("ammo_rocket_glare", GunRocketFactory.getRocketGlareConfig(), AmmoItemTrait.PRO_SPEED, AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), - NUCLEAR("ammo_rocket_nuclear", GunRocketFactory.getRocketNukeConfig(), AmmoItemTrait.PRO_NUCLEAR, AmmoItemTrait.CON_SUPER_WEAR, AmmoItemTrait.CON_SPEED), - CHLORINE("ammo_rocket_toxic", GunRocketFactory.getRocketChlorineConfig(), AmmoItemTrait.PRO_CHLORINE, AmmoItemTrait.CON_NO_EXPLODE1, AmmoItemTrait.CON_SPEED), - RPC("ammo_rocket_rpc", GunRocketFactory.getRocketRPCConfig(),AmmoItemTrait.PRO_CHAINSAW, AmmoItemTrait.PRO_PENETRATION, AmmoItemTrait.PRO_NO_GRAVITY, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_NO_EXPLODE1, AmmoItemTrait.NEU_UHH ), - PHOSPHORUS("ammo_rocket_phosphorus", GunRocketFactory.getRocketPhosphorusConfig(), HbmCollection.PhosphorusTypeSpecial), - CANISTER("ammo_rocket_canister", GunRocketFactory.getRocketCanisterConfig()), - DIGAMMA("ammo_rocket_digamma", GunRocketFactory.getRocketErrorConfig()); + STOCK("ammo_rocket"), + HE("ammo_rocket_he", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_WEAR), + INCENDIARY("ammo_rocket_incendiary", HbmCollection.IncendiaryType), + EMP("ammo_rocket_emp", AmmoItemTrait.PRO_EMP, AmmoItemTrait.CON_RADIUS), + SLEEK("ammo_rocket_sleek", AmmoItemTrait.PRO_RADIUS_HIGH, AmmoItemTrait.PRO_NO_GRAVITY, AmmoItemTrait.CON_SPEED), + SHRAPNEL("ammo_rocket_shrapnel", AmmoItemTrait.PRO_SHRAPNEL), + GLARE("ammo_rocket_glare", AmmoItemTrait.PRO_SPEED, AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), + NUCLEAR("ammo_rocket_nuclear", AmmoItemTrait.PRO_NUCLEAR, AmmoItemTrait.CON_SUPER_WEAR, AmmoItemTrait.CON_SPEED), + CHLORINE("ammo_rocket_toxic", AmmoItemTrait.PRO_CHLORINE, AmmoItemTrait.CON_NO_EXPLODE1, AmmoItemTrait.CON_SPEED), + RPC("ammo_rocket_rpc", AmmoItemTrait.PRO_CHAINSAW, AmmoItemTrait.PRO_PENETRATION, AmmoItemTrait.PRO_NO_GRAVITY, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_NO_EXPLODE1, AmmoItemTrait.NEU_UHH ), + PHOSPHORUS("ammo_rocket_phosphorus", HbmCollection.PhosphorusTypeSpecial), + CANISTER("ammo_rocket_canister"), + DIGAMMA("ammo_rocket_digamma"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoRocket(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoRocket(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private AmmoRocket(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private AmmoRocket(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -210,11 +169,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -222,24 +176,22 @@ public class ItemAmmoEnums { } public enum AmmoGrenade implements IAmmoItemEnum { - STOCK("ammo_grenade", GunGrenadeFactory.getGrenadeConfig()), - HE("ammo_grenade_he", GunGrenadeFactory.getGrenadeHEConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_WEAR), - INCENDIARY("ammo_grenade_incendiary", GunGrenadeFactory.getGrenadeIncendirayConfig(), AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), - PHOSPHORUS("ammo_grenade_phosphorus", GunGrenadeFactory.getGrenadePhosphorusConfig(), AmmoItemTrait.PRO_PHOSPHORUS_SPLASH, AmmoItemTrait.NEU_WARCRIME1, AmmoItemTrait.CON_WEAR), - CHLORINE("ammo_grenade_toxic", GunGrenadeFactory.getGrenadeChlorineConfig(), AmmoItemTrait.PRO_CHLORINE, AmmoItemTrait.CON_NO_EXPLODE1), - SLEEK("ammo_grenade_sleek", GunGrenadeFactory.getGrenadeSleekConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.NEU_JOLT), - CONCUSSION("ammo_grenade_concussion", GunGrenadeFactory.getGrenadeConcussionConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_NO_EXPLODE2), - FINNED("ammo_grenade_finned", GunGrenadeFactory.getGrenadeFinnedConfig(), AmmoItemTrait.PRO_GRAVITY, AmmoItemTrait.CON_RADIUS), - NUCLEAR("ammo_grenade_nuclear", GunGrenadeFactory.getGrenadeNuclearConfig(), AmmoItemTrait.PRO_NUCLEAR, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.CON_HEAVY_WEAR), - TRACER("ammo_grenade_tracer", GunGrenadeFactory.getGrenadeTracerConfig(), AmmoItemTrait.NEU_BLANK), - KAMPF("ammo_grenade_kampf", GunGrenadeFactory.getGrenadeKampfConfig(), AmmoItemTrait.PRO_ROCKET_PROPELLED, AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.PRO_ACCURATE1, AmmoItemTrait.CON_WEAR); + STOCK("ammo_grenade"), + HE("ammo_grenade_he", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_WEAR), + INCENDIARY("ammo_grenade_incendiary", AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), + PHOSPHORUS("ammo_grenade_phosphorus", AmmoItemTrait.PRO_PHOSPHORUS_SPLASH, AmmoItemTrait.NEU_WARCRIME1, AmmoItemTrait.CON_WEAR), + CHLORINE("ammo_grenade_toxic", AmmoItemTrait.PRO_CHLORINE, AmmoItemTrait.CON_NO_EXPLODE1), + SLEEK("ammo_grenade_sleek", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.NEU_JOLT), + CONCUSSION("ammo_grenade_concussion", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.CON_NO_EXPLODE2), + FINNED("ammo_grenade_finned", AmmoItemTrait.PRO_GRAVITY, AmmoItemTrait.CON_RADIUS), + NUCLEAR("ammo_grenade_nuclear", AmmoItemTrait.PRO_NUCLEAR, AmmoItemTrait.PRO_RANGE, AmmoItemTrait.CON_HEAVY_WEAR), + TRACER("ammo_grenade_tracer", AmmoItemTrait.NEU_BLANK), + KAMPF("ammo_grenade_kampf", AmmoItemTrait.PRO_ROCKET_PROPELLED, AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.PRO_ACCURATE1, AmmoItemTrait.CON_WEAR); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoGrenade(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoGrenade(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -249,11 +201,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -261,26 +208,24 @@ public class ItemAmmoEnums { } public enum AmmoFatman implements IAmmoItemEnum { - STOCK("ammo_nuke", GunFatmanFactory.getNukeConfig()), - LOW("ammo_nuke_low", GunFatmanFactory.getNukeLowConfig(), AmmoItemTrait.CON_RADIUS), - HIGH("ammo_nuke_high", GunFatmanFactory.getNukeHighConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.PRO_FALLOUT), - TOTS("ammo_nuke_tots", GunFatmanFactory.getNukeTotsConfig(), AmmoItemTrait.PRO_BOMB_COUNT, AmmoItemTrait.NEU_FUN, AmmoItemTrait.CON_ACCURACY2, AmmoItemTrait.CON_RADIUS, AmmoItemTrait.CON_NO_MIRV), - SAFE("ammo_nuke_safe", GunFatmanFactory.getNukeSafeConfig(), AmmoItemTrait.CON_RADIUS, AmmoItemTrait.CON_NO_EXPLODE2), - PUMPKIN("ammo_nuke_pumpkin", GunFatmanFactory.getNukePumpkinConfig(), AmmoItemTrait.CON_NN), - MIRV("ammo_mirv", GunFatmanFactory.getMirvConfig()), - MIRV_LOW("ammo_mirv_low", GunFatmanFactory.getMirvLowConfig(), AmmoItemTrait.CON_RADIUS), - MIRV_HIGH("ammo_mirv_high", GunFatmanFactory.getMirvHighConfig(), AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.PRO_FALLOUT), - MIRV_SAFE("ammo_mirv_safe", GunFatmanFactory.getMirvSafeConfig(), AmmoItemTrait.CON_RADIUS, AmmoItemTrait.CON_NO_EXPLODE2), - MIRV_SPECIAL("ammo_mirv_special", GunFatmanFactory.getMirvSpecialConfig()), - BALEFIRE("gun_bf_ammo", GunFatmanFactory.getBalefireConfig()), - BARREL("ammo_nuke_barrel", GunFatmanFactory.getNukeBarrelConfig()); + STOCK("ammo_nuke"), + LOW("ammo_nuke_low", AmmoItemTrait.CON_RADIUS), + HIGH("ammo_nuke_high", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.PRO_FALLOUT), + TOTS("ammo_nuke_tots", AmmoItemTrait.PRO_BOMB_COUNT, AmmoItemTrait.NEU_FUN, AmmoItemTrait.CON_ACCURACY2, AmmoItemTrait.CON_RADIUS, AmmoItemTrait.CON_NO_MIRV), + SAFE("ammo_nuke_safe", AmmoItemTrait.CON_RADIUS, AmmoItemTrait.CON_NO_EXPLODE2), + PUMPKIN("ammo_nuke_pumpkin", AmmoItemTrait.CON_NN), + MIRV("ammo_mirv"), + MIRV_LOW("ammo_mirv_low", AmmoItemTrait.CON_RADIUS), + MIRV_HIGH("ammo_mirv_high", AmmoItemTrait.PRO_RADIUS, AmmoItemTrait.PRO_FALLOUT), + MIRV_SAFE("ammo_mirv_safe", AmmoItemTrait.CON_RADIUS, AmmoItemTrait.CON_NO_EXPLODE2), + MIRV_SPECIAL("ammo_mirv_special"), + BALEFIRE("gun_bf_ammo"), + BARREL("ammo_nuke_barrel"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoFatman(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoFatman(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -290,11 +235,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -302,16 +242,14 @@ public class ItemAmmoEnums { } public enum AmmoDart implements IAmmoItemEnum { - GPS("ammo_dart", GunDartFactory.getGPSConfig()), - NUCLEAR("ammo_dart_nuclear", GunDartFactory.getNukeConfig()), - NERF("ammo_dart_nerf", GunDartFactory.getNERFConfig()); + GPS("ammo_dart"), + NUCLEAR("ammo_dart_nuclear"), + NERF("ammo_dart_nerf"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private AmmoDart(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private AmmoDart(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -321,11 +259,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -333,18 +266,16 @@ public class ItemAmmoEnums { } public enum Ammo240Shell implements IAmmoItemEnum { - STOCK("ammo_shell", GunCannonFactory.getShellConfig()), - EXPLOSIVE("ammo_shell_explosive", GunCannonFactory.getShellExplosiveConfig()), - APFSDS_T("ammo_shell_apfsds_t", GunCannonFactory.getShellAPConfig()), - APFSDS_DU("ammo_shell_apfsds_du", GunCannonFactory.getShellDUConfig()), - W9("ammo_shell_w9", GunCannonFactory.getShellW9Config()); + STOCK("ammo_shell"), + EXPLOSIVE("ammo_shell_explosive"), + APFSDS_T("ammo_shell_apfsds_t"), + APFSDS_DU("ammo_shell_apfsds_du"), + W9("ammo_shell_w9"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo240Shell(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo240Shell(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -354,11 +285,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -366,24 +292,21 @@ public class ItemAmmoEnums { } public enum Ammo9mm implements IAmmoItemEnum { - STOCK("ammo_9mm", Gun9mmFactory.get9mmConfig()), - AP("ammo_9mm_ap", Gun9mmFactory.get9mmAPConfig(), HbmCollection.APType), - DU("ammo_9mm_du", Gun9mmFactory.get9mmDUConfig(), HbmCollection.DUType), - CHLOROPHYTE("ammo_9mm_chlorophyte", Gun9mmFactory.get9mmConfig().getChlorophyte(), HbmCollection.ChlorophyteType), - ROCKET("ammo_9mm_rocket", Gun9mmFactory.get9mmRocketConfig(), AmmoItemTrait.PRO_ROCKET, AmmoItemTrait.NEU_UHH); + STOCK("ammo_9mm"), + AP("ammo_9mm_ap", HbmCollection.APType), + DU("ammo_9mm_du", HbmCollection.DUType), + CHLOROPHYTE("ammo_9mm_chlorophyte", HbmCollection.ChlorophyteType), + ROCKET("ammo_9mm_rocket", AmmoItemTrait.PRO_ROCKET, AmmoItemTrait.NEU_UHH); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo9mm(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo9mm(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo9mm(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo9mm(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -393,11 +316,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -405,25 +323,22 @@ public class ItemAmmoEnums { } public enum Ammo762NATO implements IAmmoItemEnum { - STOCK("ammo_762", Gun762mmFactory.get762NATOConfig()), - AP("ammo_762_ap", Gun762mmFactory.get762APConfig(), HbmCollection.APType), - DU("ammo_762_du", Gun762mmFactory.get762DUConfig(), HbmCollection.DUType), - TRACER("ammo_762_tracer", Gun762mmFactory.get762TracerConfig(), AmmoItemTrait.NEU_TRACER), - PHOSPHORUS("ammo_762_phosphorus", Gun762mmFactory.get762WPConfig(), HbmCollection.PhosphorusType), - BLANK("ammo_762_blank", Gun762mmFactory.get762BlankConfig(), AmmoItemTrait.NEU_BLANK); + STOCK("ammo_762"), + AP("ammo_762_ap", HbmCollection.APType), + DU("ammo_762_du", HbmCollection.DUType), + TRACER("ammo_762_tracer", AmmoItemTrait.NEU_TRACER), + PHOSPHORUS("ammo_762_phosphorus", HbmCollection.PhosphorusType), + BLANK("ammo_762_blank", AmmoItemTrait.NEU_BLANK); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo762NATO(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo762NATO(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo762NATO(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo762NATO(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -433,11 +348,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -445,16 +355,14 @@ public class ItemAmmoEnums { } public enum Ammo75Bolt implements IAmmoItemEnum { - STOCK("ammo_75bolt", Gun75BoltFactory.get75BoltConfig()), - INCENDIARY("ammo_75bolt_incendiary", Gun75BoltFactory.get75BoltIncConfig()), - HE("ammo_75bolt_he", Gun75BoltFactory.get75BoltHEConfig()); + STOCK("ammo_75bolt"), + INCENDIARY("ammo_75bolt_incendiary"), + HE("ammo_75bolt_he"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo75Bolt(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo75Bolt(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -464,11 +372,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -476,24 +379,21 @@ public class ItemAmmoEnums { } public enum Ammo5mm implements IAmmoItemEnum { - STOCK("ammo_5mm", Gun5mmFactory.get5mmConfig()), - EXPLOSIVE("ammo_5mm_explosive", Gun5mmFactory.get5mmExplosiveConfig(), HbmCollection.ExplosiveType), - DU("ammo_5mm_du", Gun5mmFactory.get5mmDUConfig(), HbmCollection.DUType), - STAR("ammo_5mm_star", Gun5mmFactory.get5mmStarConfig(), HbmCollection.StarmetalType), - CHLOROPHYTE("ammo_5mm_chlorophyte", Gun5mmFactory.get5mmConfig().getChlorophyte(), HbmCollection.ChlorophyteType); + STOCK("ammo_5mm"), + EXPLOSIVE("ammo_5mm_explosive", HbmCollection.ExplosiveType), + DU("ammo_5mm_du", HbmCollection.DUType), + STAR("ammo_5mm_star", HbmCollection.StarmetalType), + CHLOROPHYTE("ammo_5mm_chlorophyte", HbmCollection.ChlorophyteType); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo5mm(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo5mm(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo5mm(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo5mm(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -503,11 +403,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -515,35 +410,32 @@ public class ItemAmmoEnums { } public enum Ammo556mm implements IAmmoItemEnum { - STOCK("ammo_556", Gun556mmFactory.get556Config()), - GOLD("gun_pm_ammo", Gun556mmFactory.get556GoldConfig()), - PHOSPHORUS("ammo_556_phosphorus", Gun556mmFactory.get556PhosphorusConfig(), HbmCollection.PhosphorusType), - AP("ammo_556_ap", Gun556mmFactory.get556APConfig(), HbmCollection.APType), - DU("ammo_556_du", Gun556mmFactory.get556DUConfig(), HbmCollection.DUType), - STAR("ammo_556_star", Gun556mmFactory.get556StarConfig(), HbmCollection.StarmetalType), - CHLOROPHYTE("ammo_556_chlorophyte", Gun556mmFactory.get556Config().getChlorophyte(), HbmCollection.ChlorophyteType), - SLEEK("ammo_556_sleek", Gun556mmFactory.get556SleekConfig(), AmmoItemTrait.NEU_MASKMAN_METEORITE), - TRACER("ammo_556_tracer", Gun556mmFactory.get556TracerConfig(), AmmoItemTrait.NEU_TRACER), - FLECHETTE("ammo_556_flechette", Gun556mmFactory.get556FlechetteConfig(), HbmCollection.FlechetteType), - FLECHETTE_INCENDIARY("ammo_556_flechette_incendiary", Gun556mmFactory.get556FlechetteIncendiaryConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_PENETRATION), - FLECHETTE_PHOSPHORUS("ammo_556_flechette_phosphorus", Gun556mmFactory.get556FlechettePhosphorusConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_PHOSPHORUS, AmmoItemTrait.NEU_WARCRIME2, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_PENETRATION), - FLECHETTE_DU("ammo_556_flechette_du", Gun556mmFactory.get556FlechetteDUConfig(), AmmoItemTrait.PRO_HEAVY_DAMAGE, AmmoItemTrait.PRO_PENETRATION, AmmoItemTrait.NEU_HEAVY_METAL, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_HEAVY_WEAR), - FLECHETTE_CHLOROPHYTE("ammo_556_flechette_chlorophyte", Gun556mmFactory.get556FlechetteConfig().getChlorophyte(), HbmCollection.ChlorophyteType), - FLECHETTE_SLEEK("ammo_556_flechette_sleek", Gun556mmFactory.get556FlechetteSleekConfig(), AmmoItemTrait.NEU_MASKMAN_METEORITE), - K("ammo_556_k", Gun556mmFactory.get556KConfig(), AmmoItemTrait.NEU_BLANK); + STOCK("ammo_556"), + GOLD("gun_pm_ammo"), + PHOSPHORUS("ammo_556_phosphorus", HbmCollection.PhosphorusType), + AP("ammo_556_ap", HbmCollection.APType), + DU("ammo_556_du", HbmCollection.DUType), + STAR("ammo_556_star", HbmCollection.StarmetalType), + CHLOROPHYTE("ammo_556_chlorophyte", HbmCollection.ChlorophyteType), + SLEEK("ammo_556_sleek", AmmoItemTrait.NEU_MASKMAN_METEORITE), + TRACER("ammo_556_tracer", AmmoItemTrait.NEU_TRACER), + FLECHETTE("ammo_556_flechette", HbmCollection.FlechetteType), + FLECHETTE_INCENDIARY("ammo_556_flechette_incendiary", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_PENETRATION), + FLECHETTE_PHOSPHORUS("ammo_556_flechette_phosphorus", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_PHOSPHORUS, AmmoItemTrait.NEU_WARCRIME2, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_PENETRATION), + FLECHETTE_DU("ammo_556_flechette_du", AmmoItemTrait.PRO_HEAVY_DAMAGE, AmmoItemTrait.PRO_PENETRATION, AmmoItemTrait.NEU_HEAVY_METAL, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_HEAVY_WEAR), + FLECHETTE_CHLOROPHYTE("ammo_556_flechette_chlorophyte", HbmCollection.ChlorophyteType), + FLECHETTE_SLEEK("ammo_556_flechette_sleek", AmmoItemTrait.NEU_MASKMAN_METEORITE), + K("ammo_556_k", AmmoItemTrait.NEU_BLANK); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo556mm(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo556mm(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo556mm(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo556mm(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -553,11 +445,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -565,31 +452,28 @@ public class ItemAmmoEnums { } public enum Ammo50BMG implements IAmmoItemEnum { - STOCK("ammo_50bmg", Gun50BMGFactory.get50BMGConfig()), - INCENDIARY("ammo_50bmg_incendiary", Gun50BMGFactory.get50BMGFireConfig(), HbmCollection.IncendiaryType), - PHOSPHORUS("ammo_50bmg_phosphorus", Gun50BMGFactory.get50BMGPhosphorusConfig(), HbmCollection.PhosphorusType), - EXPLOSIVE("ammo_50bmg_explosive", Gun50BMGFactory.get50BMGExplosiveConfig(), HbmCollection.ExplosiveType), - AP("ammo_50bmg_ap", Gun50BMGFactory.get50BMGAPConfig(), HbmCollection.APType), - DU("ammo_50bmg_du", Gun50BMGFactory.get50BMGDUConfig(), HbmCollection.DUType), - STAR("ammo_50bmg_star", Gun50BMGFactory.get50BMGStarConfig(), HbmCollection.StarmetalType), - CHLOROPHYTE("ammo_50bmg_chlorophyte", Gun50BMGFactory.get50BMGConfig().getChlorophyte(), HbmCollection.ChlorophyteType), - SLEEK("ammo_50bmg_sleek", Gun50BMGFactory.get50BMGSleekConfig(), AmmoItemTrait.NEU_MASKMAN_METEORITE), - FLECHETTE("ammo_50bmg_flechette", Gun50BMGFactory.get50BMGFlechetteConfig(), AmmoItemTrait.PRO_DAMAGE), - FLECHETTE_AM("ammo_50bmg_flechette_am", Gun50BMGFactory.get50BMGFlechetteAMConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_UHH), - FLECHETTE_PO("ammo_50bmg_flechette_po", Gun50BMGFactory.get50BMGFlechettePOConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_UHH); + STOCK("ammo_50bmg"), + INCENDIARY("ammo_50bmg_incendiary", HbmCollection.IncendiaryType), + PHOSPHORUS("ammo_50bmg_phosphorus", HbmCollection.PhosphorusType), + EXPLOSIVE("ammo_50bmg_explosive", HbmCollection.ExplosiveType), + AP("ammo_50bmg_ap", HbmCollection.APType), + DU("ammo_50bmg_du", HbmCollection.DUType), + STAR("ammo_50bmg_star", HbmCollection.StarmetalType), + CHLOROPHYTE("ammo_50bmg_chlorophyte", HbmCollection.ChlorophyteType), + SLEEK("ammo_50bmg_sleek", AmmoItemTrait.NEU_MASKMAN_METEORITE), + FLECHETTE("ammo_50bmg_flechette", AmmoItemTrait.PRO_DAMAGE), + FLECHETTE_AM("ammo_50bmg_flechette_am", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_UHH), + FLECHETTE_PO("ammo_50bmg_flechette_po", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_UHH); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo50BMG(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo50BMG(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo50BMG(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo50BMG(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -599,11 +483,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -611,24 +490,21 @@ public class ItemAmmoEnums { } public enum Ammo50AE implements IAmmoItemEnum { - STOCK("ammo_50ae", Gun50AEFactory.get50AEConfig()), - AP("ammo_50ae_ap", Gun50AEFactory.get50APConfig(), HbmCollection.APType), - DU("ammo_50ae_du", Gun50AEFactory.get50DUConfig(), HbmCollection.DUType), - STAR("ammo_50ae_star", Gun50AEFactory.get50StarConfig(), HbmCollection.StarmetalType), - CHLOROPHYTE("ammo_50ae_chlorophyte", Gun50AEFactory.get50AEConfig().getChlorophyte(), HbmCollection.ChlorophyteType); + STOCK("ammo_50ae"), + AP("ammo_50ae_ap", HbmCollection.APType), + DU("ammo_50ae_du", HbmCollection.DUType), + STAR("ammo_50ae_star", HbmCollection.StarmetalType), + CHLOROPHYTE("ammo_50ae_chlorophyte", HbmCollection.ChlorophyteType); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo50AE(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo50AE(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo50AE(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo50AE(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -638,11 +514,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -650,33 +521,30 @@ public class ItemAmmoEnums { } public enum Ammo4Gauge implements IAmmoItemEnum { - STOCK("ammo_4gauge", Gun4GaugeFactory.get4GaugeConfig()), - SLUG("ammo_4gauge_slug", Gun4GaugeFactory.get4GaugeSlugConfig(), AmmoItemTrait.PRO_ACCURATE2, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), - FLECHETTE("ammo_4gauge_flechette", Gun4GaugeFactory.get4GaugeFlechetteConfig(), HbmCollection.FlechetteType), - FLECHETTE_PHOSPHORUS("ammo_4gauge_flechette_phosphorus", Gun4GaugeFactory.get4GaugeFlechettePhosphorusConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_PHOSPHORUS, AmmoItemTrait.NEU_WARCRIME2, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_WEAR), - EXPLOSIVE("ammo_4gauge_explosive", Gun4GaugeFactory.get4GaugeExplosiveConfig(), AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_40MM, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), - MINING("ammo_4gauge_semtex", Gun4GaugeFactory.get4GaugeMiningConfig(), AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_MINING, AmmoItemTrait.CON_NO_EXPLODE3, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), - BALEFIRE("ammo_4gauge_balefire", Gun4GaugeFactory.get4GaugeBalefireConfig(), AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_BALEFIRE, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), - KAMPF("ammo_4gauge_kampf", Gun4GaugeFactory.getGrenadeKampfConfig(), AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_ROCKET_PROPELLED, AmmoItemTrait.PRO_ACCURATE1, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), - CANISTER("ammo_4gauge_canister", Gun4GaugeFactory.getGrenadeCanisterConfig()), - SLEEK("ammo_4gauge_sleek", Gun4GaugeFactory.get4GaugeSleekConfig(), AmmoItemTrait.NEU_MASKMAN_FLECHETTE), - CLAW("ammo_4gauge_claw", Gun4GaugeFactory.get4GaugeClawConfig()), - VAMPIRE("ammo_4gauge_vampire", Gun4GaugeFactory.get4GaugeVampireConfig()), - VOID("ammo_4gauge_void", Gun4GaugeFactory.get4GaugeVoidConfig()), - QUACK("ammo_4gauge_titan", Gun4GaugeFactory.get4GaugeQuackConfig(), AmmoItemTrait.PRO_MARAUDER, AmmoItemTrait.NEU_NO_CON); + STOCK("ammo_4gauge"), + SLUG("ammo_4gauge_slug", AmmoItemTrait.PRO_ACCURATE2, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), + FLECHETTE("ammo_4gauge_flechette", HbmCollection.FlechetteType), + FLECHETTE_PHOSPHORUS("ammo_4gauge_flechette_phosphorus", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_PHOSPHORUS, AmmoItemTrait.NEU_WARCRIME2, AmmoItemTrait.NEU_LESS_BOUNCY, AmmoItemTrait.CON_WEAR), + EXPLOSIVE("ammo_4gauge_explosive", AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_40MM, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), + MINING("ammo_4gauge_semtex", AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_MINING, AmmoItemTrait.CON_NO_EXPLODE3, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), + BALEFIRE("ammo_4gauge_balefire", AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_BALEFIRE, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.CON_HEAVY_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), + KAMPF("ammo_4gauge_kampf", AmmoItemTrait.PRO_EXPLOSIVE, AmmoItemTrait.PRO_ROCKET_PROPELLED, AmmoItemTrait.PRO_ACCURATE1, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.CON_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), + CANISTER("ammo_4gauge_canister"), + SLEEK("ammo_4gauge_sleek", AmmoItemTrait.NEU_MASKMAN_FLECHETTE), + CLAW("ammo_4gauge_claw"), + VAMPIRE("ammo_4gauge_vampire"), + VOID("ammo_4gauge_void"), + QUACK("ammo_4gauge_titan", AmmoItemTrait.PRO_MARAUDER, AmmoItemTrait.NEU_NO_CON); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo4Gauge(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo4Gauge(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo4Gauge(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo4Gauge(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -686,11 +554,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -698,22 +561,19 @@ public class ItemAmmoEnums { } public enum Ammo45ACP implements IAmmoItemEnum { - STOCK("ammo_45", Gun45ACPFactory.get45AutoConfig()), - AP("ammo_45_ap", Gun45ACPFactory.get45AutoAPConfig(), HbmCollection.APType), - DU("ammo_45_du", Gun45ACPFactory.get45AutoDUConfig(), HbmCollection.DUType); + STOCK("ammo_45"), + AP("ammo_45_ap", HbmCollection.APType), + DU("ammo_45_du", HbmCollection.DUType); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo45ACP(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo45ACP(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo45ACP(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo45ACP(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -723,11 +583,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -735,29 +590,26 @@ public class ItemAmmoEnums { } public enum Ammo44Magnum implements IAmmoItemEnum { - STOCK("ammo_44", Gun44MagnumFactory.getNoPipConfig()), - AP("ammo_44_ap", Gun44MagnumFactory.getNoPipAPConfig(), HbmCollection.APType), - DU("ammo_44_du", Gun44MagnumFactory.getNoPipDUConfig(), HbmCollection.DUType), - PHOSPHORUS("ammo_44_phosphorus", Gun44MagnumFactory.getPhosphorusConfig(), HbmCollection.PhosphorusType), - STAR("ammo_44_star", Gun44MagnumFactory.getNoPipStarConfig(), HbmCollection.StarmetalType), - CHLOROPHYTE("ammo_44_chlorophyte", Gun44MagnumFactory.getNoPipConfig().getChlorophyte(), HbmCollection.ChlorophyteType), - PIP("ammo_44_pip", Gun44MagnumFactory.getPipConfig(), AmmoItemTrait.NEU_BOXCAR, AmmoItemTrait.CON_DAMAGE), - BJ("ammo_44_bj", Gun44MagnumFactory.getBJConfig(), AmmoItemTrait.NEU_BOAT, AmmoItemTrait.CON_DAMAGE), - SILVER("ammo_44_silver", Gun44MagnumFactory.getSilverStormConfig(), AmmoItemTrait.NEU_BUILDING, AmmoItemTrait.CON_DAMAGE), - ROCKET("ammo_44_rocket", Gun44MagnumFactory.getRocketConfig(), AmmoItemTrait.PRO_ROCKET, AmmoItemTrait.NEU_UHH); + STOCK("ammo_44"), + AP("ammo_44_ap", HbmCollection.APType), + DU("ammo_44_du", HbmCollection.DUType), + PHOSPHORUS("ammo_44_phosphorus", HbmCollection.PhosphorusType), + STAR("ammo_44_star", HbmCollection.StarmetalType), + CHLOROPHYTE("ammo_44_chlorophyte", HbmCollection.ChlorophyteType), + PIP("ammo_44_pip", AmmoItemTrait.NEU_BOXCAR, AmmoItemTrait.CON_DAMAGE), + BJ("ammo_44_bj", AmmoItemTrait.NEU_BOAT, AmmoItemTrait.CON_DAMAGE), + SILVER("ammo_44_silver", AmmoItemTrait.NEU_BUILDING, AmmoItemTrait.CON_DAMAGE), + ROCKET("ammo_44_rocket", AmmoItemTrait.PRO_ROCKET, AmmoItemTrait.NEU_UHH); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo44Magnum(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo44Magnum(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo44Magnum(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo44Magnum(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -767,11 +619,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -779,22 +626,20 @@ public class ItemAmmoEnums { } public enum Ammo357Magnum implements IAmmoItemEnum { - IRON("gun_revolver_iron_ammo", Gun357MagnumFactory.getRevIronConfig()), - LEAD("gun_revolver_ammo", Gun357MagnumFactory.getRevLeadConfig()), - NUCLEAR("gun_revolver_lead_ammo", Gun357MagnumFactory.getRevNuclearConfig()), - GOLD("gun_revolver_gold_ammo", Gun357MagnumFactory.getRevGoldConfig()), - DESH("ammo_357_desh", Gun357MagnumFactory.getRevDeshConfig(), AmmoItemTrait.PRO_FIT_357, AmmoItemTrait.PRO_DAMAGE_SLIGHT), - SCHRABIDIUM("gun_revolver_schrabidium_ammo", Gun357MagnumFactory.getRevSchrabidiumConfig()), - STEEL("gun_revolver_cursed_ammo", Gun357MagnumFactory.getRevCursedConfig()), - NIGHTMARE1("gun_revolver_nightmare_ammo", Gun357MagnumFactory.getRevNightmare1Config()), - NIGHTMARE2("gun_revolver_nightmare2_ammo", Gun357MagnumFactory.getRevNightmare2Config()); + IRON("gun_revolver_iron_ammo"), + LEAD("gun_revolver_ammo"), + NUCLEAR("gun_revolver_lead_ammo"), + GOLD("gun_revolver_gold_ammo"), + DESH("ammo_357_desh", AmmoItemTrait.PRO_FIT_357, AmmoItemTrait.PRO_DAMAGE_SLIGHT), + SCHRABIDIUM("gun_revolver_schrabidium_ammo"), + STEEL("gun_revolver_cursed_ammo"), + NIGHTMARE1("gun_revolver_nightmare_ammo"), + NIGHTMARE2("gun_revolver_nightmare2_ammo"); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo357Magnum(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo357Magnum(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } @@ -804,11 +649,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -816,22 +656,19 @@ public class ItemAmmoEnums { } public enum Ammo22LR implements IAmmoItemEnum { - STOCK("ammo_22lr", Gun22LRFactory.get22LRConfig()), - AP("ammo_22lr_ap", Gun22LRFactory.get22LRAPConfig(), HbmCollection.APType), - CHLOROPHYTE("ammo_22lr_chlorophyte", Gun22LRFactory.get22LRConfig().getChlorophyte(), HbmCollection.ChlorophyteType); + STOCK("ammo_22lr"), + AP("ammo_22lr_ap", HbmCollection.APType), + CHLOROPHYTE("ammo_22lr_chlorophyte", HbmCollection.ChlorophyteType); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo22LR(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo22LR(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo22LR(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo22LR(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -841,11 +678,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -853,29 +685,26 @@ public class ItemAmmoEnums { } public enum Ammo20Gauge implements IAmmoItemEnum { - STOCK("ammo_20gauge", Gun20GaugeFactory.get20GaugeConfig()), - SLUG("ammo_20gauge_slug", Gun20GaugeFactory.get20GaugeSlugConfig(), AmmoItemTrait.PRO_ACCURATE2, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), - FLECHETTE("ammo_20gauge_flechette", Gun20GaugeFactory.get20GaugeFlechetteConfig(), HbmCollection.FlechetteType), - INCENDIARY("ammo_20gauge_incendiary", Gun20GaugeFactory.get20GaugeFireConfig(), AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), - SHRAPNEL("ammo_20gauge_shrapnel", Gun20GaugeFactory.get20GaugeShrapnelConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_MORE_BOUNCY, AmmoItemTrait.CON_WEAR), - EXPLOSIVE("ammo_20gauge_explosive", Gun20GaugeFactory.get20GaugeExplosiveConfig(), HbmCollection.ExplosiveType), - CAUSTIC("ammo_20gauge_caustic", Gun20GaugeFactory.get20GaugeCausticConfig(), AmmoItemTrait.PRO_TOXIC, AmmoItemTrait.PRO_CAUSTIC, AmmoItemTrait.NEU_NO_BOUNCE, AmmoItemTrait.CON_HEAVY_WEAR), - SHOCK("ammo_20gauge_shock", Gun20GaugeFactory.get20GaugeShockConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_STUNNING, AmmoItemTrait.PRO_EMP, AmmoItemTrait.NEU_NO_BOUNCE, AmmoItemTrait.CON_HEAVY_WEAR), - WITHER("ammo_20gauge_wither", Gun20GaugeFactory.get20GaugeWitherConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_WITHERING), - SLEEK("ammo_20gauge_sleek", Gun20GaugeFactory.get20GaugeSleekConfig(), AmmoItemTrait.NEU_MASKMAN_FLECHETTE); + STOCK("ammo_20gauge"), + SLUG("ammo_20gauge_slug", AmmoItemTrait.PRO_ACCURATE2, AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_WEAR, AmmoItemTrait.CON_SING_PROJECTILE), + FLECHETTE("ammo_20gauge_flechette", HbmCollection.FlechetteType), + INCENDIARY("ammo_20gauge_incendiary", AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), + SHRAPNEL("ammo_20gauge_shrapnel", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_MORE_BOUNCY, AmmoItemTrait.CON_WEAR), + EXPLOSIVE("ammo_20gauge_explosive", HbmCollection.ExplosiveType), + CAUSTIC("ammo_20gauge_caustic", AmmoItemTrait.PRO_TOXIC, AmmoItemTrait.PRO_CAUSTIC, AmmoItemTrait.NEU_NO_BOUNCE, AmmoItemTrait.CON_HEAVY_WEAR), + SHOCK("ammo_20gauge_shock", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_STUNNING, AmmoItemTrait.PRO_EMP, AmmoItemTrait.NEU_NO_BOUNCE, AmmoItemTrait.CON_HEAVY_WEAR), + WITHER("ammo_20gauge_wither", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_WITHERING), + SLEEK("ammo_20gauge_sleek", AmmoItemTrait.NEU_MASKMAN_FLECHETTE); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo20Gauge(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { - this.config = config; + private Ammo20Gauge(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); this.unloc = unloc; } - private Ammo20Gauge(String unloc, BulletConfiguration config, Set traits) { - this.config = config; + private Ammo20Gauge(String unloc, Set traits) { this.traits = traits; this.unloc = unloc; } @@ -885,11 +714,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -897,20 +721,18 @@ public class ItemAmmoEnums { } public enum Ammo12Gauge implements IAmmoItemEnum { - STOCK("ammo_12gauge", Gun12GaugeFactory.get12GaugeConfig()), - INCENDIARY("ammo_12gauge_incendiary", Gun12GaugeFactory.get12GaugeFireConfig(), AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), - SHRAPNEL("ammo_12gauge_shrapnel", Gun12GaugeFactory.get12GaugeShrapnelConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_MORE_BOUNCY, AmmoItemTrait.CON_WEAR), - DU("ammo_12gauge_du", Gun12GaugeFactory.get12GaugeDUConfig(), AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_PENETRATION, AmmoItemTrait.NEU_HEAVY_METAL, AmmoItemTrait.CON_HEAVY_WEAR), - MARAUDER("ammo_12gauge_marauder", Gun12GaugeFactory.get12GaugeAMConfig(), AmmoItemTrait.PRO_MARAUDER, AmmoItemTrait.NEU_NO_CON), - SLEEK("ammo_12gauge_sleek", Gun12GaugeFactory.get12GaugeSleekConfig(), AmmoItemTrait.NEU_MASKMAN_FLECHETTE); + STOCK("ammo_12gauge"), + INCENDIARY("ammo_12gauge_incendiary", AmmoItemTrait.PRO_INCENDIARY, AmmoItemTrait.CON_WEAR), + SHRAPNEL("ammo_12gauge_shrapnel", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.NEU_MORE_BOUNCY, AmmoItemTrait.CON_WEAR), + DU("ammo_12gauge_du", AmmoItemTrait.PRO_DAMAGE, AmmoItemTrait.PRO_PENETRATION, AmmoItemTrait.NEU_HEAVY_METAL, AmmoItemTrait.CON_HEAVY_WEAR), + MARAUDER("ammo_12gauge_marauder", AmmoItemTrait.PRO_MARAUDER, AmmoItemTrait.NEU_NO_CON), + SLEEK("ammo_12gauge_sleek", AmmoItemTrait.NEU_MASKMAN_FLECHETTE); private final Set traits; - private final BulletConfiguration config; private final String unloc; - private Ammo12Gauge(String unloc, BulletConfiguration config, AmmoItemTrait... traits) { + private Ammo12Gauge(String unloc, AmmoItemTrait... traits) { this.traits = safeAssign(traits); - this.config = config; this.unloc = unloc; } @@ -919,11 +741,6 @@ public class ItemAmmoEnums { return traits; } - @Override - public BulletConfiguration getConfig() { - return config; - } - @Override public String getInternalName() { return unloc; @@ -932,7 +749,6 @@ public class ItemAmmoEnums { public interface IAmmoItemEnum { public Set getTraits(); - public BulletConfiguration getConfig(); public String getInternalName(); } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index b974a3727..459ac2115 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1487,7 +1487,7 @@ public class ModItems { public static ItemEnumMulti ammo_9mm; public static ItemEnumMulti ammo_45; public static ItemEnumMulti ammo_556; - public static ItemEnumMulti ammo_308; + public static ItemEnumMulti ammo_762; public static ItemEnumMulti ammo_22lr; public static ItemEnumMulti ammo_50ae; public static ItemEnumMulti ammo_50bmg; @@ -4287,8 +4287,8 @@ public class ModItems { ammo_5mm = new ItemAmmo(Ammo5mm.class).setUnlocalizedName("ammo_5mm"); ammo_9mm = new ItemAmmo(Ammo9mm.class).setUnlocalizedName("ammo_9mm"); ammo_45 = new ItemAmmo(Ammo45ACP.class).setUnlocalizedName("ammo_45"); - ammo_556 = new ItemAmmo(Ammo556mm.class, "desc.misc.556").setUnlocalizedName("ammo_556"); - ammo_308 = new ItemAmmo(Ammo762NATO.class, "desc.misc.762").setUnlocalizedName("ammo_308"); + ammo_556 = new ItemAmmo(Ammo556mm.class).setUnlocalizedName("ammo_556"); + ammo_762 = new ItemAmmo(Ammo762NATO.class).setUnlocalizedName("ammo_762"); ammo_50ae = new ItemAmmo(Ammo50AE.class).setUnlocalizedName("ammo_50ae"); ammo_50bmg = new ItemAmmo(Ammo50BMG.class).setUnlocalizedName("ammo_50bmg"); ammo_75bolt = new ItemAmmo(Ammo75Bolt.class).setUnlocalizedName("ammo_75bolt"); @@ -7425,11 +7425,12 @@ public class ModItems { GameRegistry.registerItem(ammo_5mm, ammo_5mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm, ammo_9mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_556, ammo_556.getUnlocalizedName()); - GameRegistry.registerItem(ammo_308, ammo_308.getUnlocalizedName()); + GameRegistry.registerItem(ammo_762, ammo_762.getUnlocalizedName()); GameRegistry.registerItem(ammo_22lr, ammo_22lr.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae, ammo_50ae.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg, ammo_50bmg.getUnlocalizedName()); GameRegistry.registerItem(ammo_75bolt, ammo_75bolt.getUnlocalizedName()); + GameRegistry.registerItem(ammo_nuke, ammo_nuke.getUnlocalizedName()); GameRegistry.registerItem(ammo_fuel, ammo_fuel.getUnlocalizedName()); GameRegistry.registerItem(ammo_fireext, ammo_fireext.getUnlocalizedName()); GameRegistry.registerItem(ammo_cell, ammo_cell.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/weapon/ItemGunBase.java b/src/main/java/com/hbm/items/weapon/ItemGunBase.java index 3080223b8..fb39750dc 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGunBase.java +++ b/src/main/java/com/hbm/items/weapon/ItemGunBase.java @@ -218,8 +218,6 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu BulletConfiguration config = altConfig.reloadType == altConfig.RELOAD_NONE ? getBeltCfg(player, stack, false) : BulletConfigSyncingUtil.pullConfig(altConfig.config.get(getMagType(stack))); - //System.out.println(config.ammo.getUnlocalizedName()); - int bullets = config.bulletsMin; for(int k = 0; k < altConfig.roundsPerCycle; k++) { @@ -282,9 +280,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu //called on click release (client side, called by update cycle) public void endActionClient(ItemStack stack, World world, EntityPlayer player, boolean main) { } - //martin 2 reload algorithm - //now with less WET and more DRY - //compact, readable and most importantly, FUNCTIONAL + //current reload protected void reload2(ItemStack stack, World world, EntityPlayer player) { if(getMag(stack) >= mainConfig.ammoCap) { @@ -308,8 +304,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu final int toConsume = (int) Math.ceil((double) toAdd / cfg.ammoCount); // Skip logic if cannot reload - if (availableFills == 0) - { + if(availableFills == 0) { setIsReloading(stack, false); return; } @@ -456,19 +451,17 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu public static ComparableStack getBeltType(EntityPlayer player, ItemStack stack, boolean main) { ItemGunBase gun = (ItemGunBase)stack.getItem(); GunConfiguration guncfg = main ? gun.mainConfig : (gun.altConfig != null ? gun.altConfig : gun.mainConfig); - ComparableStack ammo = BulletConfigSyncingUtil.pullConfig(guncfg.config.get(0)).ammo; for(Integer config : guncfg.config) { BulletConfiguration cfg = BulletConfigSyncingUtil.pullConfig(config); - if(InventoryUtil.doesPlayerHaveAStack(player, cfg.ammo, false, false)) { - ammo = cfg.ammo; - break; + if(InventoryUtil.doesPlayerHaveAStack(player, cfg.ammo, false, true)) { + return cfg.ammo; } } - return ammo; + return BulletConfigSyncingUtil.pullConfig(guncfg.config.get(0)).ammo; } //returns BCFG of belt-weapons @@ -495,8 +488,9 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu int amount = 0; for(ItemStack stack : player.inventory.mainInventory) { - if(stack != null && ammo.matchesRecipe(stack, true)) + if(stack != null && ammo.matchesRecipe(stack, true)) { amount += stack.stackSize; + } } return amount; diff --git a/src/main/java/com/hbm/lib/HbmCollection.java b/src/main/java/com/hbm/lib/HbmCollection.java index 3c7126153..d9f39c595 100644 --- a/src/main/java/com/hbm/lib/HbmCollection.java +++ b/src/main/java/com/hbm/lib/HbmCollection.java @@ -54,7 +54,8 @@ public class HbmCollection { /** 7.62x51mm NATO **/ public static final List threeZeroEight = ImmutableList.of(BulletConfigSyncingUtil.W308); /** 5MM **/ - public static final List fiveMM = ImmutableList.of(BulletConfigSyncingUtil.R5_NORMAL_BOLT, BulletConfigSyncingUtil.R5_EXPLOSIVE_BOLT, BulletConfigSyncingUtil.R5_DU_BOLT, BulletConfigSyncingUtil.R5_STAR_BOLT, BulletConfigSyncingUtil.CHL_R5_BOLT); + public static final List fiveMM = ImmutableList.of(BulletConfigSyncingUtil.R5_NORMAL, BulletConfigSyncingUtil.R5_EXPLOSIVE, BulletConfigSyncingUtil.R5_DU, BulletConfigSyncingUtil.R5_STAR, BulletConfigSyncingUtil.CHL_R5); + public static final List fiveMMBolt = ImmutableList.of(BulletConfigSyncingUtil.R5_NORMAL_BOLT, BulletConfigSyncingUtil.R5_EXPLOSIVE_BOLT, BulletConfigSyncingUtil.R5_DU_BOLT, BulletConfigSyncingUtil.R5_STAR_BOLT, BulletConfigSyncingUtil.CHL_R5_BOLT); // MISC /** .75 **/ public static final List seventyFive = ImmutableList.of(BulletConfigSyncingUtil.B75_NORMAL, BulletConfigSyncingUtil.B75_INCENDIARY, BulletConfigSyncingUtil.B75_HE); diff --git a/src/main/java/com/hbm/util/InventoryUtil.java b/src/main/java/com/hbm/util/InventoryUtil.java index f000859a2..802c270b5 100644 --- a/src/main/java/com/hbm/util/InventoryUtil.java +++ b/src/main/java/com/hbm/util/InventoryUtil.java @@ -3,7 +3,6 @@ package com.hbm.util; import java.util.List; import com.hbm.inventory.RecipesCommon.AStack; -import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput; import net.minecraft.entity.player.EntityPlayer; @@ -580,33 +579,28 @@ public class InventoryUtil { return countAStackMatches(player.inventory.mainInventory, stack, ignoreSize); } - public static boolean doesPlayerHaveAStack(EntityPlayer player, ComparableStack stack, boolean shouldRemove, boolean ignoreSize) { + public static boolean doesPlayerHaveAStack(EntityPlayer player, AStack stack, boolean shouldRemove, boolean ignoreSize) { return doesInventoryHaveAStack(player.inventory.mainInventory, stack, shouldRemove, ignoreSize); } - - public static boolean doesInventoryHaveAStack(ItemStack[] inventory, AStack stack, boolean shouldRemove, boolean ignoreSize) - { + + public static boolean doesInventoryHaveAStack(ItemStack[] inventory, AStack stack, boolean shouldRemove, boolean ignoreSize) { final int totalMatches; int totalStacks = 0; - for (ItemStack itemStack : inventory) - { - if (itemStack != null && stack.matchesRecipe(itemStack, ignoreSize)) + for(ItemStack itemStack : inventory) { + if(itemStack != null && stack.matchesRecipe(itemStack, ignoreSize)) totalStacks += itemStack.stackSize; - if (!shouldRemove && ignoreSize && totalStacks > 0) + if(!shouldRemove && ignoreSize && totalStacks > 0) return true; } totalMatches = ignoreSize ? totalStacks : totalStacks / stack.stacksize; - if (shouldRemove) - { + if(shouldRemove) { int consumedStacks = 0, requiredStacks = ignoreSize ? 1 : stack.stacksize; - for (ItemStack itemStack : inventory) - { - if (consumedStacks > requiredStacks) + for(ItemStack itemStack : inventory) { + if(consumedStacks > requiredStacks) break; - if (itemStack != null && stack.matchesRecipe(itemStack, true)) - { + if(itemStack != null && stack.matchesRecipe(itemStack, true)) { final int toConsume = Math.min(itemStack.stackSize, requiredStacks - consumedStacks); itemStack.stackSize -= toConsume; consumedStacks += toConsume; diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_friendly.png b/src/main/resources/assets/hbm/textures/gui/weapon/gui_turret_friendly.png index 549f5dffb069679ec58c72f7fd06670f3a5502ef..0fe96d925891f079acdf4cc87167f59e56d53889 100644 GIT binary patch literal 3959 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 Xzqgn8+sL71e)dEeSr}Gbc8&WFlF2H{ literal 3905 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 P00000NkvXXu0mjf>E#IW diff --git a/src/main/resources/assets/hbm/textures/items/ammo_5mm.png b/src/main/resources/assets/hbm/textures/items/ammo_5mm.png index c0853664a54b67ef5b52f9ae93d15648ade9bb7c..a8f597739d1a2af78164f854d9486606ae7c68d7 100644 GIT binary patch delta 444 zcmV;t0Ym=X0p$abGk*b`Nkl6o$WXEw%`TxyUG)!c?1LQv`%dx?wPo zCzvNlSh8+uFe0yMz!;U%Z%XTU^9%Okei zEd~}s5Qd>PCPf5e^8Mq42d>SR_iu@oM@T8LZM%T;JVz;2#Hn1?pohNx;UlFipd?9< zQlgY%u~@KLt$!?lgDL}kr*qM4HnA)Vtu;ajgb*Z2!g{?f;8Fx5+qOy5l-+KJQi?p! z5kerPEX|e-eBaltR*QbWUox3ar<^?c`p5i16>Jvfx-M}XQ>)d85~Fp8BlPMIRo zc6)oiv4MfXAN6AbY9);zUd^8$6CHu76QeeMsh<>6@Zo`@8yj2Oe=931o?9}~5=Ppa zBqb!4{X74v)@w@n1BIKd5C31YoBRKKdF7w~|98E$H`LaX)NJ$7p0@1HgcNbMOQy=w ePTSIEF*0oZoEZIc?ILFeAn6o$WXEw%`TxyUG)!c?1LQv`%dx?wPoCzvNlSh8+u zFK8A0o~PUGHjPGu z&1S>#;U$k>e71gvyWKAJdY$ojT=a_w^ZDEYG{EuUC8y_Sz(hyOBevTu1{OjPhM_hl zMFeB={o{lOuFaSCZ;6&iNGY*xyMXgNM=4drsa)2ehra&dBc&{$BuS7`qLgB>Sg=~H zEP#V51AV7+(QG!cEDNnQLI{KqBuT=0y)NKV1S8wFNz;_wZiiBeJkJqAAf+tLmJEE~ z*R58Ie!pKbnNFviJo@^_{6Q6L7UsGxaU4^t)rjMmH_z|m2LbnfrWaT5zCA7dU^bgs zH@6LtrYR5au2_Ef#Or4hPS4MH^~9|_HUPpf)T7Zz-@Lp*4}JBrtp`2+4jWaStugs0 bypMhXSro9W?P5o500000NkvXXu0mjfN_^Mv diff --git a/src/main/resources/assets/hbm/textures/items/ammo_5mm_chlorophyte.png b/src/main/resources/assets/hbm/textures/items/ammo_5mm_chlorophyte.png index 6199867e99f26176ec33f880b81f255f626f188d..4c6d8c99a65957f57d9d6d49987fe472d1c23745 100644 GIT binary patch delta 415 zcmV;Q0bu@s0>}f9Gk*bpNkl6IDPLV9jhhi$CNR_ApgVVC)!pcNH zLuO0;2uw^&e22{W47rJ+3-Uxr2P+O^$$(^YB0rmM;;6y_CO|S0W-*fMugAd9A zux;CTo(I5uKDQ15e9D3#2#Dhtz#IapWI-IqXsz))k4B?m%72pE?e^Yz{*rCm#`k^d z^*W2if{nA}?)K3tnme5ij^i*IjjTOD5wdZX1cNKChc}4VQ_?ggGYcU|k|c*zih%Wc zZ9Tr+Q598Yvl-&`6e%UH>u#B~)_FUn!#e(UWc=zSQp(&Eh9Oc)wAM@}6QZfs~Rk3`x^8H}AEO$#q?#C}Oo*p|vJSk{q(Dy$ZVBu4y)#IF5r- zidL(Y-zlXqpP#q#D{q;F5cGPzyb`4p7eBuc46gY81t>1?eg7B1TN42Wd8lNQyY*6j)ja z^w_(nil82QSa0IZ2)zi=Q-6Wbqp~0ba%tGoG@z8B!9pcUsj|uZfHFOlS+hwl+V8T% z$Gp#c-}^57XITKbm7JbI!(1&jr;Km-OpVM&;YBG zS8Qx=0X2Qx%G2xhFk;7X@O@t!NW6l9Ed2b$v#iapuMLh{d4v$ywjGP3C_*U}uQS%H zx3ADY{&)x>Vt-K>h6o{0O3`dKX}8<=6XbVDnDgbXNG6j(DMb`TIF5r5f-npdVt|wp z4?=9)MoLM)-yeYtSL*xjzctL)^E~akE|p4U1QG-R>o0GUF%G_*ZFsn@n=mX00t$r! zQc6zuXP9|W=4h`LN1T|TUawojZUaauS)OXsy6AGWS3YB7dyB(&Sv@j=f%(3#hut>m vym`II$CC>_oDC#6oC1vhZ4G2x|IzgqT9U}zHXx7800000NkvXXu0mjf8FScz delta 187 zcmV;s07U=p1LgscGk*Y`NklUYf#L3Oy~l)FW+YP`068rn5r1Vv|{Q1#JBQQ@;yKfc96gE=HlSTw|{qhIEPy|;dhWqrIN`f zu2!q$^Le`6uF3$?kkMIz_3aIg_76E8lo*f4#AdBE zQ4}SRTpFFWx#LzSS_nv#docsS53NI_QR?tg|&hX9qtbP+|Th(QS zf*$(jPAR={J#W|@pjLs;59^W(7X|m%uxUPF*URdb$_5`57;mY|PHnul` zT@?&gm`o-(jzgtVLDzL$*HymnixU=dk?$YZSu!=gzI#J3SV2mOrfCH^O;fTgE9}e- z>&^|-rymWZlz#;&iXx69$XNYfNu*O5}r?3Mry4n7pgHX03OSr*M^b4H}o>9BtN+X;b%t*w1k ztyWoHzUD11PCU!9ioi_MBn(5!7l#gV