From 1b4ebd3d2065c7591b4b5a5b09db87f8acc6d2ec Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Fri, 25 Sep 2020 20:31:56 +0200
Subject: [PATCH] Port to 1.16.3.

---
 CHANGELOG.md                          |  1 +
 build.gradle                          | 13 +++++++++---
 src/main/resources/META-INF/mods.toml | 30 +++++++++++++--------------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f28eae3ee..b75b1f874 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Refined Storage Changelog
 
 ### 1.9.6
+- Port to Minecraft 1.16.3 (raoulvdberge)
 - Added colored block variants (Darkere)
 - Added client config option to remember the Grid search query (raoulvdberge)
 - Fixed Portable Grid losing enchantments when placing and breaking (raoulvdberge)
diff --git a/build.gradle b/build.gradle
index fab740e53..fc716d94e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,10 @@ repositories {
     maven {
         url "https://minecraft.curseforge.com/api/maven/"
     }
+    // TODO temporary for JEI - https://github.com/mezz/JustEnoughItems/issues/2095
+    maven {
+        url 'https://maven.latmod.com/'
+    }
 }
 
 apply plugin: 'net.minecraftforge.gradle'
@@ -98,14 +102,17 @@ processResources {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.16.2-33.0.37'
+    minecraft 'net.minecraftforge:forge:1.16.3-34.1.0'
 
-    compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.3.2.25:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.3.2.25")
+    compileOnly fg.deobf("mezz.jei:jei-1.16.3:7.3.2.34:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.3:7.3.2.34")
 
     compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.16.2'
 
     runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.16.2:12.1.0')
+
+    // TODO temporary for JEI - https://github.com/mezz/JustEnoughItems/issues/2095
+    compile fg.deobf('com.feed_the_beast.mods:ftb-gui-library:1.0.0.18')
 }
 
 jar {
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 74fe97460..811232a90 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,6 +1,6 @@
-modLoader="javafml"
-loaderVersion="[33,)"
-issueTrackerURL="https://github.com/refinedmods/refinedstorage"
+modLoader = "javafml"
+loaderVersion = "[34,)"
+issueTrackerURL = "https://github.com/refinedmods/refinedstorage"
 license="MIT"
 [[mods]]
 modId="refinedstorage"
@@ -9,18 +9,18 @@ displayName="Refined Storage"
 updateJSONURL="https://refinedmods.com/refined-storage/update.json"
 displayURL="https://refinedmods.com/refined-storage"
 logoFile="logo.png"
-authors="Refined Mods"
-description='''
+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="[33.0.20,)" #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"
+# 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 = "[34.1.0,)" #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"