diff --git a/1.14.4/build.gradle b/1.14.4/build.gradle index a0a0476e3e..fd749530f7 100644 --- a/1.14.4/build.gradle +++ b/1.14.4/build.gradle @@ -18,7 +18,7 @@ archivesBaseName = 'securitycraft' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20190803-1.14.3' + mappings channel: 'snapshot', version: '20190805-1.14.3' runs { client = { @@ -55,12 +55,12 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.14.4-28.0.40' + minecraft 'net.minecraftforge:forge:1.14.4-28.0.45' compile fg.deobf (project.dependencies.create("mcp.mobius.waila:Hwyla:1.10.4-B65_1.14.2") { transitive = false }) - compile fg.deobf (project.dependencies.create("mcjty.theoneprobe:TheOneProbe-1.14:1.14-1.4.31-alpha-8") { + compile fg.deobf (project.dependencies.create("mcjty.theoneprobe:TheOneProbe-1.14:1.14-1.4.32-alpha-9") { transitive = false }) compileOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.8:api") @@ -71,9 +71,9 @@ jar { manifest { attributes(["Specification-Title": "SecurityCraft", "Specification-Vendor": "Geforce, bl4ckscor3", - "Specification-Version": "v1.8.12", + "Specification-Version": "v1.8.12.1", "Implementation-Title": "SecurityCraft", - "Implementation-Version": "v1.8.12", + "Implementation-Version": "v1.8.12.1", "Implementation-Vendor" :"Geforce, bl4ckscor3", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],) } diff --git a/1.14.4/src/main/java/net/geforcemods/securitycraft/SCEventHandler.java b/1.14.4/src/main/java/net/geforcemods/securitycraft/SCEventHandler.java index e4d681b971..75e5c0834b 100644 --- a/1.14.4/src/main/java/net/geforcemods/securitycraft/SCEventHandler.java +++ b/1.14.4/src/main/java/net/geforcemods/securitycraft/SCEventHandler.java @@ -65,6 +65,8 @@ import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.FillBucketEvent; import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; +import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; +import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock; import net.minecraftforge.event.world.BlockEvent; @@ -73,8 +75,6 @@ import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.fml.network.PacketDistributor; diff --git a/1.14.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/1.14.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java index c013d33268..5a7c11445e 100644 --- a/1.14.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java +++ b/1.14.4/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java @@ -48,8 +48,8 @@ @EventBusSubscriber(modid=SecurityCraft.MODID, bus=Bus.MOD) public class SecurityCraft { public static final String MODID = "securitycraft"; - //********************************* This is v1.8.12-beta2 for MC 1.14.2! - protected static final String VERSION = "v1.8.12-beta2"; + //********************************* This is v1.8.12.1 for MC 1.14.4! + protected static final String VERSION = "v1.8.12.1"; public static IProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), () -> () -> new ServerProxy()); public static SecurityCraft instance; public static final String PROTOCOL_VERSION = "1.0"; diff --git a/1.14.4/src/main/resources/META-INF/mods.toml b/1.14.4/src/main/resources/META-INF/mods.toml index c76c03a806..e8a4657f3f 100644 --- a/1.14.4/src/main/resources/META-INF/mods.toml +++ b/1.14.4/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" #mandatory -loaderVersion="[27,)" #mandatory +loaderVersion="[28,)" #mandatory issueTrackerURL="http://github.com/Geforce132/SecurityCraft/issues" displayURL="http://minecraft.curseforge.com/projects/security-craft" logoFile="scLogo.png" @@ -8,7 +8,7 @@ authors="Geforce132, bl4ckscor3" [[mods]] #mandatory modId="securitycraft" #mandatory -version="v1.8.12" #mandatory +version="v1.8.12.1" #mandatory displayName="SecurityCraft" #mandatory updateJSONURL="https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json" description=''' @@ -25,7 +25,7 @@ Message of the update: Finally! Cameras! [[dependencies.securitycraft]] modId="forge" mandatory=true - versionRange="[28.0.34,)" + versionRange="[28.0.45,)" ordering="NONE" side="BOTH" diff --git a/Changelog v1.8.x.md b/Changelog v1.8.x.md index 34a6d34c99..e0250f9d15 100644 --- a/Changelog v1.8.x.md +++ b/Changelog v1.8.x.md @@ -48,6 +48,7 @@ --------------------------Changelog for v1.8.12.1 of SecurityCraft-------------------------- - Fix: [1.8-1.8.9] Crash involving the Security Camera +- Fix: [1.14.4] Mod is not compatible with Forge 28.0.45+ --------------------------Changelog for v1.8.12 of SecurityCraft-------------------------- diff --git a/Updates/1.14.4.json b/Updates/1.14.4.json index 41921bcf1e..3d1e841bdf 100644 --- a/Updates/1.14.4.json +++ b/Updates/1.14.4.json @@ -1,6 +1,6 @@ { - "version": "v1.8.12", - "downloadURL": "https://www.curseforge.com/minecraft/mc-mods/security-craft/download/2754293", - "fileName": "[1.14.4] SecurityCraft v1.8.12", + "version": "v1.8.12.1", + "downloadURL": "https://www.curseforge.com/minecraft/mc-mods/security-craft/download/2755409", + "fileName": "[1.14.4] SecurityCraft v1.8.12.1", "changelog": "The One Probe integration!" } diff --git a/Updates/Forge.json b/Updates/Forge.json index 5d057df863..4edd71473e 100644 --- a/Updates/Forge.json +++ b/Updates/Forge.json @@ -25,8 +25,8 @@ "1.13.2-recommended": "v1.8.12", "1.14.3-latest": "v1.8.12-beta2", "1.14.3-recommended": "v1.8.12-beta2", - "1.14.4-latest": "v1.8.12", - "1.14.4-recommended": "v1.8.12" + "1.14.4-latest": "v1.8.12.1", + "1.14.4-recommended": "v1.8.12.1" }, "1.7.10": { "v1.8.12": "Fixes" @@ -65,6 +65,6 @@ "v1.8.12-beta2": "The One Probe integration!" }, "1.14.4": { - "v1.8.12": "The One Probe integration!" + "v1.8.12.1": "The One Probe integration!" } } \ No newline at end of file