Fixed OSS constructing with quest 0 task 0 instead of -1

Fixed OSS not accepting piped items
Added better leniency to duplicate supporter entries
Added more WIP code to theme uncataloguing system

build.gradle

@@ -34,7 +34,7 @@ minecraft {
 }
 
 repositories {
-    mavenCentral()
+  mavenCentral()
 }
 
 dependencies {

gradle.properties

@@ -1,5 +1,5 @@
 modGroup = betterquesting
-modVersion = 3.5.320
+modVersion = 3.5.323
 modBaseName = BetterQuesting
 modBaseClass = BetterQuesting.java
 

src/main/java/betterquesting/api2/supporter/SupporterDB.java

@@ -1,6 +1,7 @@
 package betterquesting.api2.supporter;
 
 import betterquesting.api2.storage.INBTSaveLoad;
+import betterquesting.core.BetterQuesting;
 import net.minecraft.nbt.NBTTagCompound;
 
 import javax.annotation.Nonnull;
@@ -14,19 +15,20 @@ public class SupporterDB implements INBTSaveLoad<NBTTagCompound>
 
     private final TreeMap<UUID, SupporterEntry> mapDB = new TreeMap<>();
 
-    public synchronized SupporterEntry add(@Nonnull UUID uuid)
+    public synchronized SupporterEntry add(@Nonnull UUID playerID)
     {
         SupporterEntry entry = new SupporterEntry();
-        if(mapDB.putIfAbsent(uuid, entry) != null)
+        if(mapDB.putIfAbsent(playerID, entry) != null)
         {
-            throw new IllegalArgumentException("ID or value is already contained within database");
+            BetterQuesting.logger.warn("Tried to add duplicate supporter to DB: " + playerID.toString());
+            return mapDB.get(playerID);
         }
         return entry;
     }
 
-    public synchronized boolean removeID(@Nonnull UUID uuid)
+    public synchronized boolean removeID(@Nonnull UUID playerID)
     {
-        return mapDB.remove(uuid) != null;
+        return mapDB.remove(playerID) != null;
     }
 
     @Nullable

src/main/java/betterquesting/api2/supporter/theme_dlc/CatalogueEntry.java

@@ -1,9 +1,15 @@
 package betterquesting.api2.supporter.theme_dlc;
 
+import betterquesting.api.utils.JsonHelper;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import net.minecraft.util.ResourceLocation;
 
 import javax.annotation.Nonnull;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Future;
 
 public class CatalogueEntry
@@ -13,6 +19,9 @@ public class CatalogueEntry
     public final ResourceLocation themeID;
     public final String downloadLink;
 
+    public final List<String> reqMods = new ArrayList<>();
+    public final List<String> reqThemes = new ArrayList<>();
+
     private String token;
     private String service;
     private int subTier;
@@ -36,6 +45,30 @@ public CatalogueEntry setRequirement(@Nonnull String token, @Nonnull String serv
         return this;
     }
 
+    public CatalogueEntry(@Nonnull JsonObject json)
+    {
+        this.author = JsonHelper.GetString(json, "author", "Unknown");
+        this.name = JsonHelper.GetString(json, "themeName", "Untitled");
+        this.themeID = new ResourceLocation(JsonHelper.GetString(json, "themeID", "minecraft:untitled"));
+        this.downloadLink = JsonHelper.GetString(json, "themeID", "127.0.0.1");
+
+        reqMods.clear();
+        JsonArray aryMods = JsonHelper.GetArray(json, "reqMods");
+        for(JsonElement je : aryMods)
+        {
+            if(!je.isJsonPrimitive() || !je.getAsJsonPrimitive().isString()) continue;
+            reqMods.add(je.getAsString());
+        }
+
+        reqMods.clear();
+        JsonArray aryThms = JsonHelper.GetArray(json, "reqThemes");
+        for(JsonElement je : aryThms)
+        {
+            if(!je.isJsonPrimitive() || !je.getAsJsonPrimitive().isString()) continue;
+            reqThemes.add(je.getAsString());
+        }
+    }
+
     public Future<File> downloadTheme()
     {
         return null;

src/main/java/betterquesting/api2/supporter/theme_dlc/ThemeRepository.java

@@ -0,0 +1,37 @@
+package betterquesting.api2.supporter.theme_dlc;
+
+import betterquesting.api.utils.JsonHelper;
+import com.google.gson.JsonObject;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ThemeRepository
+{
+    private final String repoAddress;
+    public String repoName = "Unknown Theme Repository";
+
+    private final List<CatalogueEntry> entries = new ArrayList<>();
+
+    public ThemeRepository(@Nonnull String address)
+    {
+        repoAddress = address;
+    }
+
+    public String getAddress()
+    {
+        return this.repoAddress;
+    }
+
+    public List<CatalogueEntry> getEntries()
+    {
+        return Collections.unmodifiableList(entries);
+    }
+
+    public void loadRepository(@Nonnull JsonObject json)
+    {
+        repoName = JsonHelper.GetString(json, "repoName", "Unknown Repository");
+    }
+}

src/main/java/betterquesting/blocks/SSItemHandler.java

@@ -32,7 +32,7 @@ public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate
 		// Existing stack
 		ItemStack ts1 = getStackInSlot(slot);
 
-		if(!stack.isItemEqual(ts1))
+		if(!ts1.isEmpty() && !stack.isItemEqual(ts1))
 		{
 			return stack;
 		}

src/main/java/betterquesting/blocks/TileSubmitStation.java

@@ -44,9 +44,9 @@ public class TileSubmitStation extends TileEntity implements IFluidHandler, ISid
 	private final IFluidHandler fluidHandler;
 	private NonNullList<ItemStack> itemStack = NonNullList.withSize(2, ItemStack.EMPTY);
 	private boolean needsUpdate = false;
-	public UUID owner;
-	public int questID;
-	public int taskID;
+	public UUID owner = null;
+	public int questID = -1;
+	public int taskID = -1;
 
 	private DBEntry<IQuest> qCached;