From f8ba182f25fcb27fac39e7b8c69b9cafbb82bfb9 Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Wed, 2 May 2018 22:49:45 +0200
Subject: [PATCH] Satellite items

---
 assets/hbm/textures/items/missile_carrier.png | Bin 0 -> 308 bytes
 assets/hbm/textures/items/sat_chip.png        | Bin 0 -> 283 bytes
 assets/hbm/textures/items/sat_foeq.png        | Bin 0 -> 190 bytes
 assets/hbm/textures/items/sat_laser.png       | Bin 0 -> 176 bytes
 assets/hbm/textures/items/sat_mapper.png      | Bin 0 -> 194 bytes
 assets/hbm/textures/items/sat_radar.png       | Bin 0 -> 186 bytes
 assets/hbm/textures/items/sat_resonator.png   | Bin 0 -> 195 bytes
 assets/hbm/textures/items/sat_scanner.png     | Bin 0 -> 189 bytes
 com/hbm/items/ModItems.java                   |  19 +++++++++++++++++-
 com/hbm/saveddata/SatelliteSaveStructure.java |  14 ++++++++++++-
 10 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 assets/hbm/textures/items/missile_carrier.png
 create mode 100644 assets/hbm/textures/items/sat_chip.png
 create mode 100644 assets/hbm/textures/items/sat_foeq.png
 create mode 100644 assets/hbm/textures/items/sat_laser.png
 create mode 100644 assets/hbm/textures/items/sat_mapper.png
 create mode 100644 assets/hbm/textures/items/sat_radar.png
 create mode 100644 assets/hbm/textures/items/sat_resonator.png
 create mode 100644 assets/hbm/textures/items/sat_scanner.png

diff --git a/assets/hbm/textures/items/missile_carrier.png b/assets/hbm/textures/items/missile_carrier.png
new file mode 100644
index 0000000000000000000000000000000000000000..0afb1120a4e720ebb35fcf12b7e317d4ca675b01
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002%Nkl<ZIE}@UF;0a*6h)85<Zr;((!A#Ff{KKKT}&m_4+{|6Y5oS>1kK-u
zYak|uh#~wCLovm(Ge#M}%G=G{JNM?kd9VUiwKX2#Dn>L-V}0KP;GB!<uD23~Vc3!^
zr>m-|s(J6tdmpWG6C<js+LgXp0bm@*C>I@0S(esy9rHYMKA-mwv94<q5zDfSJkLqf
z6cI7!+~OP-D-=bsdfqhn3;y5W*B(5))x1pbO!{?qd_VE}0Z)4j9`9-{hs(F;aJoG*
z9VV77en3@CL=3?0F#r*<BuN&(F}fhCY9Rzd2()b*)qMi&l~r=Eywzd=0000<MNUMn
GLSTZo^nYLg

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_chip.png b/assets/hbm/textures/items/sat_chip.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0a9aa21cfcbe2093fad13650ca6d2d6e9ee1f6
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<X`f1aSXBO
zeLHa>*P#HBw)(b{ds5;y^6E@GD0fJWWBFT2pYr|<X=2w}xSutOpGiBdvwe-m_a)Ih
z#%Flf&;G&iYwG`k^FQm)J!Pnud1SG!-Gs;4J^te@C(Tg#XXWnY|0KOu?&8q$(6pW!
zROYyNp>JL)XEKl2bxj49vbxWCYu}!&dhe#_l3a7>jD?<gpJ(=6euHBr&1ZTv{12RA
zXwdMVkSZBg)@I^spMPOibO(oPfMWl(z4sCtu1UEDG<NLzzipT7d<T~s{(5@_+Vj<A
ete&p_%)oNA=mnepcN?JZ7(8A5T-G@yGywpDeQy>3

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_foeq.png b/assets/hbm/textures/items/sat_foeq.png
new file mode 100644
index 0000000000000000000000000000000000000000..abcc4dd48ac16e9e668ccdd6316e17548054b00a
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<d=H7IEGmC
zuAS(}cR+!IMg0H&^eVw6tTDc)RtBZr;rNjJ@@Ws#fep>8=6U7#1r<kWdG6Y2Dn9AP
z=6&_cC4?I~ZXB#XbFX_Pi=6SHxhYFJMVk-BGTF9n=j7V4CP<+1eDb^Sjy;?5=1Oi;
l+Frof?WxMLZ|>u-42Fx6j-5R8_ax8(44$rjF6*2UngCW!M&bYf

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_laser.png b/assets/hbm/textures/items/sat_laser.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb6209d7af724eb01325644c05db5ece02119e00
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<fnVOIEGmC
zuAS^HbU=Z}srUPS<GWuL^98(_GIwJ8v7WVmHEKS7Tg{-rJ27sKwGK<8yHwJQ)||tS
zSDHV0V6?r$C-l<kF5y37m!@xRUU`gxd-cur7uS_DOjx^QeV)3}*}0OJCb(G3pMTA;
XC%t?HWAX`3pp^`su6{1-oD!M<di_E5

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_mapper.png b/assets/hbm/textures/items/sat_mapper.png
new file mode 100644
index 0000000000000000000000000000000000000000..97b6d5310a64df2d5a8e35ae7a4a3066dd65d976
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<X3vSIEGmC
zuAO{as6m0lW#Rw-&)+T#Fc6bepXc>`&cWFy`dfux7)dy&GXCsaczqJ<g%cMJNSsbk
z6$%XfJ@a9@j={`?Ejf!^j3Trm6t7?1*31z8w);%-n**7Zj+~pTH?6YIE|=U;YfxNy
q&(BGJ()<<oj)q-Yxww7$HQt%Z`G+@W*R29Ng2B_(&t;ucLK6U6ZA#++

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_radar.png b/assets/hbm/textures/items/sat_radar.png
new file mode 100644
index 0000000000000000000000000000000000000000..51fd3ec64c329950033382bd1d2912793fb70dcd
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<QICnIEGmC
zuAS`7$DqjJeDL@Eotq_vQoR1A?7G-c+t`q1&t<+$FpWW7;1{2MtLnu&+Z8pI>*+gg
znmCKSbLVb$&4!(mIG-%)^2xcs=|M`IV;1)*pQ((O?!5JMU44&nK`!gGW6Q<7p4b(?
h-_r8t#jD4Gwn@f`N4EZ69}Bdc!PC{xWt~$(69A4&L{$I)

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_resonator.png b/assets/hbm/textures/items/sat_resonator.png
new file mode 100644
index 0000000000000000000000000000000000000000..52df31931c9c38ba0c657bb749c0abe32d0e9747
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<X3sRIEGmC
zuALOfcR+!|Ir01c&$o|9G<jWAeVwkkl_|}hDY9XySux8-W5rBw-}FP>Yj#dLaQE&Z
zo7pEqVsBaI9kpGrHM!u_M>gAr>J3UqozAIg9W2~@)8a^Mac9m2Gx6ISwS>+-V0aRK
r<&;=#dCtxYvgfZoVVS=^_z_!JP0Nb>nDzUCu3+$V^>bP0l+XkKS1n5k

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/sat_scanner.png b/assets/hbm/textures/items/sat_scanner.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c2fc42db9b0e7f4817de8629f7b1a2981f4e06c
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<d=B5IEGmC
zuASs4bU=ZF`QZQmmU~5{C0k@p`FdRIN&1%T_(pcC6NiIQNy45fHgnD?x10}hYTK~U
zWc{M&@8p&+6wM00vm_xYWAV;f(FX?N0)CGqFU&m6{gXH9bFTj_7E7~+JHLC}?w3bu
jNT+=|)FZGo<ZcXqk6Oy%v`l?jp#2P<u6{1-oD!M<z@0<!

literal 0
HcmV?d00001

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)