From f6ddf5c3d893174aabbc17f45b8dafd1f77950e4 Mon Sep 17 00:00:00 2001 From: Darkere Date: Thu, 16 Jul 2020 23:47:44 +0200 Subject: [PATCH] update patterndump command to work with new command event (#2621) * update patterndump command to work with new command event * update min required forge version * update changelog --- CHANGELOG.md | 2 ++ build.gradle | 2 +- .../refinedmods/refinedstorage/setup/ServerSetup.java | 8 ++++---- src/main/resources/META-INF/mods.toml | 11 +++++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef90c3f66..6da2b4eab 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # Refined Storage Changelog +### 1.9.2 +- Fixed crash with forge version 67 (Darkere) ### 1.9.1 - Fixed server crash (raoulvdberge) diff --git a/build.gradle b/build.gradle index f263a2cbc..ec9b9de0f 100755 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ processResources { } dependencies { - minecraft 'net.minecraftforge:forge:1.16.1-32.0.63' + minecraft 'net.minecraftforge:forge:1.16.1-32.0.67' compileOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.6:api") runtimeOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.6") diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java index 4ddd7da10..b4bbae66f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java @@ -2,15 +2,15 @@ package com.refinedmods.refinedstorage.setup; import com.refinedmods.refinedstorage.command.PatternDumpCommand; import net.minecraft.command.Commands; +import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; public class ServerSetup { @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent e) { - e.getCommandDispatcher().register( + public void onRegisterCommands(RegisterCommandsEvent e) { + e.getDispatcher().register( Commands.literal("refinedstorage") - .then(PatternDumpCommand.register(e.getCommandDispatcher())) + .then(PatternDumpCommand.register(e.getDispatcher())) ); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 710af6b75..2c01237fd 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -12,3 +12,14 @@ authors="Refined Mods" description=''' An elegant solution to your hoarding problem ''' +[[dependencies.refinedstorage]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="[32.0.67,)" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory + ordering="NONE" + # Side this dependency is applied on - BOTH, CLIENT or SERVER + side="BOTH" \ No newline at end of file