diff --git a/build.gradle b/build.gradle index fbfe1da1b7..1463198ddc 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'com.google.code.gson:gson:2.8.1' - classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.179' + classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.181' classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2' classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0' } @@ -409,7 +409,7 @@ curseforge { apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' project { id = '282001' - releaseType = 'release' + releaseType = '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 { @@ -487,7 +487,7 @@ githubRelease { .takeWhile { it != 'Type "help changelog" to see the full version history.' } .join("\n").trim() } - prerelease false + prerelease true } def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"] diff --git a/gradle.properties b/gradle.properties index 77974d7266..22dac54ed7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Mod properties -mod_version=1.90.0 +mod_version=1.90.1 # Minecraft properties (update mods.toml when changing) mc_version=1.16.1 -forge_version=32.0.63 +forge_version=32.0.69 mappings_version=20200707-1.16.1 diff --git a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java index 5cf2699c3e..d40956cf27 100644 --- a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java +++ b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java @@ -33,13 +33,13 @@ import net.minecraft.util.registry.Registry; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.event.LootTableLoadEvent; +import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.player.PlayerContainerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.server.FMLServerStartedEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.event.server.FMLServerStoppedEvent; import java.util.Arrays; @@ -139,9 +139,9 @@ public static void onContainerOpen( PlayerContainerEvent.Open event ) } @SubscribeEvent - public static void onServerStarting( FMLServerStartingEvent event ) + public static void onRegisterCommand( RegisterCommandsEvent event ) { - CommandComputerCraft.register( event.getCommandDispatcher() ); + CommandComputerCraft.register( event.getDispatcher() ); } @SubscribeEvent diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7c0c1635c3..cf05511a0c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -19,6 +19,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a [[dependencies.computercraft]] modId="forge" mandatory=true - versionRange="[32.0.23,33)" + versionRange="[32.0.69,33)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt index e12e9ebb73..cce69b46af 100644 --- a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt +++ b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt @@ -1,3 +1,7 @@ +# New features in CC: Tweaked 1.90.1 + +* Update to Forge 32.0.69 + # New features in CC: Tweaked 1.90.0 * Add cc.image.nft module, for working with nft files. (JakobDev) diff --git a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt index b306fc690b..101e226a5b 100644 --- a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt +++ b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt @@ -1,18 +1,5 @@ -New features in CC: Tweaked 1.90.0 +New features in CC: Tweaked 1.90.1 -* Add cc.image.nft module, for working with nft files. (JakobDev) -* [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. -* Add configuration to control the sizes of monitors and terminals. -* Add configuration to control maximum render distance of monitors. -* Allow getting "detailed" information about an item, using `turtle.getItemDetail(slot, true)`. This will contain the same information that the generic peripheral supplies. - -And several bug fixes: -* Add back config for allowing interacting with command computers. -* Fix write method missing from printers. -* Fix dupe bug when killing an entity with a turtle. -* Correctly supply port in the Host header (neumond). -* Fix `turtle.craft` failing when missing an argument. -* Fix deadlock when mistakenly "watching" an unloaded chunk. -* Fix full path of files being leaked in some errors. +* Update to Forge 32.0.69 Type "help changelog" to see the full version history.