From 4f83ba59e2ed5e334f00c93264fefc9c90073edf Mon Sep 17 00:00:00 2001
From: Boblet <hbmmods@gmail.com>
Date: Thu, 6 Aug 2020 16:43:53 +0200
Subject: [PATCH] Json parser: stalingrad edition

---
 .../missile/EntityMissileBaseAdvanced.java    | 18 +---
 .../com/hbm/inventory/AssemblerRecipes.java   | 97 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileBaseAdvanced.java b/src/main/java/com/hbm/entity/missile/EntityMissileBaseAdvanced.java
index 199f68891..d43763571 100644
--- a/src/main/java/com/hbm/entity/missile/EntityMissileBaseAdvanced.java
+++ b/src/main/java/com/hbm/entity/missile/EntityMissileBaseAdvanced.java
@@ -81,7 +81,6 @@ public abstract class EntityMissileBaseAdvanced extends Entity implements IChunk
         ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, false, true);
         ExplosionLarge.spawnShrapnelShower(worldObj, posX, posY, posZ, motionX, motionY, motionZ, 15, 0.075);
         ExplosionLarge.spawnMissileDebris(worldObj, posX, posY, posZ, motionX, motionY, motionZ, 0.25, getDebris(), getDebrisRareDrop());
-        TileEntityMachineRadar.allMissiles.remove(this);
     }
 
 	public EntityMissileBaseAdvanced(World world, float x, float y, float z, int a, int b) {
@@ -172,21 +171,7 @@ public abstract class EntityMissileBaseAdvanced extends Entity implements IChunk
 	}
 	
 	@Override
-    public void onUpdate()
-    {
-		//super.onUpdate();
-		
-		if(!worldObj.isRemote) {
-			TileEntityMachineRadar.allMissiles.remove(this);
-			TileEntityMachineRadar.allMissiles.add(this);
-		}
-		
-		//if(!worldObj.loadedEntityList.contains(this))
-		//	worldObj.loadedEntityList.add(this);
-		
-		//System.out.println(this.posX + " " + this.posY + " " + this.posZ);
-		
-		
+    public void onUpdate() {
 		
 		if(velocity < 1)
 			velocity = 1;
@@ -201,6 +186,7 @@ public abstract class EntityMissileBaseAdvanced extends Entity implements IChunk
         this.prevPosY = this.posY;
         this.prevPosZ = this.posZ;
 		
+        //TODO: instead of crappy skipping, implement a hitscan
 		for(int i = 0; i < velocity; i++) {
 	        //this.posX += this.motionX;
 	        //this.posY += this.motionY;
diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java
index 05d828c9d..0c7bec209 100644
--- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java
+++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java
@@ -18,10 +18,16 @@ import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
+import com.hbm.interfaces.Untested;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.RecipesCommon.OreDictStack;
 import com.hbm.main.MainRegistry;
 
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraftforge.oredict.OreDictionary;
+
+@Untested
 public class AssemblerRecipes {
 
 	public static File config;
@@ -158,7 +164,96 @@ public class AssemblerRecipes {
 	}
 	
 	private static Object parseJsonArray(JsonArray array) {
-		return null;
+		
+		boolean dict = false;
+		String item = "";
+		int stacksize = 1;
+		int meta = 0;
+		
+		if(array.size() < 2)
+			return null;
+		
+		//is index 0 "item" or "dict"?
+		if(array.get(0).isJsonPrimitive()) {
+			
+			if(array.get(0).getAsString().equals("item")) {
+				dict = false;
+			} else if(array.get(0).getAsString().equals("dict")) {
+				dict = true;
+			} else {
+				
+				MainRegistry.logger.error("Error reading recipe, stack array does not have 'item' or 'dict' label!");
+				return null;
+			}
+			
+		} else {
+			
+			MainRegistry.logger.error("Error reading recipe, label is not a valid data type!");
+			return null;
+		}
+		
+		//is index 1 a string
+		if(array.get(1).isJsonPrimitive()) {
+			
+			item = array.get(1).getAsString();
+			
+		} else {
+			MainRegistry.logger.error("Error reading recipe, item string is not a valid data type!");
+			return null;
+		}
+		
+		//if index 3 exists, eval it as a stacksize
+		if(array.size() > 2 && array.get(2).isJsonPrimitive()) {
+			
+			if(array.get(2).getAsJsonPrimitive().isNumber()) {
+				
+				stacksize = Math.min(64, Math.max(1, array.get(2).getAsJsonPrimitive().getAsNumber().intValue()));
+				
+			} else {
+				
+				MainRegistry.logger.error("Error reading recipe, stack size is not a valid data type!");
+				return null;
+			}
+		}
+		
+		//ore dict implementation
+		if(dict) {
+			
+			if(OreDictionary.doesOreNameExist(item)) {
+				return new OreDictStack(item, stacksize);
+			} else {
+				
+				MainRegistry.logger.error("Error reading recipe, ore dict name does not exist!");
+				return null;
+			}
+		
+		//comparable stack
+		} else {
+			
+			//if index 4 exists, eval it as a meta
+			if(array.size() > 3 && array.get(3).isJsonPrimitive()) {
+				
+				if(array.get(3).getAsJsonPrimitive().isNumber()) {
+					
+					meta = Math.max(0, array.get(3).getAsJsonPrimitive().getAsNumber().intValue());
+					
+				} else {
+					
+					MainRegistry.logger.error("Error reading recipe, metadata is not a valid data type!");
+					return null;
+				}
+			}
+			
+			Item it = (Item)Item.itemRegistry.getObject(item);
+			
+			if(it == null) {
+				
+				MainRegistry.logger.error("Item could not be found!");
+				return null;
+			}
+			
+			return new ComparableStack(it, stacksize, meta);
+		}
 	}
 	
 	public static void saveJSONRecipes() {