Rewrite/review of items management

src/main/java/fr/jackcartersmith/orbsat/OSItems.java

@@ -1,13 +1,16 @@
 package fr.jackcartersmith.orbsat;
 
+import fr.jackcartersmith.orbsat.item.DesignatorCircuitItem;
 import fr.jackcartersmith.orbsat.item.LaserDesignatorItem;
 import net.minecraft.item.Item;
 
 public class OSItems {
 	
-	public static Item laserDesignator_mkI;
-
+	public static Item laserDesignator;
+	public static Item designatorCircuit;
+	
 	public static void init(){
-		laserDesignator_mkI = new LaserDesignatorItem("laserDesignator_mki");
+		laserDesignator = new LaserDesignatorItem("laserDesignator");
+		designatorCircuit = new DesignatorCircuitItem("designatorCircuit");
 	}	
 }

src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java

@@ -112,7 +112,7 @@ public class OrbitalSatellite {
 		@Override
 		public ItemStack getIconItemStack()
 		{
-			return new ItemStack(OSItems.laserDesignator_mkI,1,0);
+			return new ItemStack(OSItems.designatorCircuit,1,0);
 		}
 	};
 }

src/main/java/fr/jackcartersmith/orbsat/item/DesignatorCircuitItem.java

@@ -0,0 +1,14 @@
+package fr.jackcartersmith.orbsat.item;
+
+import fr.jackcartersmith.orbsat.OSRefs;
+import fr.jackcartersmith.orbsat.OrbitalSatellite;
+import net.minecraft.item.Item;
+
+public class DesignatorCircuitItem extends Item{
+	public DesignatorCircuitItem(String unlocalizedName){
+		this.setUnlocalizedName(unlocalizedName);
+		this.setCreativeTab(OrbitalSatellite.creativeTab);
+		OrbitalSatellite.register(this, unlocalizedName);
+		OSRefs.registeredOSItems.add(this);
+	}
+}

src/main/java/fr/jackcartersmith/orbsat/item/LaserDesignatorItem.java

@@ -8,6 +8,7 @@ public class LaserDesignatorItem extends Item {
 	
 	public LaserDesignatorItem(String unlocalizedName){
 		this.setUnlocalizedName(unlocalizedName);
+		this.setMaxStackSize(1);
 		this.setCreativeTab(OrbitalSatellite.creativeTab);
 		OrbitalSatellite.register(this, unlocalizedName);
 		OSRefs.registeredOSItems.add(this);

src/main/java/fr/jackcartersmith/orbsat/item/SatelliteItem.java

@@ -0,0 +1,16 @@
+package fr.jackcartersmith.orbsat.item;
+
+import fr.jackcartersmith.orbsat.OSRefs;
+import fr.jackcartersmith.orbsat.OrbitalSatellite;
+import net.minecraft.item.Item;
+
+public class SatelliteItem extends Item{
+	public SatelliteItem(String unlocalizedName){
+		this.setUnlocalizedName(unlocalizedName);
+		this.setCreativeTab(OrbitalSatellite.creativeTab);
+		this.setHasSubtypes(true);
+		this.setMaxStackSize(1);
+		OrbitalSatellite.register(this, unlocalizedName);
+		OSRefs.registeredOSItems.add(this);
+	}
+}

src/main/resources/assets/orbsat/lang/en_US.lang

@@ -1,23 +1,5 @@
-#item.item_ob_lense.name=Laser Lens
-#item.item_ob_condenser.name=Photon Condenser
-#item.item_ob_capacitor.name=Photon Capacitor
-#item.item_ob_designatorLow.name=Low Power Designator
-#item.item_ob_designatorMed.name=Medium Power Designator
-#item.item_ob_designatorHigh.name=High Power Designator
-#item.item_ob_laserGunLow.name=Low Power Laser Gun
-#item.item_ob_laserGunMed.name=Medium Power Laser Gun
-#item.item_ob_laserGunHigh.name=High Power Laser Gun
-#tile.obOverrider.name=Laser Satelite Overrider
-#tile.obExtender.name=Extender
-#tile.obSatelite.name=Laser Satelite Prototype LX-I
-#tile.obDefender.name=Laser Strike Defender
-#tile.obAccelerator.name=Photon Accelerator
-#tile.obDecelerator.name=Photon Deccelerator
-#tile.obInverterAdv.name=Advanced Photonic Converter
-#tile.obInverter.name=Photonic Converter
-
 #CreativeTabs
-itemGroup.orbsat.name=Orbital Satellite
-
+itemGroup.orbsat=Orbital Satellite
 #Items
-item.laserDesignator_mki.name=Laser Designator MK-I
+item.laserDesignator.name=Targeting Satellite Computer
+item.designatorCircuit.name=Targeting Computer Circuit

src/main/resources/assets/orbsat/lang/fr_FR.lang

@@ -1,23 +1,5 @@
-#item.item_ob_lense.name=Lentille
-#item.item_ob_condenser.name=Condensateur Photonique
-#item.item_ob_capacitor.name=Capaciteur Photonique
-#item.item_ob_designatorLow.name=Designateur Faible Puissance
-#item.item_ob_designatorMed.name=Designateur Moyenne Puissance
-#item.item_ob_designatorHigh.name=Designateur Haute Puissance
-#item.item_ob_laserGunLow.name=Pointeur Laser Faible Puissance
-#item.item_ob_laserGunMed.name=Pointeur Laser Moyenne Puissance
-#item.item_ob_laserGunHigh.name=Pointeur Laser Haute Puissance
-#tile.obOverrider.name=Chargeur de Satellite Laser
-#tile.obExtender.name=Extendeur
-#tile.obSatelite.name=Prototype de Satellite Laser LX-I
-#tile.obDefender.name=Defenseur Laser
-#tile.obAccelerator.name=Accelerateur de photon
-#tile.obDecelerator.name=Decelerateur de photon
-#tile.obInverterAdv.name=Convertisseur photonique avancé
-#tile.obInverter.name=Convertisseur photonique
-
 #CreativeTabs
-itemGroup.orbsat.name=Satellite Orbital
-
+itemGroup.orbsat=Satellite Orbital
 #Items
-item.laserDesignator_mki.name=Pointeur Laser MK-I
+item.laserDesignator.name=Ordinateur de visée du satellite
+item.designatorCircuit.name=Circuit pour ordinateur de visée

src/main/resources/assets/orbsat/models/item/designatorCircuit.json

@@ -0,0 +1,6 @@
+{
+    "parent": "orbsat:item/flat",
+    "textures": {
+        "layer0": "orbsat:items/designatorCircuit"
+    }
+}

src/main/resources/assets/orbsat/models/item/flat.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "missingno"
+    }
+}

src/main/resources/assets/orbsat/models/item/laserDesignator.json

@@ -1,6 +1,6 @@
 {
 	"parent": "item/generated",
 	"textures": {
-		"layer0": "orbsat:items/laserDesignator_mki"
+		"layer0": "orbsat:items/laserDesignator"
 	}
 }

src/main/resources/assets/orbsat/sounds.json

@@ -2,61 +2,61 @@
   "defenderLock": {
     "category": "block",
     "sounds": [
-      "defenderLock"
+      "orbsat:defenderLock"
     ]
   },
   "start": {
     "category": "block",
     "sounds": [
-      "start"
+      "orbsat:start"
     ]
   },
   "middle": {
     "category": "block",
     "sounds": [
-      "middle"
+      "orbsat:middle"
     ]
   },
   "satelliteLaunch": {
     "category": "block",
     "sounds": [
-      "satelliteLaunch"
+      "orbsat:satelliteLaunch"
     ]
   },
   "explode": {
     "category": "block",
     "sounds": [
-      "explode"
+      "orbsat:explode"
     ]
   },
   "reentry": {
     "category": "block",
     "sounds": [
-      "reentry"
+      "orbsat:reentry"
     ]
   },
   "booming": {
     "category": "block",
     "sounds": [
-      "booming"
+      "orbsat:booming"
     ]
   },
   "digging": {
     "category": "block",
     "sounds": [
-      "digging"
+      "orbsat:digging"
     ]
   },
   "startCharging": {
     "category": "block",
     "sounds": [
-      "startCharging"
+      "orbsat:startCharging"
     ]
   },
   "helios": {
     "category": "block",
     "sounds": [
-      "helios"
+      "orbsat:helios"
     ]
   }
 }

src/main/resources/assets/orbsat/textures/items/designatorCircuit.png.mcmeta

@@ -0,0 +1,15 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 2 },
+      { "index": 1, "time": 2 },
+      { "index": 2, "time": 2 },
+      { "index": 3, "time": 2 },
+      { "index": 4, "time": 2 },
+      { "index": 5, "time": 2 },
+      { "index": 6, "time": 2 },
+      { "index": 7, "time": 2 }
+    ]
+  }
+}