ool in the shed

Signed-off-by: Drillgon Chickens <drillgon200@gmail.com>

api/hbm/energy/IRadarDetectable.java

@@ -0,0 +1,21 @@
+package api.hbm.energy;
+
+public interface IRadarDetectable {
+
+	public static enum RadarTargetType {
+		MISSILE_TIER0,		//tier 0 missile (micro missile assemblies)
+		MISSILE_TIER1,		//tier 1 missiles
+		MISSILE_TIER2,		//tier 2 missiles
+		MISSILE_TIER3,		//tier 3 missiles
+		MISSILE_TIER4,		//tier 4 missiles (nuclear, thermo, doomsday)
+		MISSILE_10,			//size 10 custom missiles
+		MISSILE_10_15,		//size 10/15 custom missiles
+		MISSILE_15,			//size 15 custom missiles
+		MISSILE_15_20,		//size 15/20 custom missiles
+		MISSILE_20,			//size 20 custom missiles
+		MISSILE_AB,			//anti ballistic missile
+		PLAYER,				//airborne players
+	}
+
+	public RadarTargetType getTargetType();
+}

assets/hbm/advancements/horizonsbonus.json

@@ -11,7 +11,7 @@
 		},
 		"frame": "challenge"
 	},
-	"parent": "hbm:root",
+	"parent": "hbm:horizonsend",
 	"criteria": {
 		"impossible": {
 			"trigger": "minecraft:impossible"

assets/hbm/advancements/horizonsend.json

@@ -11,7 +11,7 @@
 		},
 		"frame": "challenge"
 	},
-	"parent": "hbm:root",
+	"parent": "hbm:horizonsstart",
 	"criteria": {
 		"impossible": {
 			"trigger": "minecraft:impossible"

assets/hbm/blockstates/block_polonium.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:block_polonium" }
+	}
+}

assets/hbm/blockstates/concrete_pillar.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "axis=y": { "model": "hbm:concrete_pillar" },
+        "axis=z": { "model": "hbm:concrete_pillar", "x": 90 },
+        "axis=x": { "model": "hbm:concrete_pillar", "x": 90, "y": 90 }
+    }
+}

assets/hbm/blockstates/glass_polonium.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:glass_polonium" }
+	}
+}

assets/hbm/blockstates/glass_trinitite.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:glass_trinitite" }
+	}
+}

assets/hbm/blockstates/glass_uranium.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:glass_uranium" }
+	}
+}

assets/hbm/blockstates/iter.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:iter" }
+	}
+}

assets/hbm/blockstates/machine_minirtg.json

@@ -1,5 +1,11 @@
 {
+	"forge_marker": 1,
+	"defaults": {
+		"textures": {},
+		"model": "hbm:rtg_mini.obj"
+	},
 	"variants": {
-		"normal": { "model": "hbm:machine_minirtg" }
+		"normal": [{}],
+		"inventory": [{ "transform": "forge:default-block" }]
 	}
 }

assets/hbm/blockstates/muffler.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:muffler" }
+	}
+}

assets/hbm/blockstates/ore_asbestos.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:ore_asbestos" }
+	}
+}

assets/hbm/blockstates/plasma_heater.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:plasma_heater" }
+	}
+}

assets/hbm/blockstates/sand_polonium.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:sand_polonium" }
+	}
+}

assets/hbm/blockstates/sand_uranium.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:sand_uranium" }
+	}
+}

assets/hbm/blockstates/tile_lab.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:tile_lab" }
+	}
+}

assets/hbm/blockstates/tile_lab_broken.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:tile_lab_broken" }
+	}
+}

assets/hbm/blockstates/tile_lab_cracked.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"normal": { "model": "hbm:tile_lab_cracked" }
+	}
+}

assets/hbm/lang/en_us.lang

@@ -122,6 +122,11 @@ hbmfluid.oxygen=Liquid Oxygen
 hbmfluid.xenon=Xenon Gas
 hbmfluid.balefire=BF Rocket Fuel
 hbmfluid.mercury=Mercury
+hbmfluid.plasma_dt=Deuterium-Tritium Plasma
+hbmfluid.plasma_hd=Hydrogen-Deuterium Plasma
+hbmfluid.plasma_ht=Hydrogen-Tritium Plasma
+hbmfluid.plasma_xm=Xenon-Mercury Plasma
+hbmfluid.plasma_bf=Balefire Plasma
 
 fluid.steam=Steam
 fluid.hotsteam=Dense Steam
@@ -161,6 +166,11 @@ fluid.oxygen=Liquid Oxygen
 fluid.xenon=Xenon Gas
 fluid.balefire=BF Rocket Fuel
 fluid.mercury=Mercury
+fluid.plasma_dt=Deuterium-Tritium Plasma
+fluid.plasma_hd=Hydrogen-Deuterium Plasma
+fluid.plasma_ht=Hydrogen-Tritium Plasma
+fluid.plasma_xm=Xenon-Mercury Plasma
+fluid.plasma_bf=Balefire Plasma
 
 chem.TEST=Test
 chem.FP_HEAVYOIL=Heavy Oil Processing
@@ -283,8 +293,8 @@ item.test_nuke_tier2_bullet.name=MOX Projectile (Tier 2)
 item.test_nuke_tier1_target.name=Subcritical U235 Target (Tier 1)
 item.test_nuke_tier2_target.name=Subcritical MOX Target (Tier 2)
 
-item.gadget_explosive.name=Propellant
-item.gadget_explosive8.name=Bundle of Propellant
+item.gadget_explosive.name=First Generation Explosive Lens
+item.gadget_explosive8.name=Bundle of First Generation Implosion Propellant
 item.gadget_wireing.name=Wiring
 item.gadget_core.name=Plutonium Core
 
@@ -294,8 +304,8 @@ item.boy_bullet.name=U235 Projectile
 item.boy_target.name=Subcritical U235 Target
 item.boy_shielding.name=Neutron Shielding
 
-item.man_explosive.name=Propellant
-item.man_explosive8.name=Bundle of Propellant
+item.man_explosive.name=Explosive Lens
+item.man_explosive8.name=Bundle of Implosion Propellant
 item.man_igniter.name=Bomb Igniter
 item.man_core.name=Plutonium Core
 
@@ -539,6 +549,7 @@ container.crateIron=Iron Crate
 tile.crate_steel.name=Steel Crate
 container.crateSteel=Steel Crate
 tile.safe.name=Safe
+tile.sand_polonium.name=Polonium Sand
 container.safe=Safe
 tile.machine_press.name=Burner Press
 container.press=Burner Press
@@ -712,6 +723,7 @@ item.plate_steel.name=Steel Plate
 item.ingot_beryllium.name=Beryllium Ingot
 item.plate_schrabidium.name=Schrabidium Plate
 item.ingot_schraranium.name=Schraranium Ingot
+item.ingot_semtex.name=Bar of Semtex
 item.ingot_schrabidium.name=Schrabidium Ingot
 item.nugget_schrabidium.name=Schrabidium Nugget
 item.plate_copper.name=Copper Plate
@@ -768,6 +780,7 @@ item.ingot_desh.name=Desh Ingot
 item.nugget_desh.name=Desh Nugget
 item.powder_desh.name=Desh Powder
 item.powder_desh_mix.name=Desh Blend
+item.powder_desh_ready.name=DeshReady™ Blend
 item.powder_nitan_mix.name=Nitanium Blend
 item.powder_spark_mix.name=Spark Blend
 item.ingot_dineutronium.name=Dineutronium Ingot
@@ -924,6 +937,7 @@ tile.block_pu238.name=Block of Pu238
 tile.block_pu239.name=Block of Pu239
 tile.block_pu240.name=Block of Pu240
 tile.block_plutonium_fuel.name=Block of Plutonium Fuel
+tile.block_polonium.name=Block of Polonium
 tile.block_thorium_fuel.name=Block of Thorium Fuel
 tile.block_solinium.name=Block of Solinium
 tile.block_schrabidium_fuel.name=Block of Schrabidium Fuel
@@ -995,6 +1009,7 @@ tile.reinforced_lamp_on.name=Reinforced Lamp
 tile.reinforced_stone.name=Dense Stone
 tile.concrete_smooth.name=Concrete
 tile.concrete.name=Concrete Tile
+tile.concrete_pillar.name=Rebar Reinforced Concrete Pillar
 tile.brick_concrete.name=Concrete Bricks
 tile.brick_concrete_mossy.name=Mossy Concrete Bricks
 tile.brick_concrete_cracked.name=Cracked Concrete Bricks
@@ -1004,6 +1019,10 @@ tile.brick_light.name=Light Bricks
 tile.asphalt.name=Asphalt
 tile.brick_compound.name=Compound Mesh
 
+tile.tile_lab.name=Laboratory Tiles
+tile.tile_lab_broken.name=Broken Laboratory Tiles
+tile.tile_lab_cracked.name=Cracked Laboratory Tiles
+
 tile.cmb_brick.name=CMB Steel Tile
 tile.cmb_brick_reinforced.name=Reinforced CMB Bricks
 
@@ -1018,6 +1037,9 @@ tile.barbed_wire_wither.name=Withered Barbed Wire
 tile.barbed_wire_ultradeath.name=Cloud Barbed Wire
 
 tile.fence_metal.name=Chainlink Fence
+tile.sand_uranium.name=Uranium Sand
+tile.glass_uranium.name=Uranium Glass
+tile.glass_trinitite.name=Trinity Glass
 
 tile.seal_frame.name=Silo Hatch Frame
 tile.seal_controller.name=Silo Hatch Opener
@@ -1042,9 +1064,11 @@ tile.ore_lead.name=Lead Ore
 item.powder_lead.name=Lead Powder
 item.powder_neptunium.name=Neptunium Powder
 item.powder_schrabidium.name=Schrabidium Powder
+item.powder_semtex_mix.name=Semtex Blend
 item.powder_iron.name=Iron Powder
 item.powder_gold.name=Gold Powder
 item.powder_aluminium.name=Aluminium Powder
+item.powder_asbestos.name=Asbestos Powder
 item.powder_beryllium.name=Beryllium Powder
 item.powder_copper.name=Copper Powder
 item.powder_titanium.name=Titanium Powder
@@ -1116,6 +1140,7 @@ item.battery_creative.name=Infinite Battery
 
 item.battery_su.name=SU-Battery
 item.battery_su_l.name=Large SU-Battery
+item.battery_trixite.name=Off-Brand Spark Battery
 item.battery_steam.name=Steam Powered Energy Storage Tank
 item.battery_steam_large.name=Large Steam Powered Energy Storage Tank
 
@@ -1190,6 +1215,7 @@ item.coil_copper.name=Copper Coil
 item.coil_copper_torus.name=Ring Coil
 item.wire_tungsten.name=Tungsten Wire
 item.coil_tungsten.name=Heating Coil
+item.coin_maskman.name=Maskman Coin
 item.tank_steel.name=Steel Tank
 item.motor.name=Motor
 item.centrifuge_element.name=Centrifuge Element
@@ -1284,6 +1310,7 @@ item.rod_pu238.name=Pu238 Rod
 item.rod_pu239.name=Pu239 Rod
 item.rod_pu240.name=Pu240 Rod
 item.rod_neptunium.name=Neptunium Rod
+item.rod_of_discord.name=Rod of Discord
 item.rod_lead.name=Lead Rod
 item.rod_schrabidium.name=Sa326 Rod
 item.rod_solinium.name=Sa327 Rod
@@ -1294,6 +1321,12 @@ item.rod_reiium.name=Reiium Rod
 item.rod_unobtainium.name=Unobtainium Rod
 item.rod_daffergon.name=Daffergon Rod
 item.rod_verticium.name=Verticium Rod
+item.rod_balefire.name=Balefire Rod
+item.rod_balefire_blazing.name=Blazing Balefire Rod
+item.rod_dual_balefire.name=Balefire Dual Rod
+item.rod_dual_balefire_blazing.name=Blazing Balefire Dual Rod
+item.rod_quad_balefire.name=Balefire Quad Rod
+item.rod_quad_balefire_blazing.name=Blazing Balefire Quad Rod
 
 item.rod_dual_empty.name=Empty Dual Rod
 item.rod_dual_th232.name=Th232 Dual Rod
@@ -1596,6 +1629,7 @@ item.gun_mp.name=Pacifist's Machine Gun
 item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon"
 item.gun_emp.name=EMP Gun
 item.gun_super_shotgun.name=Super Shotgun
+item.gun_sauer.name=Stan Sauer's Shotgun
 item.gun_moist_nugget.name=Mosin-Nagant
 item.gun_revolver_inverted.name=Flipped Revolver
 item.gun_jack.name=Jackhammer
@@ -1644,7 +1678,8 @@ item.ammo_12gauge.name=12 Gauge Buckshot
 item.ammo_12gauge_incendiary.name=12 Gauge Buckshot (Incendiary)
 item.ammo_12gauge_shrapnel.name=12 Gauge Buckshot (Shrapnel)
 item.ammo_12gauge_du.name=12 Gauge Buckshot (Uranium Coated)
-item.ammo_12gauge_marauder.name=12 Gauge Tactical Anti-Marauder Shell												  
+item.ammo_12gauge_sleek.name=12 Gauge Buckshot (IF-R&D)
+item.ammo_12gauge_marauder.name=12 Gauge Tactical Anti-Marauder Shell
 item.ammo_20gauge.name=20 Gauge Buckshot
 item.ammo_20gauge_slug.name=20 Gauge Brenneke Slug
 item.ammo_20gauge_flechette.name=20 Gauge Flechette Shell
@@ -1654,9 +1689,11 @@ item.ammo_20gauge_shock.name=20 Gauge Buckshot (Shock)
 item.ammo_20gauge_caustic.name=20 Gauge Buckshot (Caustic)
 item.ammo_20gauge_explosive.name=20 Gauge Buckshot (Explosive)
 item.ammo_20gauge_wither.name=20 Gauge Buckshot (Withering)
+item.ammo_20gauge_sleek.name=20 Gauge Buckshot (IF-R&D)
 item.ammo_4gauge.name=4 Gauge Buckshot
 item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug
 item.ammo_4gauge_explosive.name=23mm Grenade
+item.ammo_4gauge_sleek.name=4 Gauge Buckshot (IF-R&D)
 item.ammo_5mm.name=5mm Round
 item.ammo_5mm_explosive.name=5mm Round (Explosive)
 item.ammo_5mm_du.name=5mm Round (DU)
@@ -1668,6 +1705,7 @@ item.ammo_50ae_star.name=.50 AE Round (Starmetal)
 item.ammo_50bmg.name=.50 BMG Round
 item.ammo_50bmg_incendiary.name=.50 BMG Round (Incendiary)
 item.ammo_50bmg_phosphorus.name=.50 BMG Round (WP)
+item.ammo_50bmg_sleek.name=.50 BMG Round (IF-R&D)
 item.ammo_50bmg_explosive.name=.50 BMG Round (Explosive)
 item.ammo_50bmg_ap.name=.50 BMG Round (AP)
 item.ammo_50bmg_du.name=.50 BMG Round (DU)
@@ -1678,12 +1716,14 @@ item.ammo_9mm_du.name=9mm Round (DU)
 item.ammo_9mm_rocket.name=9mm Rocket
 item.ammo_556.name=5.56mm Round
 item.ammo_556_phosphorus.name=5.56mm Round (WP)
+item.ammo_556_sleek.name=5.56mm Round (IF-R&D)
 item.ammo_556_ap.name=5.56mm Round (AP)
 item.ammo_556_du.name=5.56mm Round (DU)
 item.ammo_556_star.name=5.56mm Round (Starmetal)
 item.ammo_556_flechette.name=5.56mm Flechette Round
 item.ammo_556_flechette_incendiary.name=5.56mm Flechette Round (Incendiary)
 item.ammo_556_flechette_phosphorus.name=5.56mm Flechette Round (Phosphorus-Tipped)
+item.ammo_556_flechette_sleek.name=5.56mm Flechette Round (IF-R&D)
 item.ammo_556_flechette_du.name=5.56mm Flechette Round (Uranium Penetrator)
 item.ammo_556_tracer.name=5.56mm Round (Tracer)
 item.ammo_556_k.name=5.56mm K-Round
@@ -1824,9 +1864,9 @@ entity.hbm.entity_schrabnel.name=Schrabnel
 entity.entity_nuclear_creeper.name=Nuclear Creeper
 entity.entity_tainted_creeper.name=Tainted Creeper
 entity.entity_hunter_chopper.name=Hunter Chopper
-entity.entity_cybercrab.name=Cyber Crab
+entity.entity_cyber_crab.name=Cyber Crab
 entity.entity_tesla_crab.name=Tesla Crab
-entity.entity_taint_crab.name=Taint Crab						   
+entity.entity_taint_crab.name=Taint Crab
 
 item.cap_aluminium.name=Aluminium Cap
 item.hull_small_steel.name=Small Steel Shell
@@ -2513,6 +2553,7 @@ item.reactor_sensor.name=Reactor Remote Sensor
 item.oil_detector.name=Oil Reservoir Detector
 item.geiger_counter.name=Handheld Geiger Counter
 tile.geiger.name=Geiger Counter
+tile.glass_polonium.name=Polonium Glass
 item.survey_scanner.name=Survey Scanner
 
 item.thermo_element.name=Thermoelectric Element
@@ -2547,7 +2588,7 @@ item.letter.name=Express Mail
 item.polaroid.name=The Polaroid
 item.glitch.name=Glitch
 item.book_secret.name=3-596-50802-9
-item.book_of_.name=The Book of Boxcars
+item.book_of_.name=The Black Book
 item.burnt_bark.name=Burnt Bark
 
 item.loot_10.name=Size 10 Missile Loot Crate