mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-12-15 12:40:30 +00:00
Bump Forge and prepare for a release
I've been shown up[1]. Unacceptable! [1]: https://twitter.com/SangarWasTaken/status/1423676992336060417
This commit is contained in:
parent
bb1183d274
commit
bb1ebaee4f
@ -7,7 +7,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
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
|
check.dependsOn checkRelease
|
||||||
|
|
||||||
|
def isStable = false
|
||||||
|
|
||||||
curseforge {
|
curseforge {
|
||||||
apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
|
apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
|
||||||
project {
|
project {
|
||||||
id = '282001'
|
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})."
|
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 {
|
relations {
|
||||||
@ -510,6 +512,7 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
|
|||||||
projectId = 'gu7yAYhd'
|
projectId = 'gu7yAYhd'
|
||||||
versionNumber = "${project.mc_version}-${project.mod_version}"
|
versionNumber = "${project.mc_version}-${project.mod_version}"
|
||||||
uploadFile = jar
|
uploadFile = jar
|
||||||
|
versionType = isStable ? 'RELEASE' : 'ALPHA'
|
||||||
addGameVersion(project.mc_version)
|
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})."
|
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')
|
addLoader('forge')
|
||||||
@ -586,7 +589,7 @@ githubRelease {
|
|||||||
.takeWhile { it != 'Type "help changelog" to see the full version history.' }
|
.takeWhile { it != 'Type "help changelog" to see the full version history.' }
|
||||||
.join("\n").trim()
|
.join("\n").trim()
|
||||||
}))
|
}))
|
||||||
prerelease false
|
prerelease isStable
|
||||||
}
|
}
|
||||||
|
|
||||||
def uploadTasks = ["publish", "curseforge", "publishModrinth", "githubRelease"]
|
def uploadTasks = ["publish", "curseforge", "publishModrinth", "githubRelease"]
|
||||||
|
@ -3,5 +3,5 @@ mod_version=1.98.1
|
|||||||
|
|
||||||
# Minecraft properties (update mods.toml when changing)
|
# Minecraft properties (update mods.toml when changing)
|
||||||
mc_version=1.17.1
|
mc_version=1.17.1
|
||||||
forge_version=37.0.19
|
forge_version=37.0.25
|
||||||
# NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING
|
# NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING
|
||||||
|
@ -109,7 +109,7 @@ public class TileComputer extends TileComputerBase
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
peripheral = CapabilityUtil.invalidate( peripheral );
|
peripheral = CapabilityUtil.invalidate( peripheral );
|
||||||
|
@ -88,7 +88,7 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
itemHandlerCap = CapabilityUtil.invalidate( itemHandlerCap );
|
itemHandlerCap = CapabilityUtil.invalidate( itemHandlerCap );
|
||||||
|
@ -158,7 +158,7 @@ public class TileCable extends TileGeneric
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
elementCap = CapabilityUtil.invalidate( elementCap );
|
elementCap = CapabilityUtil.invalidate( elementCap );
|
||||||
|
@ -146,7 +146,7 @@ public class TileWiredModemFull extends TileGeneric
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
elementCap = CapabilityUtil.invalidate( elementCap );
|
elementCap = CapabilityUtil.invalidate( elementCap );
|
||||||
|
@ -188,7 +188,7 @@ public class TileMonitor extends TileGeneric
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
peripheralCap = CapabilityUtil.invalidate( peripheralCap );
|
peripheralCap = CapabilityUtil.invalidate( peripheralCap );
|
||||||
|
@ -77,7 +77,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
itemHandlerCaps.invalidate();
|
itemHandlerCaps.invalidate();
|
||||||
|
@ -66,7 +66,7 @@ public class TileSpeaker extends TileGeneric
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
peripheralCap = CapabilityUtil.invalidate( peripheralCap );
|
peripheralCap = CapabilityUtil.invalidate( peripheralCap );
|
||||||
|
@ -147,7 +147,7 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidateCaps()
|
public void invalidateCaps()
|
||||||
{
|
{
|
||||||
super.invalidateCaps();
|
super.invalidateCaps();
|
||||||
itemHandlerCap = CapabilityUtil.invalidate( itemHandlerCap );
|
itemHandlerCap = CapabilityUtil.invalidate( itemHandlerCap );
|
||||||
|
@ -20,6 +20,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
|
|||||||
[[dependencies.computercraft]]
|
[[dependencies.computercraft]]
|
||||||
modId="forge"
|
modId="forge"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
versionRange="[37.0.13,38)"
|
versionRange="[37.0.25,38)"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
side="BOTH"
|
side="BOTH"
|
||||||
|
Loading…
Reference in New Issue
Block a user