jei compatibility readded

- update to Forge 1.18-38.0.14
cech12 · Dec 5, 2021 · a46f176 · a46f176
1 parent 4dc8668
commit a46f176
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
+## [1.18-1.0.1.2] - 2021-12-05
+### Added
+- jei compatibility readded
+
+### Changed
+- update to Forge 1.18-38.0.14
+
 ## [1.18-1.0.1.1] - 2021-12-04
 ### Changed
 - port to Forge 1.18-38.0.6

diff --git a/build.gradle b/build.gradle
@@ -114,11 +114,10 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
 
-    // TODO
     // compile against the JEI API but do not include it at runtime
-    //compileOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
     // at runtime, use the full JEI jar
-    //runtimeOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
+    runtimeOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..

diff --git a/gradle.properties b/gradle.properties
@@ -4,16 +4,12 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mod_id=solarcooker
-mod_version=1.0.1.1
+mod_version=1.0.1.2
 minecraft_version=1.18
-forge_version=38.0.6
+forge_version=38.0.14
 
-# TODO
 # jei
-#jei_version=1.17.1:8.0.0.12
-
-# mcjunitlib
-# mcjunitlib_version=1.4.3-1.16.5
+jei_version=1.18:9.0.0.40
 
 #Curseforge
 curseforge_id=436874

diff --git a/src/main/java/cech12/solarcooker/jei/SolarCookerJEIPlugin.java b/src/main/java/cech12/solarcooker/jei/SolarCookerJEIPlugin.java
@@ -1,5 +1,5 @@
 package cech12.solarcooker.jei;
-/*
+
 import cech12.solarcooker.SolarCookerMod;
 import cech12.solarcooker.api.block.SolarCookerBlocks;
 import cech12.solarcooker.api.crafting.RecipeTypes;
@@ -58,4 +58,3 @@ public void registerRecipeCatalysts(@Nonnull IRecipeCatalystRegistration registr
     }
 
 }
- */
diff --git a/src/main/java/cech12/solarcooker/jei/SolarCookingCategory.java b/src/main/java/cech12/solarcooker/jei/SolarCookingCategory.java
@@ -1,5 +1,5 @@
 package cech12.solarcooker.jei;
-/*
+
 import cech12.solarcooker.api.block.SolarCookerBlocks;
 import cech12.solarcooker.api.crafting.RecipeTypes;
 import cech12.solarcooker.config.ServerConfig;
@@ -28,4 +28,3 @@ public Class<? extends SolarCookingRecipe> getRecipeClass() {
         return SolarCookingRecipe.class;
     }
 }
- */
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -15,7 +15,7 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
     modId="forge"
     mandatory=true
-    versionRange="[38.0.6,)"
+    versionRange="[38.0.14,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]
@@ -27,6 +27,6 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
    modId="jei"
    mandatory=false
-   versionRange="[8.0.0.12,)"
+   versionRange="[9.0.0.40,)"
    ordering="NONE"
    side="BOTH"