1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 20:20:30 +00:00

Update to latest Forge

Fixes #498
This commit is contained in:
SquidDev 2020-07-18 15:11:43 +01:00
parent 2a17585702
commit a1dcd59d95
6 changed files with 15 additions and 24 deletions

View File

@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.google.code.gson:gson:2.8.1' 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 'net.sf.proguard:proguard-gradle:6.1.0beta2'
classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0' classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
} }
@ -409,7 +409,7 @@ curseforge {
apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
project { project {
id = '282001' 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})." 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 {
@ -487,7 +487,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 true
} }
def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"] def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]

View File

@ -1,7 +1,7 @@
# Mod properties # Mod properties
mod_version=1.90.0 mod_version=1.90.1
# Minecraft properties (update mods.toml when changing) # Minecraft properties (update mods.toml when changing)
mc_version=1.16.1 mc_version=1.16.1
forge_version=32.0.63 forge_version=32.0.69
mappings_version=20200707-1.16.1 mappings_version=20200707-1.16.1

View File

@ -33,13 +33,13 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.LootTableLoadEvent;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.player.PlayerContainerEvent; import net.minecraftforge.event.entity.player.PlayerContainerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.server.FMLServerStartedEvent; import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppedEvent; import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
import java.util.Arrays; import java.util.Arrays;
@ -139,9 +139,9 @@ public final class ComputerCraftProxyCommon
} }
@SubscribeEvent @SubscribeEvent
public static void onServerStarting( FMLServerStartingEvent event ) public static void onRegisterCommand( RegisterCommandsEvent event )
{ {
CommandComputerCraft.register( event.getCommandDispatcher() ); CommandComputerCraft.register( event.getDispatcher() );
} }
@SubscribeEvent @SubscribeEvent

View File

@ -19,6 +19,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="[32.0.23,33)" versionRange="[32.0.69,33)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"

View File

@ -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 # New features in CC: Tweaked 1.90.0
* Add cc.image.nft module, for working with nft files. (JakobDev) * Add cc.image.nft module, for working with nft files. (JakobDev)

View File

@ -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) * Update to Forge 32.0.69
* [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.
Type "help changelog" to see the full version history. Type "help changelog" to see the full version history.