xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

go go gadget ovarial torsion

Browse Source
This commit is contained in:
Boblet 2025-10-30 16:40:58 +01:00
parent 113a800270
commit 18dabf7e8c
31 changed files with 122 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
changelog
View File

@ -10,8 +10,20 @@
* Fallen meteors will now be placed deeper into the actual crater instead of hovering awkwardly over the hole
* Addd QMAW pages for the particle accelerator parts along with a PA overview page and a simple step by step construction tutorial
* Increased the acidizer partitioner's input limit from 9 to 45 slots
* Ammo containers are now functional again
* Each gun has a fixed "default ammo" that will be given
* Grants ammo for up to three held guns, selected randomly
* Ammo given does not respect caliber conversion mods
* Amount of ammo given depends on the mag size and type of ammo
* Most pistols and low capacity rifles will get two reloads worth of ammo
* High capacity rifles will typically get only one magazine
* Rocket launchers typically only get a small amount of rockets
* The fat man only gets a single nuke
* Certain legendaries do not give ammo at all, they are omitted when three randomly held guns are selected
* Ammo containers are now found in more itempools
## Fixed
* Fixed arc furnace only allowing electrodes to be inserted when the lid is down instead of up
* Fixed issue where the `amounts` tracker wasn't being used correctly when using a custom acidizer config, preventing the acidizer partitioner from working
* Fixed multi fluid ID search potentially not working on systems with a non-latin locale
* Fixed multi fluid ID search potentially not working on systems with a non-latin locale
* Fixed particle accelerator source working even if not cooled

2
src/main/java/com/hbm/blocks/machine/RailBooster.java
View File

@ -5,7 +5,7 @@ import net.minecraft.world.World;
public class RailBooster extends RailGeneric {
public RailBooster(String tool, Integer harvestLevel) {
public RailBooster(String tool, int harvestLevel) {
super(tool, harvestLevel);
this.setMaxSpeed(1.0F);
this.setFlexible(false);

2
src/main/java/com/hbm/blocks/machine/RailGeneric.java
View File

@ -26,7 +26,7 @@ public class RailGeneric extends BlockRailBase implements ITooltipProvider {
protected boolean slopable = true;
protected boolean flexible = true;
public RailGeneric(String tool, Integer harvestLevel) {
public RailGeneric(String tool, int harvestLevel) {
super(false);
setHarvestLevel(tool, harvestLevel);
}

2
src/main/java/com/hbm/config/GeneralConfig.java
View File

@ -18,7 +18,6 @@ public class GeneralConfig {
public static boolean enableMDOres = true;
public static boolean enableMines = true;
public static boolean enableRad = true;
public static boolean enableNITAN = true;
public static boolean enableBomberShortMode = false;
public static boolean enableVaults = true;
public static boolean enableCataclysm = false;
@ -96,7 +95,6 @@ public class GeneralConfig {
enableMDOres = config.get(CATEGORY_GENERAL, "1.04_enableOresInModdedDimensions", true, "Allows NTM ores to generate in modded dimensions").getBoolean(true);
enableMines = config.get(CATEGORY_GENERAL, "1.05_enableLandmineSpawn", true, "Allows landmines to generate").getBoolean(true);
enableRad = config.get(CATEGORY_GENERAL, "1.06_enableRadHotspotSpawn", true, "Allows radiation hotspots to generate").getBoolean(true);
enableNITAN = config.get(CATEGORY_GENERAL, "1.07_enableNITANChestSpawn", true, "Allows chests to spawn at specific coordinates full of powders").getBoolean(true);
enableBomberShortMode = config.get(CATEGORY_GENERAL, "1.14_enableBomberShortMode", false, "Has bomber planes spawn in closer to the target for use with smaller render distances").getBoolean(false);
enableVaults = config.get(CATEGORY_GENERAL, "1.15_enableVaultSpawn", true, "Allows locked safes to spawn").getBoolean(true);
enableCataclysm = config.get(CATEGORY_GENERAL, "1.17_enableCataclysm", false, "Causes satellites to fall whenever a mob dies").getBoolean(false);

1
src/main/java/com/hbm/itempool/ItemPoolsC130.java
View File

@ -56,6 +56,7 @@ public class ItemPoolsC130 {
weighted(ModItems.ammo_standard, EnumAmmo.R762_SP.ordinal(), 6, 6, 5),
weighted(ModItems.ammo_standard, EnumAmmo.G12_BP.ordinal(), 6, 6, 10),
weighted(ModItems.ammo_standard, EnumAmmo.ROCKET_HE.ordinal(), 1, 1, 3),
weighted(ModItems.ammo_container, 0, 1, 1, 1),
};
}};
}

7
src/main/java/com/hbm/itempool/ItemPoolsComponent.java
View File

@ -41,7 +41,6 @@ public class ItemPoolsComponent {
weighted(ModItems.bolt, Mats.MAT_TUNGSTEN.id, 4, 16, 3),
weighted(ModItems.coil_tungsten, 0, 1, 2, 5),
weighted(ModItems.motor, 0, 1, 2, 4),
weighted(ModItems.tank_steel, 0, 1, 2, 3),
weighted(ModItems.coil_copper, 0, 1, 3, 4),
weighted(ModItems.coil_copper_torus, 0, 1, 2, 3),
weighted(ModItems.wire_fine, Mats.MAT_MINGRADE.id, 1, 8, 5),
@ -190,7 +189,8 @@ public class ItemPoolsComponent {
weighted(Items.book, 0, 1, 5, 10),
weighted(Items.experience_bottle, 0, 1, 3, 1),
weighted(ModItems.blueprint_folder, 0, 1, 1, 1),
weighted(ModItems.blueprint_folder, 1, 1, 1, 1)
weighted(ModItems.blueprint_folder, 1, 1, 1, 1),
weighted(ModItems.ammo_container, 0, 1, 1, 1)
};
}};
@ -213,8 +213,7 @@ public class ItemPoolsComponent {
this.pool = new WeightedRandomChestContent[] {
weighted(ModItems.oil_detector, 0, 1, 1, 1),
weighted(ModItems.canister_full, Fluids.OIL.getID(), 1, 4, 5),
weighted(ModBlocks.machine_fraction_tower,0, 0, 1, 1),
weighted(ModBlocks.fraction_spacer,0, 0, 1, 1),
weighted(ModItems.canister_empty, 0, 4, 16, 10),
weighted(ModItems.circuit,EnumCircuitType.ANALOG.ordinal(), 1, 4, 1),
weighted(ModItems.circuit, EnumCircuitType.CAPACITOR.ordinal(), 1, 1, 3),
};

19
src/main/java/com/hbm/itempool/ItemPoolsSingle.java
View File

@ -12,7 +12,6 @@ import net.minecraft.util.WeightedRandomChestContent;
public class ItemPoolsSingle {
public static final String POOL_POWDER = "POOL_POWDER";
public static final String POOL_VAULT_RUSTY = "POOL_VAULT_RUSTY";
public static final String POOL_VAULT_STANDARD = "POOL_VAULT_STANDARD";
public static final String POOL_VAULT_REINFORCED = "POOL_VAULT_REINFORCED";
@ -21,24 +20,6 @@ public class ItemPoolsSingle {
public static void init() {
//powder boxes
new ItemPool(POOL_POWDER) {{
this.pool = new WeightedRandomChestContent[] {
weighted(ModItems.powder_neptunium, 0, 1, 32, 1),
weighted(ModItems.powder_iodine, 0, 1, 32, 1),
weighted(ModItems.powder_thorium, 0, 1, 32, 1),
weighted(ModItems.powder_astatine, 0, 1, 32, 1),
weighted(ModItems.powder_neodymium, 0, 1, 32, 1),
weighted(ModItems.powder_caesium, 0, 1, 32, 1),
weighted(ModItems.powder_strontium, 0, 1, 32, 1),
weighted(ModItems.powder_cobalt, 0, 1, 32, 1),
weighted(ModItems.powder_bromine, 0, 1, 32, 1),
weighted(ModItems.powder_niobium, 0, 1, 32, 1),
weighted(ModItems.powder_tennessine, 0, 1, 32, 1),
weighted(ModItems.powder_cerium, 0, 1, 32, 1)
};
}};
new ItemPool(POOL_VAULT_RUSTY) {{
this.pool = new WeightedRandomChestContent[] {
weighted(Items.gold_ingot, 0, 3, 14, 1),

39
src/main/java/com/hbm/items/tool/ItemAmmoContainer.java
View File

@ -1,12 +1,17 @@
package com.hbm.items.tool;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.hbm.items.ModItems;
import com.hbm.items.weapon.sedna.ItemGunBaseNT;
import com.hbm.util.InventoryUtil;
import com.hbm.util.i18n.I18nUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
public class ItemAmmoContainer extends Item {
@ -17,13 +22,39 @@ public class ItemAmmoContainer extends Item {
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
List<ItemStack> stacks = new ArrayList();
for(ItemStack inv : player.inventory.mainInventory) {
if(inv != null && inv.getItem() instanceof ItemGunBaseNT) {
ItemGunBaseNT gun = (ItemGunBaseNT) inv.getItem();
if(gun.defaultAmmo != null) stacks.add(inv);
}
}
if(stacks.size() <= 0) return stack;
Collections.shuffle(stacks);
int maxGunCount = 3;
for(int i = 0; i < maxGunCount && i < stacks.size(); i++) {
ItemStack gunStack = stacks.get(i);
ItemGunBaseNT gun = (ItemGunBaseNT) gunStack.getItem();
ItemStack remainder = InventoryUtil.tryAddItemToInventory(player.inventory.mainInventory, gun.defaultAmmo.copy());
if(remainder != null && remainder.stackSize > 0) player.dropPlayerItemWithRandomChoice(remainder, false);
}
world.playSoundAtEntity(player, "hbm:item.unpack", 1.0F, 1.0F);
player.inventoryContainer.detectAndSendChanges();
stack.stackSize--;
return stack;
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
if(this == ModItems.ammo_container) {
list.add("to be implemented :P");
}
String[] lines = I18nUtil.resolveKeyArray(this.getUnlocalizedName() + ".desc");
for(String line : lines) list.add(EnumChatFormatting.YELLOW + line);
}
}

9
src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java
View File

@ -16,7 +16,9 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.inventory.gui.GUIWeaponTable;
import com.hbm.items.IEquipReceiver;
import com.hbm.items.IKeybindReceiver;
import com.hbm.items.ModItems;
import com.hbm.items.armor.ArmorTrenchmaster;
import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo;
import com.hbm.items.weapon.sedna.hud.IHUDComponent;
import com.hbm.items.weapon.sedna.mags.IMagazine;
import com.hbm.items.weapon.sedna.mags.MagazineInfinite;
@ -60,6 +62,8 @@ public class ItemGunBaseNT extends Item implements IKeybindReceiver, IItemHUD, I
public static List<Item> secrets = new ArrayList();
public List<ComparableStack> recognizedMods = new ArrayList();
public ItemStack defaultAmmo;
public static final DecimalFormatSymbols SYMBOLS_US = new DecimalFormatSymbols(Locale.US);
public static final DecimalFormat FORMAT_DMG = new DecimalFormat("#.##", SYMBOLS_US);
@ -150,6 +154,11 @@ public class ItemGunBaseNT extends Item implements IKeybindReceiver, IItemHUD, I
RELOADING, //forced delay after which a reload action happens, may be canceled (TBI)
JAMMED, //forced delay due to jamming
}
public ItemGunBaseNT setDefaultAmmo(EnumAmmo ammo, int amount) {
this.defaultAmmo = new ItemStack(ModItems.ammo_standard, amount, ammo.ordinal());
return this;
}
public ItemGunBaseNT setNameMutator(Function<ItemStack, String> lambda) {
this.LAMBDA_NAME_MUTATOR = lambda;

6
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java
View File

@ -56,7 +56,7 @@ public class XFactory10ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_DOUBLE_BARREL))
.setupStandardConfiguration()
.anim(LAMBDA_DOUBLE_BARREL_ANIMS).orchestra(Orchestras.ORCHESTRA_DOUBLE_BARREL)
).setUnlocalizedName("gun_double_barrel");
).setDefaultAmmo(EnumAmmo.G10, 6).setUnlocalizedName("gun_double_barrel");
ModItems.gun_double_barrel_sacred_dragon = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(6000).draw(10).inspect(39).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -66,7 +66,7 @@ public class XFactory10ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_DOUBLE_BARREL))
.setupStandardConfiguration()
.anim(LAMBDA_DOUBLE_BARREL_ANIMS).orchestra(Orchestras.ORCHESTRA_DOUBLE_BARREL)
).setUnlocalizedName("gun_double_barrel_sacred_dragon");
).setDefaultAmmo(EnumAmmo.G10_DU, 6).setUnlocalizedName("gun_double_barrel_sacred_dragon");
ModItems.gun_autoshotgun_heretic = new ItemGunBaseNT(WeaponQuality.DEBUG, new GunConfig()
.draw(20).inspect(65).reloadSequential(true).inspectCancel(false).crosshair(Crosshair.L_CIRCLE).hideCrosshair(false).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -77,7 +77,7 @@ public class XFactory10ga {
.canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(XFactory12ga.LAMBDA_RECOIL_SEXY))
.setupStandardConfiguration()
.anim(XFactory12ga.LAMBDA_SEXY_ANIMS).orchestra(Orchestras.ORCHESTRA_SHREDDER_SEXY)
).setUnlocalizedName("gun_autoshotgun_heretic");
).setDefaultAmmo(EnumAmmo.G10, 50).setUnlocalizedName("gun_autoshotgun_heretic");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_RECOIL_DOUBLE_BARREL = (stack, ctx) -> {

16
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java
View File

@ -298,7 +298,7 @@ public class XFactory12ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_MARESLEG))
.setupStandardConfiguration()
.anim(LAMBDA_MARESLEG_ANIMS).orchestra(Orchestras.ORCHESTRA_MARESLEG)
).setNameMutator(LAMBDA_NAME_MARESLEG)
).setDefaultAmmo(EnumAmmo.G12, 12).setNameMutator(LAMBDA_NAME_MARESLEG)
.setUnlocalizedName("gun_maresleg");
ModItems.gun_maresleg_akimbo = new ItemGunBaseNT(WeaponQuality.B_SIDE,
new GunConfig().dura(600).draw(5).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -319,7 +319,7 @@ public class XFactory12ga {
.ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD)
.decider(GunStateDecider.LAMBDA_STANDARD_DECIDER)
.anim(LAMBDA_MARESLEG_SHORT_ANIMS).orchestra(Orchestras.ORCHESTRA_MARESLEG_AKIMBO)
).setUnlocalizedName("gun_maresleg_akimbo");
).setDefaultAmmo(EnumAmmo.G12, 24).setUnlocalizedName("gun_maresleg_akimbo");
ModItems.gun_maresleg_broken = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(0).draw(5).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -329,7 +329,7 @@ public class XFactory12ga {
.canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(LAMBDA_RECOIL_MARESLEG))
.setupStandardConfiguration()
.anim(LAMBDA_MARESLEG_SHORT_ANIMS).orchestra(Orchestras.ORCHESTRA_MARESLEG_SHORT)
).setUnlocalizedName("gun_maresleg_broken");
).setDefaultAmmo(EnumAmmo.G12_MAGNUM, 24).setUnlocalizedName("gun_maresleg_broken");
ModItems.gun_liberator = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(200).draw(20).inspect(21).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -340,7 +340,7 @@ public class XFactory12ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_LIBERATOR))
.setupStandardConfiguration()
.anim(LAMBDA_LIBERATOR_ANIMS).orchestra(Orchestras.ORCHESTRA_LIBERATOR)
).setUnlocalizedName("gun_liberator");
).setDefaultAmmo(EnumAmmo.G12, 12).setUnlocalizedName("gun_liberator");
ModItems.gun_spas12 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(600).draw(20).inspect(39).reloadSequential(true).reloadChangeType(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -351,7 +351,7 @@ public class XFactory12ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_MARESLEG))
.setupStandardConfiguration().ps(LAMBDA_SPAS_SECONDARY).pt(null)
.anim(LAMBDA_SPAS_ANIMS).orchestra(Orchestras.ORCHESTRA_SPAS)
).setUnlocalizedName("gun_spas12");
).setDefaultAmmo(EnumAmmo.G12, 16).setUnlocalizedName("gun_spas12");
ModItems.gun_autoshotgun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(2_000).draw(10).inspect(33).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -362,7 +362,7 @@ public class XFactory12ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_AUTOSHOTGUN))
.setupStandardConfiguration()
.anim(LAMBDA_SHREDDER_ANIMS).orchestra(Orchestras.ORCHESTRA_SHREDDER)
).setUnlocalizedName("gun_autoshotgun");
).setDefaultAmmo(EnumAmmo.G12, 20).setUnlocalizedName("gun_autoshotgun");
ModItems.gun_autoshotgun_shredder = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(2_000).draw(10).inspect(33).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -372,7 +372,7 @@ public class XFactory12ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_AUTOSHOTGUN))
.setupStandardConfiguration()
.anim(LAMBDA_SHREDDER_ANIMS).orchestra(Orchestras.ORCHESTRA_SHREDDER)
).setUnlocalizedName("gun_autoshotgun_shredder");
).setDefaultAmmo(EnumAmmo.G12, 20).setUnlocalizedName("gun_autoshotgun_shredder");
ModItems.gun_autoshotgun_sexy = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(5_000).draw(20).inspect(65).reloadSequential(true).inspectCancel(false).crosshair(Crosshair.L_CIRCLE).hideCrosshair(false).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -383,7 +383,7 @@ public class XFactory12ga {
.setupStandardFire().recoil(LAMBDA_RECOIL_SEXY))
.setupStandardConfiguration()
.anim(LAMBDA_SEXY_ANIMS).orchestra(Orchestras.ORCHESTRA_SHREDDER_SEXY)
).setUnlocalizedName("gun_autoshotgun_sexy");
).setDefaultAmmo(EnumAmmo.G12_MAGNUM, 50).setUnlocalizedName("gun_autoshotgun_sexy");
}
public static Function<ItemStack, String> LAMBDA_NAME_MARESLEG = (stack) -> {

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java
View File

@ -54,7 +54,7 @@ public class XFactory22lr {
.setupStandardFire().recoil(LAMBDA_RECOIL_AM180))
.setupStandardConfiguration()
.anim(LAMBDA_AM180_ANIMS).orchestra(Orchestras.ORCHESTRA_AM180)
).setNameMutator(LAMBDA_NAME_AM180)
).setDefaultAmmo(EnumAmmo.P22_SP, 35).setNameMutator(LAMBDA_NAME_AM180)
.setUnlocalizedName("gun_am180");
}

6
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory357.java
View File

@ -47,7 +47,7 @@ public class XFactory357 {
.setupStandardFire().recoil(LAMBDA_RECOIL_ATLAS))
.setupStandardConfiguration()
.anim(LAMBDA_ATLAS_ANIMS).orchestra(Orchestras.ORCHESTRA_ATLAS)
).setUnlocalizedName("gun_light_revolver");
).setDefaultAmmo(EnumAmmo.M357_SP, 12).setUnlocalizedName("gun_light_revolver");
ModItems.gun_light_revolver_atlas = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(300).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -57,7 +57,7 @@ public class XFactory357 {
.setupStandardFire().recoil(LAMBDA_RECOIL_ATLAS))
.setupStandardConfiguration()
.anim(LAMBDA_ATLAS_ANIMS).orchestra(Orchestras.ORCHESTRA_ATLAS)
).setUnlocalizedName("gun_light_revolver_atlas");
).setDefaultAmmo(EnumAmmo.M357_JHP, 12).setUnlocalizedName("gun_light_revolver_atlas");
ModItems.gun_light_revolver_dani = new ItemGunBaseNT(WeaponQuality.LEGENDARY,
new GunConfig().dura(30_000).draw(20).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -77,7 +77,7 @@ public class XFactory357 {
.ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD)
.decider(GunStateDecider.LAMBDA_STANDARD_DECIDER)
.anim(LAMBDA_DANI_ANIMS).orchestra(Orchestras.ORCHESTRA_DANI)
).setUnlocalizedName("gun_light_revolver_dani");
).setDefaultAmmo(EnumAmmo.M357_EXPRESS, 24).setUnlocalizedName("gun_light_revolver_dani");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_RECOIL_ATLAS = (stack, ctx) -> {

4
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java
View File

@ -162,7 +162,7 @@ public class XFactory40mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_GL))
.setupStandardConfiguration()
.anim(LAMBDA_FLAREGUN_ANIMS).orchestra(Orchestras.ORCHESTRA_FLAREGUN)
).setUnlocalizedName("gun_flaregun");
).setDefaultAmmo(EnumAmmo.G26_FLARE, 3).setUnlocalizedName("gun_flaregun");
ModItems.gun_congolake = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(400).draw(7).inspect(39).reloadSequential(true).reloadChangeType(true).crosshair(Crosshair.L_CIRCUMFLEX).smoke(LAMBDA_SMOKE)
@ -173,7 +173,7 @@ public class XFactory40mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_GL))
.setupStandardConfiguration()
.anim(LAMBDA_CONGOLAKE_ANIMS).orchestra(Orchestras.ORCHESTRA_CONGOLAKE)
).setUnlocalizedName("gun_congolake");
).setDefaultAmmo(EnumAmmo.G40_HE, 8).setUnlocalizedName("gun_congolake");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_SMOKE = (stack, ctx) -> {

12
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java
View File

@ -94,7 +94,7 @@ public class XFactory44 {
.setupStandardFire().recoil(LAMBDA_RECOIL_HENRY))
.setupStandardConfiguration()
.anim(LAMBDA_HENRY_ANIMS).orchestra(Orchestras.ORCHESTRA_HENRY)
).setUnlocalizedName("gun_henry");
).setDefaultAmmo(EnumAmmo.M44_SP, 14).setUnlocalizedName("gun_henry");
ModItems.gun_henry_lincoln = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(300).draw(15).inspect(23).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -104,7 +104,7 @@ public class XFactory44 {
.setupStandardFire().recoil(LAMBDA_RECOIL_HENRY))
.setupStandardConfiguration()
.anim(LAMBDA_HENRY_ANIMS).orchestra(Orchestras.ORCHESTRA_HENRY)
).setUnlocalizedName("gun_henry_lincoln");
).setDefaultAmmo(EnumAmmo.M44_JHP, 14).setUnlocalizedName("gun_henry_lincoln");
ModItems.gun_heavy_revolver = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(600).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -115,7 +115,7 @@ public class XFactory44 {
.setupStandardFire().recoil(LAMBDA_RECOIL_NOPIP))
.setupStandardConfiguration()
.anim(LAMBDA_NOPIP_ANIMS).orchestra(Orchestras.ORCHESTRA_NOPIP)
).setNameMutator(LAMBDA_NAME_NOPIP)
).setDefaultAmmo(EnumAmmo.M44_SP, 12).setNameMutator(LAMBDA_NAME_NOPIP)
.setUnlocalizedName("gun_heavy_revolver");
ModItems.gun_heavy_revolver_lilmac = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(31_000).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).scopeTexture(scope_lilmac).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -126,7 +126,7 @@ public class XFactory44 {
.setupStandardFire().recoil(LAMBDA_RECOIL_NOPIP))
.setupStandardConfiguration()
.anim(LAMBDA_LILMAC_ANIMS).orchestra(Orchestras.ORCHESTRA_NOPIP)
).setUnlocalizedName("gun_heavy_revolver_lilmac");
).setDefaultAmmo(EnumAmmo.M44_JHP, 12).setUnlocalizedName("gun_heavy_revolver_lilmac");
ModItems.gun_heavy_revolver_protege = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(31_000).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).smoke(Lego.LAMBDA_STANDARD_SMOKE)
.rec(new Receiver(0)
@ -136,7 +136,7 @@ public class XFactory44 {
.setupStandardFire().recoil(LAMBDA_RECOIL_NOPIP))
.setupStandardConfiguration()
.anim(LAMBDA_LILMAC_ANIMS).orchestra(Orchestras.ORCHESTRA_NOPIP)
).setUnlocalizedName("gun_heavy_revolver_protege");
).setDefaultAmmo(EnumAmmo.M44_JHP, 12).setUnlocalizedName("gun_heavy_revolver_protege");
ModItems.gun_hangman = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(600).draw(10).inspect(31).inspectCancel(false).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
@ -147,7 +147,7 @@ public class XFactory44 {
.setupStandardFire().recoil(LAMBDA_RECOIL_HANGMAN))
.setupStandardConfiguration().ps(SMACK_A_FUCKER)
.anim(LAMBDA_HANGMAN_ANIMS).orchestra(Orchestras.ORCHESTRA_HANGMAN)
).setUnlocalizedName("gun_hangman");
).setDefaultAmmo(EnumAmmo.M44_FMJ, 16).setUnlocalizedName("gun_hangman");
}
public static Function<ItemStack, String> LAMBDA_NAME_NOPIP = (stack) -> {

8
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java
View File

@ -89,7 +89,7 @@ public class XFactory50 {
.setupStandardFire().recoil(LAMBDA_RECOIL_AMAT))
.setupStandardConfiguration()
.anim(LAMBDA_AMAT_ANIMS).orchestra(Orchestras.ORCHESTRA_AMAT)
).setUnlocalizedName("gun_amat");
).setDefaultAmmo(EnumAmmo.BMG50_SP, 7).setUnlocalizedName("gun_amat");
ModItems.gun_amat_subtlety = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(1_000).draw(20).inspect(50).crosshair(Crosshair.CIRCLE).scopeTexture(scope).smoke(LAMBDA_SMOKE)
.rec(new Receiver(0)
@ -99,7 +99,7 @@ public class XFactory50 {
.setupStandardFire().recoil(LAMBDA_RECOIL_AMAT))
.setupStandardConfiguration()
.anim(LAMBDA_AMAT_ANIMS).orchestra(Orchestras.ORCHESTRA_AMAT)
).setUnlocalizedName("gun_amat_subtlety");
).setDefaultAmmo(EnumAmmo.BMG50_JHP, 7).setUnlocalizedName("gun_amat_subtlety");
ModItems.gun_amat_penance = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(5_000).draw(20).inspect(50).crosshair(Crosshair.CIRCLE).scopeTexture(scope_thermal).thermalSights(true).smoke(LAMBDA_SMOKE)
.rec(new Receiver(0)
@ -109,7 +109,7 @@ public class XFactory50 {
.setupStandardFire().recoil(LAMBDA_RECOIL_AMAT))
.setupStandardConfiguration()
.anim(LAMBDA_AMAT_ANIMS).orchestra(Orchestras.ORCHESTRA_AMAT)
).setUnlocalizedName("gun_amat_penance");
).setDefaultAmmo(EnumAmmo.BMG50_JHP, 7).setUnlocalizedName("gun_amat_penance");
ModItems.gun_m2 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(3_000).draw(10).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE)
@ -120,7 +120,7 @@ public class XFactory50 {
.setupStandardFire().recoil(LAMBDA_RECOIL_M2))
.setupStandardConfiguration()
.anim(LAMBDA_M2_ANIMS).orchestra(Orchestras.ORCHESTRA_M2)
).setUnlocalizedName("gun_m2");
).setDefaultAmmo(EnumAmmo.BMG50_FMJ, 25).setUnlocalizedName("gun_m2");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_SMOKE = (stack, ctx) -> {

6
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java
View File

@ -81,7 +81,7 @@ public class XFactory556mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_G3))
.setupStandardConfiguration().ps(Lego.LAMBDA_STANDARD_CLICK_SECONDARY)
.anim(LAMBDA_G3_ANIMS).orchestra(Orchestras.ORCHESTRA_G3)
).setNameMutator(LAMBDA_NAME_G3).setUnlocalizedName("gun_g3");
).setDefaultAmmo(EnumAmmo.R556_SP, 30).setNameMutator(LAMBDA_NAME_G3).setUnlocalizedName("gun_g3");
ModItems.gun_g3_zebra = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(6_000).draw(10).inspect(33).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE).scopeTexture(scope)
.rec(new Receiver(0)
@ -91,7 +91,7 @@ public class XFactory556mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_ZEBRA))
.setupStandardConfiguration().ps(Lego.LAMBDA_STANDARD_CLICK_SECONDARY)
.anim(LAMBDA_G3_ANIMS).orchestra(Orchestras.ORCHESTRA_G3)
).setNameMutator(LAMBDA_NAME_G3).setUnlocalizedName("gun_g3_zebra");
).setDefaultAmmo(EnumAmmo.R556_JHP, 30).setNameMutator(LAMBDA_NAME_G3).setUnlocalizedName("gun_g3_zebra");
ModItems.gun_stg77 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(3_000).draw(10).inspect(125).crosshair(Crosshair.CIRCLE).scopeTexture(scope).smoke(LAMBDA_SMOKE)
@ -103,7 +103,7 @@ public class XFactory556mm {
.pp(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD).pt(Lego.LAMBDA_TOGGLE_AIM)
.decider(LAMBDA_STG77_DECIDER)
.anim(LAMBDA_STG77_ANIMS).orchestra(Orchestras.ORCHESTRA_STG77)
).setUnlocalizedName("gun_stg77");
).setDefaultAmmo(EnumAmmo.R556_FMJ, 30).setUnlocalizedName("gun_stg77");
}
public static Function<ItemStack, String> LAMBDA_NAME_G3 = (stack) -> {

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java
View File

@ -64,7 +64,7 @@ public class XFactory75Bolt {
.setupStandardFire().recoil(LAMBDA_RECOIL_BOLT))
.setupStandardConfiguration()
.anim(LAMBDA_BOLTER_ANIMS).orchestra(Orchestras.ORCHESTRA_BOLTER)
).setUnlocalizedName("gun_bolter");
).setDefaultAmmo(EnumAmmo.B75, 15).setUnlocalizedName("gun_bolter");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_SMOKE = (stack, ctx) -> {

10
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java
View File

@ -75,7 +75,7 @@ public class XFactory762mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_CARBINE))
.setupStandardConfiguration()
.anim(LAMBDA_CARBINE_ANIMS).orchestra(Orchestras.ORCHESTRA_CARBINE)
).setUnlocalizedName("gun_carbine");
).setDefaultAmmo(EnumAmmo.R762_SP, 14).setUnlocalizedName("gun_carbine");
ModItems.gun_minigun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE)
@ -86,7 +86,7 @@ public class XFactory762mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_MINIGUN))
.setupStandardConfiguration()
.anim(LAMBDA_MINIGUN_ANIMS).orchestra(Orchestras.ORCHESTRA_MINIGUN)
).setUnlocalizedName("gun_minigun");
).setDefaultAmmo(EnumAmmo.R762_FMJ, 30).setUnlocalizedName("gun_minigun");
ModItems.gun_minigun_lacunae = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE)
.rec(new Receiver(0)
@ -96,7 +96,7 @@ public class XFactory762mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_LACUNAE))
.setupStandardConfiguration()
.anim(LAMBDA_MINIGUN_ANIMS).orchestra(Orchestras.ORCHESTRA_MINIGUN)
).setUnlocalizedName("gun_minigun_lacunae");
).setDefaultAmmo(EnumAmmo.CAPACITOR, 15).setUnlocalizedName("gun_minigun_lacunae");
ModItems.gun_minigun_dual = new ItemGunBaseNT(WeaponQuality.DEBUG,
new GunConfig()
.dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE)
@ -118,7 +118,7 @@ public class XFactory762mm {
.ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD)
.decider(LAMBDA_SECOND_MINIGUN)
.anim(LAMBDA_MINIGUN_ANIMS).orchestra(Orchestras.ORCHESTRA_MINIGUN_DUAL)
).setUnlocalizedName("gun_minigun_dual");
).setDefaultAmmo(EnumAmmo.R762_SP, 50).setUnlocalizedName("gun_minigun_dual");
ModItems.gun_mas36 = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(5_000).draw(20).inspect(31).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE)
@ -129,7 +129,7 @@ public class XFactory762mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_CARBINE))
.setupStandardConfiguration()
.anim(LAMBDA_MAS36_ANIMS).orchestra(Orchestras.ORCHESTRA_MAS36)
).setUnlocalizedName("gun_mas36");
).setDefaultAmmo(EnumAmmo.R762_AP, 14).setUnlocalizedName("gun_mas36");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_SECOND_MINIGUN = (stack, ctx) -> {

8
src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java
View File

@ -59,7 +59,7 @@ public class XFactory9mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_GREASEGUN))
.setupStandardConfiguration()
.anim(LAMBDA_GREASEGUN_ANIMS).orchestra(Orchestras.ORCHESTRA_GREASEGUN)
).setNameMutator(LAMBDA_NAME_GREASEGUN)
).setDefaultAmmo(EnumAmmo.P9_SP, 30).setNameMutator(LAMBDA_NAME_GREASEGUN)
.setUnlocalizedName("gun_greasegun");
ModItems.gun_lag = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
@ -71,7 +71,7 @@ public class XFactory9mm {
.setupStandardFire().fire(LAMBDA_FIRE_LAG).recoil(LAMBDA_RECOIL_LAG))
.setupStandardConfiguration()
.anim(LAMBDA_LAG_ANIMS).orchestra(Orchestras.ORCHESTRA_LAG)
).setUnlocalizedName("gun_lag");
).setDefaultAmmo(EnumAmmo.P9_JHP, 17).setUnlocalizedName("gun_lag");
ModItems.gun_uzi = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(3_000).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE)
@ -82,7 +82,7 @@ public class XFactory9mm {
.setupStandardFire().recoil(LAMBDA_RECOIL_UZI))
.setupStandardConfiguration()
.anim(LAMBDA_UZI_ANIMS).orchestra(Orchestras.ORCHESTRA_UZI)
).setNameMutator(LAMBDA_NAME_UZI)
).setDefaultAmmo(EnumAmmo.P9_SP, 30).setNameMutator(LAMBDA_NAME_UZI)
.setUnlocalizedName("gun_uzi");
ModItems.gun_uzi_akimbo = new ItemGunBaseNT(WeaponQuality.B_SIDE,
new GunConfig().dura(3_000).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE)
@ -103,7 +103,7 @@ public class XFactory9mm {
.ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD)
.decider(LAMBDA_SECOND_UZI)
.anim(LAMBDA_UZI_ANIMS).orchestra(Orchestras.ORCHESTRA_UZI_AKIMBO)
).setUnlocalizedName("gun_uzi_akimbo");
).setDefaultAmmo(EnumAmmo.P9_SP, 60).setUnlocalizedName("gun_uzi_akimbo");
}
public static Function<ItemStack, String> LAMBDA_NAME_GREASEGUN = (stack) -> {

4
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryAccelerator.java
View File

@ -116,7 +116,7 @@ public class XFactoryAccelerator {
.pr(Lego.LAMBDA_STANDARD_RELOAD)
.decider(GunStateDecider.LAMBDA_STANDARD_DECIDER)
.anim(LAMBDA_TAU_ANIMS).orchestra(Orchestras.ORCHESTRA_TAU)
).setUnlocalizedName("gun_tau");
).setDefaultAmmo(EnumAmmo.TAU_URANIUM, 15).setUnlocalizedName("gun_tau");
ModItems.gun_coilgun = new ItemGunBaseNT(WeaponQuality.SPECIAL, new GunConfig()
.dura(400).draw(5).inspect(39).crosshair(Crosshair.L_CIRCUMFLEX)
@ -127,7 +127,7 @@ public class XFactoryAccelerator {
.setupStandardFire().recoil(LAMBDA_RECOIL_COILGUN))
.setupStandardConfiguration()
.anim(LAMBDA_COILGUN_ANIMS).orchestra(Orchestras.ORCHESTRA_COILGUN)
).setUnlocalizedName("gun_coilgun");
).setDefaultAmmo(EnumAmmo.COIL_TUNGSTEN, 5).setUnlocalizedName("gun_coilgun");
ModItems.gun_n_i_4_n_i = new ItemGunNI4NI(WeaponQuality.SPECIAL, new GunConfig()
.dura(0).draw(5).inspect(39).crosshair(Crosshair.CIRCLE)

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java
View File

@ -38,7 +38,7 @@ public class XFactoryBlackPowder {
.setupStandardFire().recoil(LAMBDA_RECOIL_PEPPERBOX))
.setupStandardConfiguration()
.anim(LAMBDA_PEPPERBOX_ANIMS).orchestra(Orchestras.ORCHESTRA_PEPPERBOX)
).setUnlocalizedName("gun_pepperbox");
).setDefaultAmmo(EnumAmmo.STONE, 12).setUnlocalizedName("gun_pepperbox");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_RECOIL_PEPPERBOX = (stack, ctx) -> {

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryCatapult.java
View File

@ -171,7 +171,7 @@ public class XFactoryCatapult {
.setupStandardFire().recoil(LAMBDA_RECOIL_FATMAN))
.setupStandardConfiguration()
.anim(LAMBDA_FATMAN_ANIMS).orchestra(Orchestras.ORCHESTRA_FATMAN)
).setUnlocalizedName("gun_fatman");
).setDefaultAmmo(EnumAmmo.NUKE_STANDARD, 1).setUnlocalizedName("gun_fatman");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_RECOIL_FATMAN = (stack, ctx) -> { };

10
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java
View File

@ -179,7 +179,7 @@ public class XFactoryEnergy {
.setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY))
.setupStandardConfiguration()
.anim(LAMBDA_TESLA_ANIMS).orchestra(Orchestras.ORCHESTRA_TESLA)
).setUnlocalizedName("gun_tesla_cannon");
).setDefaultAmmo(EnumAmmo.CAPACITOR, 15).setUnlocalizedName("gun_tesla_cannon");
ModItems.gun_laser_pistol = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(500).draw(10).inspect(26).crosshair(Crosshair.CIRCLE)
@ -190,7 +190,7 @@ public class XFactoryEnergy {
.setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY))
.setupStandardConfiguration()
.anim(LAMBDA_LASER_PISTOL).orchestra(Orchestras.ORCHESTRA_LASER_PISTOL)
).setUnlocalizedName("gun_laser_pistol");
).setDefaultAmmo(EnumAmmo.CAPACITOR, 15).setUnlocalizedName("gun_laser_pistol");
ModItems.gun_laser_pistol_pew_pew = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(500).draw(10).inspect(26).crosshair(Crosshair.CIRCLE)
.rec(new Receiver(0)
@ -200,7 +200,7 @@ public class XFactoryEnergy {
.setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY))
.setupStandardConfiguration()
.anim(LAMBDA_LASER_PISTOL).orchestra(Orchestras.ORCHESTRA_LASER_PISTOL)
).setUnlocalizedName("gun_laser_pistol_pew_pew");
).setDefaultAmmo(EnumAmmo.CAPACITOR_OVERCHARGE, 10).setUnlocalizedName("gun_laser_pistol_pew_pew");
ModItems.gun_laser_pistol_morning_glory = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(1_500).draw(10).inspect(26).crosshair(Crosshair.CIRCLE)
.rec(new Receiver(0)
@ -210,7 +210,7 @@ public class XFactoryEnergy {
.setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY))
.setupStandardConfiguration()
.anim(LAMBDA_LASER_PISTOL).orchestra(Orchestras.ORCHESTRA_LASER_PISTOL)
).setUnlocalizedName("gun_laser_pistol_morning_glory");
).setDefaultAmmo(EnumAmmo.CAPACITOR_OVERCHARGE, 20).setUnlocalizedName("gun_laser_pistol_morning_glory");
ModItems.gun_lasrifle = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(2_000).draw(10).inspect(26).crosshair(Crosshair.CIRCLE).scopeTexture(scope_luna)
@ -221,7 +221,7 @@ public class XFactoryEnergy {
.setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY))
.setupStandardConfiguration()
.anim(LAMBDA_LASRIFLE).orchestra(Orchestras.ORCHESTRA_LASRIFLE)
).setUnlocalizedName("gun_lasrifle");
).setDefaultAmmo(EnumAmmo.CAPACITOR, 24).setUnlocalizedName("gun_lasrifle");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_RECOIL_ENERGY = (stack, ctx) -> { };

6
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFlamer.java
View File

@ -146,7 +146,7 @@ public class XFactoryFlamer {
.setupStandardFire())
.setupStandardConfiguration()
.anim(LAMBDA_FLAMER_ANIMS).orchestra(Orchestras.ORCHESTRA_FLAMER)
).setUnlocalizedName("gun_flamer");
).setDefaultAmmo(EnumAmmo.FLAME_DIESEL, 1).setUnlocalizedName("gun_flamer");
ModItems.gun_flamer_topaz = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
.dura(20_000).draw(10).inspect(17).crosshair(Crosshair.L_CIRCLE)
.rec(new Receiver(0)
@ -156,7 +156,7 @@ public class XFactoryFlamer {
.setupStandardFire())
.setupStandardConfiguration()
.anim(LAMBDA_FLAMER_ANIMS).orchestra(Orchestras.ORCHESTRA_FLAMER)
).setUnlocalizedName("gun_flamer_topaz");
).setDefaultAmmo(EnumAmmo.FLAME_DIESEL, 1).setUnlocalizedName("gun_flamer_topaz");
ModItems.gun_flamer_daybreaker = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig()
.dura(20_000).draw(10).inspect(17).crosshair(Crosshair.L_CIRCLE)
.rec(new Receiver(0)
@ -166,7 +166,7 @@ public class XFactoryFlamer {
.setupStandardFire())
.setupStandardConfiguration()
.anim(LAMBDA_FLAMER_ANIMS).orchestra(Orchestras.ORCHESTRA_FLAMER_DAYBREAKER)
).setUnlocalizedName("gun_flamer_daybreaker");
).setDefaultAmmo(EnumAmmo.FLAME_DIESEL, 1).setUnlocalizedName("gun_flamer_daybreaker");
ModItems.gun_chemthrower = new ItemGunChemthrower(WeaponQuality.A_SIDE, new GunConfig()
.dura(90_000).draw(10).inspect(17).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)

8
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java
View File

@ -172,7 +172,7 @@ public class XFactoryRocket {
.setupStandardFire().recoil(LAMBDA_RECOIL_ROCKET))
.setupStandardConfiguration()
.anim(LAMBDA_PANZERSCHRECK_ANIMS).orchestra(Orchestras.ORCHESTRA_PANERSCHRECK)
).setUnlocalizedName("gun_panzerschreck");
).setDefaultAmmo(EnumAmmo.ROCKET_HE, 3).setUnlocalizedName("gun_panzerschreck");
ModItems.gun_stinger = new ItemGunStinger(WeaponQuality.A_SIDE, new GunConfig()
.dura(300).draw(7).inspect(40).crosshair(Crosshair.L_BOX_OUTLINE)
@ -183,7 +183,7 @@ public class XFactoryRocket {
.setupLockonFire().recoil(LAMBDA_RECOIL_ROCKET))
.setupStandardConfiguration().ps(LAMBDA_STINGER_SECONDARY_PRESS).rs(LAMBDA_STINGER_SECONDARY_RELEASE)
.anim(LAMBDA_PANZERSCHRECK_ANIMS).orchestra(Orchestras.ORCHESTRA_STINGER)
).setUnlocalizedName("gun_stinger");
).setDefaultAmmo(EnumAmmo.ROCKET_HEAT, 3).setUnlocalizedName("gun_stinger");
ModItems.gun_quadro = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(400).draw(7).inspect(40).crosshair(Crosshair.L_CIRCUMFLEX).hideCrosshair(false)
@ -194,7 +194,7 @@ public class XFactoryRocket {
.setupStandardFire().recoil(LAMBDA_RECOIL_ROCKET))
.setupStandardConfiguration()
.anim(LAMBDA_QUADRO_ANIMS).orchestra(Orchestras.ORCHESTRA_QUADRO)
).setUnlocalizedName("gun_quadro");
).setDefaultAmmo(EnumAmmo.ROCKET_HE, 4).setUnlocalizedName("gun_quadro");
ModItems.gun_missile_launcher = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
.dura(500).draw(20).inspect(40).crosshair(Crosshair.L_CIRCUMFLEX).hideCrosshair(false)
@ -205,7 +205,7 @@ public class XFactoryRocket {
.setupStandardFire().recoil(LAMBDA_RECOIL_ROCKET))
.setupStandardConfiguration().pp(LAMBDA_MISSILE_LAUNCHER_PRIMARY_PRESS)
.anim(LAMBDA_MISSILE_LAUNCHER_ANIMS).orchestra(Orchestras.ORCHESTRA_MISSILE_LAUNCHER)
).setUnlocalizedName("gun_missile_launcher");
).setDefaultAmmo(EnumAmmo.ROCKET_HEAT, 5).setUnlocalizedName("gun_missile_launcher");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_STINGER_SECONDARY_PRESS = (stack, ctx) -> { ItemGunStinger.setIsLockingOn(stack, true); };

2
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryTool.java
View File

@ -276,7 +276,7 @@ public class XFactoryTool {
.setupStandardFire().recoil(LAMBDA_RECOIL_CT))
.setupStandardConfiguration()
.anim(LAMBDA_CT_ANIMS).orchestra(Orchestras.ORCHESTRA_CHARGE_THROWER)
).setUnlocalizedName("gun_charge_thrower");
).setDefaultAmmo(EnumAmmo.CT_MORTAR, 3).setUnlocalizedName("gun_charge_thrower");
}
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_RECOIL_CT = (stack, ctx) -> {

69
src/main/java/com/hbm/lib/HbmWorldGen.java
View File

@ -26,7 +26,6 @@ import com.hbm.world.generator.DungeonToolbox;
import cpw.mods.fml.common.IWorldGenerator;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.WeightedRandom;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World;
@ -501,74 +500,6 @@ public class HbmWorldGen implements IWorldGenerator {
if(y > 1) (new Meteorite()).generate(world, rand, x, y, z, false, false, false);
}
if (GeneralConfig.enableNITAN) {
if (i <= 10000 && i + 16 >= 10000 && j <= 10000 && j + 16 >= 10000) {
if (world.getBlock(10000, 250, 10000) == Blocks.air) {
world.setBlock(10000, 250, 10000, Blocks.chest);
if (world.getBlock(10000, 250, 10000) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(10000, 250, 10000), 29);
}
}
}
if (i <= 0 && i + 16 >= 0 && j <= 10000 && j + 16 >= 10000) {
if (world.getBlock(0, 250, 10000) == Blocks.air) {
world.setBlock(0, 250, 10000, Blocks.chest);
if (world.getBlock(0, 250, 10000) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(0, 250, 10000), 29);
}
}
}
if (i <= -10000 && i + 16 >= -10000 && j <= 10000 && j + 16 >= 10000) {
if (world.getBlock(-10000, 250, 10000) == Blocks.air) {
world.setBlock(-10000, 250, 10000, Blocks.chest);
if (world.getBlock(-10000, 250, 10000) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(-10000, 250, 10000), 29);
}
}
}
if (i <= 10000 && i + 16 >= 10000 && j <= 0 && j + 16 >= 0) {
if (world.getBlock(10000, 250, 0) == Blocks.air) {
world.setBlock(10000, 250, 0, Blocks.chest);
if (world.getBlock(10000, 250, 0) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(10000, 250, 0), 29);
}
}
}
if (i <= -10000 && i + 16 >= -10000 && j <= 0 && j + 16 >= 0) {
if (world.getBlock(-10000, 250, 0) == Blocks.air) {
world.setBlock(-10000, 250, 0, Blocks.chest);
if (world.getBlock(-10000, 250, 0) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(-10000, 250, 0), 29);
}
}
}
if (i <= 10000 && i + 16 >= 10000 && j <= -10000 && j + 16 >= -10000) {
if (world.getBlock(10000, 250, -10000) == Blocks.air) {
world.setBlock(10000, 250, -10000, Blocks.chest);
if (world.getBlock(10000, 250, -10000) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(10000, 250, -10000), 29);
}
}
}
if (i <= 0 && i + 16 >= 0 && j <= -10000 && j + 16 >= -10000) {
if (world.getBlock(0, 250, -10000) == Blocks.air) {
world.setBlock(0, 250, -10000, Blocks.chest);
if (world.getBlock(0, 250, -10000) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(0, 250, -10000), 29);
}
}
}
if (i <= -10000 && i + 16 >= -10000 && j <= -10000 && j + 16 >= -10000) {
if (world.getBlock(-10000, 250, -10000) == Blocks.air) {
world.setBlock(-10000, 250, -10000, Blocks.chest);
if (world.getBlock(-10000, 250, -10000) == Blocks.chest) {
WeightedRandomChestContent.generateChestContents(rand, ItemPool.getPool(ItemPoolsSingle.POOL_POWDER), (TileEntityChest) world.getTileEntity(-10000, 250, -10000), 29);
}
}
}
}
if(rand.nextInt(4) == 0) {
int x = i + rand.nextInt(16) + 8;
int y = 6 + rand.nextInt(13);

1
src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java
View File

@ -109,6 +109,7 @@ public class TileEntityPASource extends TileEntityCooledBase implements IGUIProv
}
public void tryRun() {
if(!isCool()) return;
if(slots[1].getItem().hasContainerItem(slots[1]) && slots[3] != null) return;
if(slots[2].getItem().hasContainerItem(slots[2]) && slots[4] != null) return;

1
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -1829,6 +1829,7 @@ item.ammo_arty_phosphorus_multi.name=16" Multi Phosphorus Shell
item.ammo_bag.name=Ammo Bag
item.ammo_bag_infinite.name=Infinite Ammo Bag
item.ammo_container.name=Ammo Container
item.ammo_container.desc=Gives ammo for up to three held weapons
item.ammo_dgk.name=Goalkeeper Twin CIWS 200 Round Belt
item.ammo_fireext.name=Fire Extinguisher Water Tank
item.ammo_fireext_foam.name=Fire Extinguisher Foam Tank

BIN
src/main/resources/assets/hbm/textures/gui/reactors/gui_fusion_torus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB