Skip to content

Commit a1dcd59

Browse files
committed
Update to latest Forge
Fixes #498
1 parent 2a17585 commit a1dcd59

File tree

6 files changed

+15
-24
lines changed

6 files changed

+15
-24
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
dependencies {
1111
classpath 'com.google.code.gson:gson:2.8.1'
12-
classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.179'
12+
classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.181'
1313
classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
1414
classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
1515
}
@@ -409,7 +409,7 @@ curseforge {
409409
apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
410410
project {
411411
id = '282001'
412-
releaseType = 'release'
412+
releaseType = 'alpha'
413413
changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
414414

415415
relations {
@@ -487,7 +487,7 @@ githubRelease {
487487
.takeWhile { it != 'Type "help changelog" to see the full version history.' }
488488
.join("\n").trim()
489489
}
490-
prerelease false
490+
prerelease true
491491
}
492492

493493
def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Mod properties
2-
mod_version=1.90.0
2+
mod_version=1.90.1
33

44
# Minecraft properties (update mods.toml when changing)
55
mc_version=1.16.1
6-
forge_version=32.0.63
6+
forge_version=32.0.69
77
mappings_version=20200707-1.16.1

src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
import net.minecraft.util.registry.Registry;
3434
import net.minecraftforge.common.capabilities.CapabilityManager;
3535
import net.minecraftforge.event.LootTableLoadEvent;
36+
import net.minecraftforge.event.RegisterCommandsEvent;
3637
import net.minecraftforge.event.TickEvent;
3738
import net.minecraftforge.event.entity.player.PlayerContainerEvent;
3839
import net.minecraftforge.eventbus.api.SubscribeEvent;
3940
import net.minecraftforge.fml.common.Mod;
4041
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
4142
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
42-
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
4343
import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
4444

4545
import java.util.Arrays;
@@ -139,9 +139,9 @@ public static void onContainerOpen( PlayerContainerEvent.Open event )
139139
}
140140

141141
@SubscribeEvent
142-
public static void onServerStarting( FMLServerStartingEvent event )
142+
public static void onRegisterCommand( RegisterCommandsEvent event )
143143
{
144-
CommandComputerCraft.register( event.getCommandDispatcher() );
144+
CommandComputerCraft.register( event.getDispatcher() );
145145
}
146146

147147
@SubscribeEvent

src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
1919
[[dependencies.computercraft]]
2020
modId="forge"
2121
mandatory=true
22-
versionRange="[32.0.23,33)"
22+
versionRange="[32.0.69,33)"
2323
ordering="NONE"
2424
side="BOTH"

src/main/resources/data/computercraft/lua/rom/help/changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# New features in CC: Tweaked 1.90.1
2+
3+
* Update to Forge 32.0.69
4+
15
# New features in CC: Tweaked 1.90.0
26

37
* Add cc.image.nft module, for working with nft files. (JakobDev)
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
New features in CC: Tweaked 1.90.0
1+
New features in CC: Tweaked 1.90.1
22

3-
* Add cc.image.nft module, for working with nft files. (JakobDev)
4-
* [experimental] Provide a generic peripheral for any tile entity without an existing one. We currently provide methods for working with inventories, fluid tanks and energy storage. This is disabled by default, and must be turned on in the config.
5-
* Add configuration to control the sizes of monitors and terminals.
6-
* Add configuration to control maximum render distance of monitors.
7-
* Allow getting "detailed" information about an item, using `turtle.getItemDetail(slot, true)`. This will contain the same information that the generic peripheral supplies.
8-
9-
And several bug fixes:
10-
* Add back config for allowing interacting with command computers.
11-
* Fix write method missing from printers.
12-
* Fix dupe bug when killing an entity with a turtle.
13-
* Correctly supply port in the Host header (neumond).
14-
* Fix `turtle.craft` failing when missing an argument.
15-
* Fix deadlock when mistakenly "watching" an unloaded chunk.
16-
* Fix full path of files being leaked in some errors.
3+
* Update to Forge 32.0.69
174

185
Type "help changelog" to see the full version history.

0 commit comments

Comments
 (0)