mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
removed unused lang, removed No_Disperse
This commit is contained in:
70000hp
parent
897308cb7f
commit
4a72e201cf
@ -68,9 +68,12 @@ public class FluidContainerRegistry {
|
||||
if(type.getContainer(CD_Gastank.class) != null) FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full, 1, id), new ItemStack(ModItems.gas_empty), type, 1000));
|
||||
|
||||
if(type.hasNoContainer()) continue;
|
||||
|
||||
if(type.isDispersable()){
|
||||
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.disperser_canister, 1 , i), new ItemStack(ModItems.disperser_canister_empty), Fluids.fromID(i), 2000));
|
||||
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.glyphid_gland, 1 , i), new ItemStack(ModItems.glyphid_gland_empty), Fluids.fromID(i), 4000));
|
||||
}
|
||||
|
||||
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.disperser_canister, 1 , i), new ItemStack(ModItems.disperser_canister_empty), Fluids.fromID(i), 2000));
|
||||
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.glyphid_gland, 1 , i), new ItemStack(ModItems.glyphid_gland_empty), Fluids.fromID(i), 4000));
|
||||
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, id), new ItemStack(ModItems.fluid_tank_lead_empty), type, 1000));
|
||||
|
||||
if(type.needsLeadContainer()) continue;
|
||||
|
||||
@ -172,7 +172,7 @@ public class FluidType {
|
||||
return this.traits.containsKey(FT_LeadContainer.class);
|
||||
}
|
||||
public boolean isDispersable() {
|
||||
return !(this.traits.containsKey(FT_NoDispersable.class));
|
||||
return !(this.traits.containsKey(FT_Amat.class) || this.traits.containsKey(FT_NoContainer.class) || this.traits.containsKey(FT_Viscous.class));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -186,7 +186,6 @@ public class Fluids {
|
||||
public static final FT_Delicious DELICIOUS = new FT_Delicious();
|
||||
public static final FT_Leaded LEADED = new FT_Leaded();
|
||||
|
||||
public static final FT_NoDispersable NO_DISPERSE= new FT_NoDispersable();
|
||||
public static void init() {
|
||||
|
||||
// ##### ##### ##### ##### ## # ##### # # ##### ## # #####
|
||||
@ -235,8 +234,8 @@ public class Fluids {
|
||||
PUF6 = new FluidType("PUF6", 0x4C4C4C, 4, 0, 4, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(0.1F), new FT_Corrosive(15), GASEOUS);
|
||||
SAS3 = new FluidType("SAS3", 0x4ffffc, 5, 0, 4, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(1F), new FT_Corrosive(30), LIQUID);
|
||||
SCHRABIDIC = new FluidType("SCHRABIDIC", 0x006B6B, 5, 0, 5, EnumSymbol.ACID).addTraits(new FT_VentRadiation(1F), new FT_Corrosive(75), new FT_Poison(true, 2), LIQUID);
|
||||
AMAT = new FluidType("AMAT", 0x010101, 5, 0, 5, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS, NO_DISPERSE);
|
||||
ASCHRAB = new FluidType("ASCHRAB", 0xb50000, 5, 0, 5, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS, NO_DISPERSE);
|
||||
AMAT = new FluidType("AMAT", 0x010101, 5, 0, 5, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS);
|
||||
ASCHRAB = new FluidType("ASCHRAB", 0xb50000, 5, 0, 5, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS);
|
||||
ACID = new FluidType("ACID", 0xfff7aa, 3, 0, 3, EnumSymbol.OXIDIZER).addTraits(new FT_Corrosive(40), LIQUID);
|
||||
WATZ = new FluidType("WATZ", 0x86653E, 4, 0, 3, EnumSymbol.ACID).addTraits(new FT_Corrosive(60), new FT_VentRadiation(0.1F), LIQUID, VISCOUS);
|
||||
CRYOGEL = new FluidType("CRYOGEL", 0x32ffff, 2, 0, 0, EnumSymbol.CROYGENIC).setTemp(-170).addTraits(LIQUID, VISCOUS);
|
||||
|
||||
@ -36,7 +36,6 @@ public abstract class FluidTrait {
|
||||
traitNameMap.put("delicious", FT_Delicious.class);
|
||||
traitNameMap.put("leaded", FT_Leaded.class);
|
||||
traitNameMap.put("pheromone", FT_Pheromone.class);
|
||||
traitNameMap.put("nodisperse", FT_NoDispersable.class);
|
||||
traitNameMap.put("noid", FT_NoID.class);
|
||||
traitNameMap.put("nocontainer", FT_NoContainer.class);
|
||||
}
|
||||
|
||||
@ -49,11 +49,7 @@ public class FluidTraitSimple {
|
||||
info.add(EnumChatFormatting.DARK_RED + "[Requires hazardous material tank to hold]");
|
||||
}
|
||||
}
|
||||
public static class FT_NoDispersable extends FluidTrait {
|
||||
@Override public void addInfo(List<String> info) {
|
||||
info.add(EnumChatFormatting.DARK_RED + "[Cannot be thrown from Disperser Canister]");
|
||||
}
|
||||
}
|
||||
|
||||
public static class FT_Delicious extends FluidTrait {
|
||||
@Override public void addInfoHidden(List<String> info) {
|
||||
info.add(EnumChatFormatting.DARK_GREEN + "[Delicious]");
|
||||
|
||||
@ -847,7 +847,6 @@ death.attack.mku=%1$s died from unknown causes.
|
||||
death.attack.monoxide=%1$s forgot to change the batteries in their carbon monoxide detector.
|
||||
death.attack.mudPoisoning=%1$s died in poisonous mud.
|
||||
death.attack.nuclearBlast=%1$s was blown away by a nuclear explosion.
|
||||
death.attack.nitan=%1$s was consumed by taint.
|
||||
death.attack.overdose=%1$s overdosed and asphyxiated.
|
||||
death.attack.pc=%1$s was reduced to a puddle in the pink cloud.
|
||||
death.attack.plasma=%1$s was immolated by %2$s.
|
||||
@ -953,7 +952,6 @@ desc.item.ammo.pro_explosive=+ Explosive
|
||||
desc.item.ammo.pro_fallout=+ Fallout
|
||||
desc.item.ammo.pro_fit_357=+ Fits every .357 model
|
||||
desc.item.ammo.pro_flames=+ Increased flame count
|
||||
desc.item.ammo.pro_flash=+ ow my eyes
|
||||
desc.item.ammo.pro_gravity=+ Decreased gravity
|
||||
desc.item.ammo.pro_heavy_damage=+ Highly increased damage
|
||||
desc.item.ammo.pro_incendiary=+ Incendiary
|
||||
@ -1121,7 +1119,6 @@ gun.make.MANN=Open Mann Co.
|
||||
gun.make.MAXIM=Hiram Maxim
|
||||
gun.make.METRO=Metro Gunsmiths
|
||||
gun.make.MWT=MWT Prototype Labs
|
||||
gun.make.MORITA=Morita Company
|
||||
gun.make.NAWS=Kayarm Industries
|
||||
gun.make.ERFURT=Erfurter Maschinenfabrik Geipel
|
||||
gun.make.NONE=-
|
||||
@ -1361,6 +1358,8 @@ hbmfluid.pain=Pandemonium(III)tantalite Solution
|
||||
hbmfluid.petroil=Petroil
|
||||
hbmfluid.petroil_leaded=Leaded Petroil
|
||||
hbmfluid.petroleum=Petroleum Gas
|
||||
hbmfluid.pheromone=Booster Pheromone
|
||||
hbmfluid.pheromone_m=Modified Booster Pheromone
|
||||
hbmfluid.phosgene=Phosgene
|
||||
hbmfluid.plasma_bf=Balefire Plasma
|
||||
hbmfluid.plasma_dh3=Deuterium-Helium-3 Plasma
|
||||
@ -1408,9 +1407,8 @@ hbmfluid.woodoil=Wood Oil
|
||||
hbmfluid.xenon=Xenon Gas
|
||||
hbmfluid.xpjuice=Experience Juice
|
||||
hbmfluid.xylene=BTX
|
||||
hbmfluid.caulk=Quick-Hardening Caulk
|
||||
hbmfluid.pheromone=Booster Pheromone
|
||||
hbmfluid.pheromone_m=Modified Booster Pheromone
|
||||
|
||||
|
||||
|
||||
hbmpseudofluid.none=Empty
|
||||
hbmpseudofluid.heuf6=Highly Enriched UF6
|
||||
@ -1588,9 +1586,6 @@ item.ammo_44_star.name=.44 Magnum Bullet (Starmetal)
|
||||
item.ammo_45.name=.45 ACP Bullet
|
||||
item.ammo_45_ap.name=.45 ACP Bullet (AP)
|
||||
item.ammo_45_du.name=.45 ACP Bullet (DU)
|
||||
item.ammo_45_drum.name=.45 ACP 100 Round Drum
|
||||
item.ammo_45_drum_ap.name=.45 ACP 100 Round Drum (AP)
|
||||
item.ammo_45_drum_du.name=.45 ACP 100 Round Drum (DU)
|
||||
item.ammo_4gauge.name=4 Gauge Buckshot
|
||||
item.ammo_4gauge_balefire.name=23mm Balefire Grenade
|
||||
item.ammo_4gauge_canister.name=23mm Rocket (Canister Shot)
|
||||
@ -1603,8 +1598,6 @@ item.ammo_4gauge_semtex.name=23mm Mining Charge
|
||||
item.ammo_4gauge_sleek.name=4 Gauge Buckshot (IF-R&D)
|
||||
item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug
|
||||
item.ammo_4gauge_titan.name=4 Gauge Quacker Round
|
||||
item.ammo_4gauge_flash1.name=4 Gauge Hviezda Round
|
||||
item.ammo_4gauge_flash2.name=4 Gauge Hviezda-S Round
|
||||
item.ammo_4gauge_vampire.name=4 Gauge Wooden Stake Shell
|
||||
item.ammo_4gauge_void.name=4 Gauge Void Shell
|
||||
item.ammo_50ae.name=.50 AE Round
|
||||
@ -2500,8 +2493,6 @@ item.flame_politics.desc=Donald Duck will build the wall!
|
||||
item.flame_pony.name=Painting of a Cartoon Pony
|
||||
item.flame_pony.desc=Yellow horse beats blue horse, that's a proven fact!
|
||||
item.flask_infusion.shield.name=Shield Infusion
|
||||
item.flask_infusion.nitan.name=NITAN© Ambrosia
|
||||
item.flask_infusion.nitan.desc=Painkiller for medical and recreational use only.
|
||||
item.fleija_core.name=F.L.E.I.J.A. Uranium 235 Charge
|
||||
item.fleija_igniter.name=Pulse Igniter
|
||||
item.fleija_kit.name=F.L.E.I.J.A. Kit
|
||||
@ -2693,7 +2684,6 @@ item.gun_lacunae_ammo.name=5mm Round (LEGACY)
|
||||
item.gun_lever_action.name=Mare's Leg (Original)
|
||||
item.gun_lever_action_ammo.name=12x74 Buckshot (LEGACY)
|
||||
item.gun_lever_action_dark.name=Mare's Leg (Dark)
|
||||
item.gun_lever_action_akimbo.name=Mare's Leg (Dusk)
|
||||
item.gun_lever_action_sonata.name=Flipped Mare's Leg
|
||||
item.gun_lever_action_sonata_2.name=§cSonata's Microphone§r
|
||||
item.gun_lunatic_marksman.name=Lunatic Sniper Rifle
|
||||
@ -2702,8 +2692,6 @@ item.gun_minigun.name=CZ53 Personal Minigun
|
||||
item.gun_mirv.name=M42 Nuclear Catapult "Experimental MIRV"
|
||||
item.gun_mirv_ammo.name=Eightfold MIRV (LEGACY)
|
||||
item.gun_moist_nugget.name=Mosin-Nagant
|
||||
item.gun_morita.name=Morita Assault Rifle
|
||||
item.gun_morita_carbine.name=Morita Carbine
|
||||
item.gun_mp.name=Pacifist's Machine Gun
|
||||
item.gun_mp40.name=Submachine Gun
|
||||
item.gun_mp40_ammo.name=Submachine Gun Round (LEGACY)
|
||||
@ -2754,7 +2742,6 @@ item.gun_super_shotgun.name=Super Shotgun
|
||||
item.gun_super_shotgun.desc=It's super broken!
|
||||
item.gun_supershotgun.name=Super Shotgun
|
||||
item.gun_thompson.name=Thompson Submachine Gun
|
||||
item.gun_typewriter.name=The Chicago Typewriter
|
||||
item.gun_uac_pistol.name=UAC .45 Pistol
|
||||
item.gun_uboinik.name=Uboinik
|
||||
item.gun_uboinik_ammo.name=12x70 Buckshot (LEGACY)
|
||||
@ -3223,7 +3210,6 @@ item.mp_warhead_15_n2.name=Size 15 N² Mine
|
||||
item.mp_warhead_15_nuclear.name=Size 15 Nuclear Warhead
|
||||
item.mp_warhead_15_nuclear_mimi.name=Size 15 Mimi-chan's Head
|
||||
item.mp_warhead_15_nuclear_shark.name=Size 15 Nuclear Warhead
|
||||
item.mp_warhead_15_mirv.name=Size 15 MIRV Warhead
|
||||
item.mp_warhead_15_turbine.name=Size 15 Jet Engine
|
||||
item.mucho_mango.name=AriZona Mucho Mango
|
||||
item.multi_kit.name=Multi Purpose Bomb Kit
|
||||
@ -4298,7 +4284,7 @@ item.warhead_incendiary_large.name=Large Incendiary Warhead
|
||||
item.warhead_incendiary_medium.name=Medium Incendiary Warhead
|
||||
item.warhead_incendiary_small.name=Small Incendiary Warhead
|
||||
item.warhead_mirv.name=Thermonuclear Warhead
|
||||
item.warhead_mirvlet.name=Compact Nuclear Warhead
|
||||
item.warhead_mirvlet.name=MIRV
|
||||
item.warhead_nuclear.name=Nuclear Warhead
|
||||
item.warhead_thermo_endo.name=Endothermic Warhead
|
||||
item.warhead_thermo_exo.name=Exothermic Warhead
|
||||
@ -4396,7 +4382,6 @@ potion.hbm_radiation=Contaminated
|
||||
potion.hbm_radx=Rad-X
|
||||
potion.hbm_stability=Stability
|
||||
potion.hbm_taint=Tainted
|
||||
potion.hbm_nitan=Ambrosia
|
||||
potion.hbm_telekinesis=! ! !
|
||||
|
||||
radar.clearMap=Clear Map
|
||||
@ -4890,9 +4875,6 @@ tile.ducrete.name=Ducrete Tile
|
||||
tile.ducrete_stairs.name=Ducrete Tile Stairs
|
||||
tile.ducrete_smooth.name=Ducrete
|
||||
|
||||
tile.concrete_debris.name=Concrete Debris
|
||||
tile.ducrete_debris.name=Ducrete Debris
|
||||
|
||||
tile.ducrete_smooth_stairs.name=Ducrete Stairs
|
||||
|
||||
tile.dummy_block.name=Dummy Block
|
||||
@ -4987,7 +4969,6 @@ tile.glass_quartz.name=Quartz Glass
|
||||
tile.glass_trinitite.name=Trinity Glass
|
||||
tile.glass_uranium.name=Uranium Glass
|
||||
tile.glyphid_base.name=Glyphid Hive Block
|
||||
tile.glyphid_support.name=Glyphid Hive Support Block
|
||||
tile.glyphid_spawner.name=Glyphid Hive Spawner
|
||||
tile.gneiss_brick.name=Schist Brick
|
||||
tile.gneiss_chiseled.name=Chiseled Schist
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user