From 6a02dd10ee6dbc4c4f711bf6307c372983822a54 Mon Sep 17 00:00:00 2001 From: bl4ckscor3 Date: Mon, 11 Feb 2019 22:34:36 +0100 Subject: [PATCH] version push and fix 1.10.2 not building --- .../securitycraft/SecurityCraft.java | 16 +++++-- .../securitycraft/SecurityCraft.java | 4 +- .../securitycraft/SecurityCraft.java | 4 +- .../securitycraft/SecurityCraft.java | 4 +- .../securitycraft/SecurityCraft.java | 4 +- .../securitycraft/SecurityCraft.java | 4 +- .../securitycraft/SecurityCraft.java | 4 +- Changelog v1.8.x.md | 3 +- Updates/1.10.2.json | 8 ++-- Updates/1.11.2.json | 8 ++-- Updates/1.12.2.json | 8 ++-- Updates/1.7.10.json | 8 ++-- Updates/1.8.8.json | 8 ++-- Updates/1.8.9.json | 8 ++-- Updates/1.8.json | 8 ++-- Updates/1.9.4.json | 8 ++-- Updates/Forge.json | 48 +++++++++---------- Updates/Geffy.json | 2 +- 18 files changed, 83 insertions(+), 74 deletions(-) diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index 31274590f8..088c525300 100644 --- a/1.10.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.10.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -49,8 +49,8 @@ public class SecurityCraft { public static boolean debug; public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.10.2! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.10.2! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:Forge@[12.18.3.2185,)"; protected static final String UPDATEJSONURL = "https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") @@ -75,9 +75,17 @@ public void write(PacketBuffer buf, NBTTagCompound value) buf.writeCompoundTag(value); } @Override - public NBTTagCompound read(PacketBuffer buf) throws IOException + public NBTTagCompound read(PacketBuffer buf) { - return buf.readCompoundTag(); + try + { + return buf.readCompoundTag(); + } + catch(IOException e) + { + e.printStackTrace(); + return new NBTTagCompound(); + } } @Override public DataParameter createKey(int id) diff --git a/1.11.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.11.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index 7b4df11b89..da512a9533 100644 --- a/1.11.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.11.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -47,8 +47,8 @@ public class SecurityCraft { public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.11.2! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.11.2! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:forge@[13.20.1.2386,)"; protected static final String UPDATEJSONURL = "https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") diff --git a/1.12.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.12.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index 93b96fc977..eb35188157 100644 --- a/1.12.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.12.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -42,8 +42,8 @@ public class SecurityCraft { public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.12.2! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.12.2! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:forge@[14.23.3.2694,)"; protected static final String UPDATEJSONURL = "https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") diff --git a/1.7.10/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.7.10/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index 6219458c8d..fee762bd60 100644 --- a/1.7.10/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.7.10/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -49,8 +49,8 @@ public class SecurityCraft public static boolean debug; public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.7.10! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.7.10! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:Forge@[10.13.4.1558,);after:LookingGlass@[0.2.0.01,);"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") public static ServerProxy serverProxy; diff --git a/1.8.9/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.8.9/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index fa7114c760..b64a6e227e 100644 --- a/1.8.9/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.8.9/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -41,8 +41,8 @@ public class SecurityCraft { public static boolean debuggingMode; public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.8.8/9! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.8.8/9! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:Forge@[11.15.0.1655,)"; //not latest recommended, because this version is supposed to work on both 1.8.8 and 1.8.9 protected static final String UPDATEJSONURL = "https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") diff --git a/1.8/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.8/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index 5a1c487688..13b377adc2 100644 --- a/1.8/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.8/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -41,8 +41,8 @@ public class SecurityCraft { public static boolean debug; public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.8! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.8! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:Forge@[11.14.4.1563,)"; protected static final String UPDATEJSONURL = "https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") diff --git a/1.9.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.9.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index 7551722468..ef4f39488e 100644 --- a/1.9.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.9.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -49,8 +49,8 @@ public class SecurityCraft { public static boolean debug; public static final String MODID = "securitycraft"; private static final String MOTU = "Finally! Cameras!"; - //********************************* This is v1.8.10 for MC 1.9.4! - protected static final String VERSION = "v1.8.10"; + //********************************* This is v1.8.11 for MC 1.9.4! + protected static final String VERSION = "v1.8.11"; protected static final String DEPENDENCIES = "required-after:Forge@[12.17.0.2051,)"; protected static final String UPDATEJSONURL = "https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"; @SidedProxy(clientSide = "net.geforcemods.securitycraft.network.ClientProxy", serverSide = "net.geforcemods.securitycraft.network.ServerProxy") diff --git a/Changelog v1.8.x.md b/Changelog v1.8.x.md index 6385a97dc1..105d3c1f4b 100644 --- a/Changelog v1.8.x.md +++ b/Changelog v1.8.x.md @@ -3,7 +3,8 @@ - New: Reinforced Gravel - New: Reinforced Sand - New: Sentry - - This feature was designed by Henzoid, who won our christmas giveaway! If you want to get notified of future giveaways, join our Discord server: https://discord.gg/U8DvBAW + - This feature was designed by Henzoid, who won our New Year's Eve giveaway! If you want to get notified of future giveaways, join our Discord server: https://discord.gg/U8DvBAW + - If you want to completely design a feature of your choice, consider becoming a patron! https://www.patreon.com/Geforce - New: The SC Manual now shows texts, that is too long to properly display, on multiple subpages - Change: Using the left and right arrow keys in the SC Manual will now change subpages - Change: The viewing range of cameras placed on the ceiling has been increased drastically diff --git a/Updates/1.10.2.json b/Updates/1.10.2.json index 21d008fa1f..7d7aae3672 100644 --- a/Updates/1.10.2.json +++ b/Updates/1.10.2.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642193/download", - "fileName": "[1.10.2] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672160/download", + "fileName": "[1.10.2] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/1.11.2.json b/Updates/1.11.2.json index 064f0386db..07787c7877 100644 --- a/Updates/1.11.2.json +++ b/Updates/1.11.2.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642190/download", - "fileName": "[1.11.2] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672161/download", + "fileName": "[1.11.2] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/1.12.2.json b/Updates/1.12.2.json index f0e52908eb..65a3fff367 100644 --- a/Updates/1.12.2.json +++ b/Updates/1.12.2.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642191/download", - "fileName": "[1.12.2] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672162/download", + "fileName": "[1.12.2] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/1.7.10.json b/Updates/1.7.10.json index 80b4c14791..3705f48b36 100644 --- a/Updates/1.7.10.json +++ b/Updates/1.7.10.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642186/download", - "fileName": "[1.7.10] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672165/download", + "fileName": "[1.7.10] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/1.8.8.json b/Updates/1.8.8.json index 46f62a1f62..37d2384276 100644 --- a/Updates/1.8.8.json +++ b/Updates/1.8.8.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642187/download", - "fileName": "[1.8.8_.9] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672158/download", + "fileName": "[1.8.8_.9] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/1.8.9.json b/Updates/1.8.9.json index 1254f060c8..ab5d9e207f 100644 --- a/Updates/1.8.9.json +++ b/Updates/1.8.9.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10.1", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642187/download", - "fileName": "[1.8.8_.9] SecurityCraft v1.8.10.1", - "changelog": "Some fixes." + "version": "v1.8.11.1", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672158/download", + "fileName": "[1.8.8_.9] SecurityCraft v1.8.11.1", + "changelog": "Sentries!" } diff --git a/Updates/1.8.json b/Updates/1.8.json index e07d66e6e7..cb055db22c 100644 --- a/Updates/1.8.json +++ b/Updates/1.8.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642192/download", - "fileName": "[1.8] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672157/download", + "fileName": "[1.8] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/1.9.4.json b/Updates/1.9.4.json index ffb3430faa..19eeed4ee4 100644 --- a/Updates/1.9.4.json +++ b/Updates/1.9.4.json @@ -1,6 +1,6 @@ { - "version": "v1.8.10", - "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2642188/download", - "fileName": "[1.9.4] SecurityCraft v1.8.10", - "changelog": "Some fixes." + "version": "v1.8.11", + "downloadURL": "https://minecraft.curseforge.com/projects/security-craft/files/2672159/download", + "fileName": "[1.9.4] SecurityCraft v1.8.11", + "changelog": "Sentries!" } diff --git a/Updates/Forge.json b/Updates/Forge.json index 9ed663391c..7f52095070 100644 --- a/Updates/Forge.json +++ b/Updates/Forge.json @@ -1,47 +1,47 @@ { "homepage": "https://minecraft.curseforge.com/projects/security-craft/", "promos": { - "1.7.10-latest": "v1.8.10", - "1.7.10-recommended": "v1.8.10", - "1.8-latest": "v1.8.10", - "1.8-recommended": "v1.8.10", - "1.8.8-latest": "v1.8.10", - "1.8.8-recommended": "v1.8.10", - "1.8.9-latest": "v1.8.10", - "1.8.9-recommended": "v1.8.10", - "1.9.4-latest": "v1.8.10", - "1.9.4-recommended": "v1.8.10", - "1.10.2-latest": "v1.8.10", - "1.10.2-recommended": "v1.8.10", - "1.11.2-latest": "v1.8.10", - "1.11.2-recommended": "v1.8.10", + "1.7.10-latest": "v1.8.11", + "1.7.10-recommended": "v1.8.11", + "1.8-latest": "v1.8.11", + "1.8-recommended": "v1.8.11", + "1.8.8-latest": "v1.8.11", + "1.8.8-recommended": "v1.8.11", + "1.8.9-latest": "v1.8.11", + "1.8.9-recommended": "v1.8.11", + "1.9.4-latest": "v1.8.11", + "1.9.4-recommended": "v1.8.11", + "1.10.2-latest": "v1.8.11", + "1.10.2-recommended": "v1.8.11", + "1.11.2-latest": "v1.8.11", + "1.11.2-recommended": "v1.8.11", "1.12-latest": "v1.8.8.1", "1.12-recommended": "v1.8.8.1", "1.12.1-latest": "v1.8.8.1", "1.12.1-recommended": "v1.8.8.1", - "1.12.2-latest": "v1.8.10", - "1.12.2-recommended": "v1.8.10" + "1.12.2-latest": "v1.8.11", + "1.12.2-recommended": "v1.8.11" }, "1.7.10": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.8": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.8.8": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.8.9": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.9.4": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.10.2": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.11.2": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" }, "1.12": { "v1.8.8.1": "Several new reinforced blocks, dozens of fixes and some small new features." @@ -50,6 +50,6 @@ "v1.8.8.1": "Several new reinforced blocks, dozens of fixes and some small new features." }, "1.12.2": { - "v1.8.10": "Some fixes." + "v1.8.11": "Sentries!" } } \ No newline at end of file diff --git a/Updates/Geffy.json b/Updates/Geffy.json index a8db523bb9..fb4c0f5942 100644 --- a/Updates/Geffy.json +++ b/Updates/Geffy.json @@ -1 +1 @@ -{"version":"v1.8.10","betaVersion":"v1.7.4.1","betaVersionOf":"v1.7.4.1","betaDownloadLink":"hyperurl.co/SecurityCraft180Beta"} +{"version":"v1.8.11","betaVersion":"v1.7.4.1","betaVersionOf":"v1.7.4.1","betaDownloadLink":"hyperurl.co/SecurityCraft180Beta"}