From bb1ebaee4fe00c9c34c4890b043685467d8e2181 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Fri, 6 Aug 2021 17:25:34 +0100 Subject: [PATCH] Bump Forge and prepare for a release I've been shown up[1]. Unacceptable! [1]: https://twitter.com/SangarWasTaken/status/1423676992336060417 --- build.gradle | 9 ++++++--- gradle.properties | 2 +- .../shared/computer/blocks/TileComputer.java | 2 +- .../shared/peripheral/diskdrive/TileDiskDrive.java | 2 +- .../shared/peripheral/modem/wired/TileCable.java | 2 +- .../peripheral/modem/wired/TileWiredModemFull.java | 2 +- .../shared/peripheral/monitor/TileMonitor.java | 2 +- .../shared/peripheral/printer/TilePrinter.java | 2 +- .../shared/peripheral/speaker/TileSpeaker.java | 2 +- .../computercraft/shared/turtle/blocks/TileTurtle.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 11 files changed, 16 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 433703457..939844e88 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.17' + classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.18' } } @@ -485,11 +485,13 @@ task checkRelease { } check.dependsOn checkRelease +def isStable = false + curseforge { apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' project { id = '282001' - releaseType = 'release' + releaseType = isStable ? 'release' : 'alpha' changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})." relations { @@ -510,6 +512,7 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure { projectId = 'gu7yAYhd' versionNumber = "${project.mc_version}-${project.mod_version}" uploadFile = jar + versionType = isStable ? 'RELEASE' : 'ALPHA' addGameVersion(project.mc_version) changelog = "Release notes can be found on the [GitHub repository](https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})." addLoader('forge') @@ -586,7 +589,7 @@ githubRelease { .takeWhile { it != 'Type "help changelog" to see the full version history.' } .join("\n").trim() })) - prerelease false + prerelease isStable } def uploadTasks = ["publish", "curseforge", "publishModrinth", "githubRelease"] diff --git a/gradle.properties b/gradle.properties index b5ad63676..fd6856850 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ mod_version=1.98.1 # Minecraft properties (update mods.toml when changing) mc_version=1.17.1 -forge_version=37.0.19 +forge_version=37.0.25 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java index 843b67556..842c5d80a 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java @@ -109,7 +109,7 @@ public class TileComputer extends TileComputerBase } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); peripheral = CapabilityUtil.invalidate( peripheral ); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java index 0bf06a315..cb9e1b061 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java @@ -88,7 +88,7 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); itemHandlerCap = CapabilityUtil.invalidate( itemHandlerCap ); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java index 0897d340f..8eea53fb6 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java @@ -158,7 +158,7 @@ public class TileCable extends TileGeneric } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); elementCap = CapabilityUtil.invalidate( elementCap ); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java index 9d60f9d92..82eab1d71 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java @@ -146,7 +146,7 @@ public class TileWiredModemFull extends TileGeneric } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); elementCap = CapabilityUtil.invalidate( elementCap ); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java index 4c13ec2a8..87bd30f96 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java @@ -188,7 +188,7 @@ public class TileMonitor extends TileGeneric } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); peripheralCap = CapabilityUtil.invalidate( peripheralCap ); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java index 20a15413f..f4716ef57 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java @@ -77,7 +77,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); itemHandlerCaps.invalidate(); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java b/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java index 4f1681db1..df3a6d33a 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java @@ -66,7 +66,7 @@ public class TileSpeaker extends TileGeneric } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); peripheralCap = CapabilityUtil.invalidate( peripheralCap ); diff --git a/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java b/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java index e93557bba..5b4f39b0e 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java +++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java @@ -147,7 +147,7 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default } @Override - protected void invalidateCaps() + public void invalidateCaps() { super.invalidateCaps(); itemHandlerCap = CapabilityUtil.invalidate( itemHandlerCap ); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index cf6e8a0b0..5c85a97e8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -20,6 +20,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a [[dependencies.computercraft]] modId="forge" mandatory=true - versionRange="[37.0.13,38)" + versionRange="[37.0.25,38)" ordering="NONE" side="BOTH"