Skip to content

Commit

Permalink
version push and fix 1.10.2 not building
Browse files Browse the repository at this point in the history
  • Loading branch information
@bl4ckscor3
bl4ckscor3 committed Feb 11, 2019
1 parent 7c90cb6 commit 6a02dd1
Show file tree
Hide file tree
Showing 18 changed files with 83 additions and 74 deletions.
16 changes: 12 additions & 4 deletions 1.10.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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<NBTTagCompound> createKey(int id)
Expand Down
4 changes: 2 additions & 2 deletions 1.11.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions 1.12.2/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions 1.7.10/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions 1.8.9/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions 1.8/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions 1.9.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion Changelog v1.8.x.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Updates/1.10.2.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.11.2.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.12.2.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.7.10.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.8.8.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.8.9.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.8.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
8 changes: 4 additions & 4 deletions Updates/1.9.4.json
View file
Original file line number Diff line number Diff line change
@@ -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!"
}
48 changes: 24 additions & 24 deletions Updates/Forge.json
View file
Original file line number Diff line number Diff line change
@@ -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."
Expand All @@ -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!"
}
}
2 changes: 1 addition & 1 deletion Updates/Geffy.json
View file
Original file line number Diff line number Diff line change
@@ -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"}

0 comments on commit 6a02dd1

Please sign in to comment.