diff --git a/assets/hbm/textures/items/missile_carrier.png b/assets/hbm/textures/items/missile_carrier.png new file mode 100644 index 000000000..0afb1120a Binary files /dev/null and b/assets/hbm/textures/items/missile_carrier.png differ diff --git a/assets/hbm/textures/items/sat_chip.png b/assets/hbm/textures/items/sat_chip.png new file mode 100644 index 000000000..ff0a9aa21 Binary files /dev/null and b/assets/hbm/textures/items/sat_chip.png differ diff --git a/assets/hbm/textures/items/sat_foeq.png b/assets/hbm/textures/items/sat_foeq.png new file mode 100644 index 000000000..abcc4dd48 Binary files /dev/null and b/assets/hbm/textures/items/sat_foeq.png differ diff --git a/assets/hbm/textures/items/sat_laser.png b/assets/hbm/textures/items/sat_laser.png new file mode 100644 index 000000000..eb6209d7a Binary files /dev/null and b/assets/hbm/textures/items/sat_laser.png differ diff --git a/assets/hbm/textures/items/sat_mapper.png b/assets/hbm/textures/items/sat_mapper.png new file mode 100644 index 000000000..97b6d5310 Binary files /dev/null and b/assets/hbm/textures/items/sat_mapper.png differ diff --git a/assets/hbm/textures/items/sat_radar.png b/assets/hbm/textures/items/sat_radar.png new file mode 100644 index 000000000..51fd3ec64 Binary files /dev/null and b/assets/hbm/textures/items/sat_radar.png differ diff --git a/assets/hbm/textures/items/sat_resonator.png b/assets/hbm/textures/items/sat_resonator.png new file mode 100644 index 000000000..52df31931 Binary files /dev/null and b/assets/hbm/textures/items/sat_resonator.png differ diff --git a/assets/hbm/textures/items/sat_scanner.png b/assets/hbm/textures/items/sat_scanner.png new file mode 100644 index 000000000..0c2fc42db Binary files /dev/null and b/assets/hbm/textures/items/sat_scanner.png differ diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index f352daffd..dc34e13a0 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -675,8 +675,13 @@ public class ModItems { public static Item missile_doomsday; public static Item missile_taint; public static Item missile_micro; - + public static Item missile_carrier; + public static Item sat_mapper; + public static Item sat_scanner; + public static Item sat_radar; + public static Item sat_laser; + public static Item sat_foeq; public static Item gun_rpg; public static Item gun_rpg_ammo; @@ -1819,6 +1824,11 @@ public class ModItems { missile_taint = new Item().setUnlocalizedName("missile_taint").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_taint"); missile_micro = new Item().setUnlocalizedName("missile_micro").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_micro"); missile_carrier = new Item().setUnlocalizedName("missile_carrier").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_carrier"); + sat_mapper = new Item().setUnlocalizedName("sat_mapper").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":sat_mapper"); + sat_scanner = new Item().setUnlocalizedName("sat_scanner").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":sat_scanner"); + sat_radar = new Item().setUnlocalizedName("sat_radar").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":sat_radar"); + sat_laser = new Item().setUnlocalizedName("sat_laser").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":sat_laser"); + sat_foeq = new Item().setUnlocalizedName("sat_foeq").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":sat_foeq"); gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_new"); gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_new"); @@ -3136,6 +3146,13 @@ public class ModItems { GameRegistry.registerItem(missile_micro, missile_micro.getUnlocalizedName()); GameRegistry.registerItem(missile_carrier, missile_carrier.getUnlocalizedName()); + //Satellites + GameRegistry.registerItem(sat_mapper, sat_mapper.getUnlocalizedName()); + GameRegistry.registerItem(sat_scanner, sat_scanner.getUnlocalizedName()); + GameRegistry.registerItem(sat_radar, sat_radar.getUnlocalizedName()); + GameRegistry.registerItem(sat_laser, sat_laser.getUnlocalizedName()); + GameRegistry.registerItem(sat_foeq, sat_foeq.getUnlocalizedName()); + //Guns GameRegistry.registerItem(gun_revolver_iron, gun_revolver_iron.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver, gun_revolver.getUnlocalizedName()); diff --git a/com/hbm/saveddata/SatelliteSaveStructure.java b/com/hbm/saveddata/SatelliteSaveStructure.java index 9d2475b36..b475aa4e2 100644 --- a/com/hbm/saveddata/SatelliteSaveStructure.java +++ b/com/hbm/saveddata/SatelliteSaveStructure.java @@ -12,7 +12,19 @@ public class SatelliteSaveStructure { public SatelliteType satelliteType; enum SatelliteType { - MAPPER, RADAR, SCANNER, RELAY, LASER; + + //Prints map remotely + MAPPER, + //Displays entities + RADAR, + //Prints map, ores only + SCANNER, + //Does nothing + RELAY, + //Death ray + LASER, + //Allows use of AMS + RESONATOR; public static SatelliteType getEnum(int i) { if(i < SatelliteType.values().length)