Revert "Update to FG3"

This reverts commit 4e78539.

build.gradle

@@ -1,124 +1,74 @@
-import se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask
-
 buildscript {
 	repositories {
-		mavenLocal()
-		maven { url = "https://files.minecraftforge.net/maven" }
 		jcenter()
-		mavenCentral()
+		maven {
+			name = "forge"
+			url = "http://files.minecraftforge.net/maven"
+		}
 	}
 	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
 	}
 }
 
 plugins {
-	id "com.matthewprenger.cursegradle" version "1.2.0"
+	id "com.matthewprenger.cursegradle" version "1.0.9"
 	id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.64"
 }
-apply from: "buildtools/ColoredOutput.gradle"
-apply plugin: 'idea'
-apply plugin: "net.minecraftforge.gradle"
 
-//adds the build number to the end of the version string if on a build server
-String build_number = System.getenv().BUILD_NUMBER
-if (build_number == null) {
-	build_number = "9999"
-}
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply from: 'buildtools/ColoredOutput.gradle'
 
-String semver = "${version_major}.${version_minor}.${version_patch}"
-version = "${semver}.${build_number}"
+version = version_major + '.' + version_minor + '.' + version_patch
 group = "mezz.jei" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "jei_" + mcversion
 
-// java version
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
-compileJava {
-	sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
+if (System.getenv().BUILD_NUMBER != null) {//adds the build number to the end of the version string if on a build server
+	version += ".${System.getenv().BUILD_NUMBER}"
 }
 
-repositories {
-	maven { url 'https://repo1.maven.org/maven2' }
-}
+// java version
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
-sourceSets {
-	api {
-		java {
-			srcDirs = ["src/api/java"]
-		}
-	}
-	main {
-		java {
-			srcDirs = ["src/main/java"]
-		}
-		resources {
-			srcDirs = ["src/main/resources"]
-		}
-	}
-	test {
-		java {
-			srcDirs = ["src/test/java"]
-		}
-	}
+minecraft {
+	version = mcversion + "-" + forgeversion
+	runDir = "run"
+	replace '@VERSION@', project.version
+	mappings = mcp_mappings
 }
 
-configurations {
-	apiCompile.extendsFrom(compile)
+repositories {
+
 }
 
 dependencies {
-	minecraft([
-			group  : "${project.forgegroup}",
-			name   : "forge",
-			version: "${project.mcversion}-${project.forgeversion}"
-	])
-	implementation sourceSets.api.output
-	testImplementation sourceSets.api.output
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
-	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+	testCompile 'junit:junit:4.12'
 }
 
-minecraft {
-	mappings channel: "${project.mcp_channel}", version: "${project.mcp_version}"
+processResources {
+	// this will ensure that this task is redone when the versions change.
+	inputs.property "version", project.version
+	inputs.property "mcversion", project.minecraft.version
 
-	accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+	// replace stuff in mcmod.info, nothing else
+	from(sourceSets.main.resources.srcDirs) {
+		include 'mcmod.info'
 
-	runs {
-		client {
-			property 'forge.logging.console.level', 'debug'
-			workingDirectory project.file('run')
-			mods {
-				jei {
-					source sourceSets.main
-				}
-			}
-		}
-		server {
-			property 'forge.logging.console.level', 'debug'
-			workingDirectory project.file('run')
-			mods {
-				jei {
-					source sourceSets.main
-				}
-			}
-		}
-		data {
-			property 'forge.logging.console.level', 'debug'
-			workingDirectory project.file('run')
-			args '--mod', 'jei', '--all',
-					'--existing', '"' + file('src/main/resources/') + '"',
-					'--existing', '"' + file('src/generated/resources/') + '"',
-					'--output', '"' + file('src/generated/resources/') + '"'
-			mods {
-				jei {
-					source sourceSets.main
-				}
-			}
-		}
+		// replace version and mcversion
+		expand 'version': project.version, 'mcversion': project.minecraft.version
+	}
+
+	// copy everything else, that's not the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude 'mcmod.info'
 	}
+
+	// Move access transformers to META-INF
+	rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
-task makeChangelog(type: GitChangelogTask) {
+task makeChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
 	file = new File("changelog.html")
 	untaggedName = "Current release ${project.version}"
 	fromCommit = "2fe051cf727adce1be210a46f778aa8fe031331e"
@@ -148,22 +98,11 @@ allprojects {
 }
 
 jar {
-	from sourceSets.main.output.classesDirs
-	from sourceSets.api.output.classesDirs
-	from sourceSets.main.output.resourcesDir
-	from sourceSets.api.output.resourcesDir
-
 	manifest {
-		attributes([
-				"Specification-Title": "Just Enough Items",
-				"Specification-Vendor": "mezz",
-				"Specification-Version": "${semver}",
-				"Implementation-Title": project.name,
-				"Implementation-Version": "${project.version}",
-				"Implementation-Vendor" :"mezz",
-				"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-		])
+		attributes 'FMLAT': 'jei_at.cfg'
 	}
+	from sourceSets.main.output
+	from sourceSets.api.output
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
@@ -206,18 +145,3 @@ task("uploadJars", dependsOn: "build") {
 		}
 	}
 }
-
-idea {
-	module {
-		for (String excludeDirName in ["run", "out", "logs", "gradle"]) {
-			File excludeDir = new File(projectDir, excludeDirName)
-			excludeDirs.add(excludeDir)
-		}
-	}
-}
-
-test {
-	useJUnitPlatform()
-	include 'mezz/jei/**'
-	exclude 'mezz/jei/lib/**'
-}

gradle.properties

@@ -1,10 +1,6 @@
-org.gradle.daemon=false
-
 mcversion=1.12.2
-forgeversion=14.23.5.2854
-forgegroup=net.minecraftforge
-mcp_channel=stable
-mcp_version=nodoc_39-1.12
+forgeversion=14.23.5.2838
+mcp_mappings=stable_nodoc_39
 curse_project_id=238222
 
 version_major=4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 19 14:44:16 PDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+#Mon Jul 03 18:39:07 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
 }
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
@@ -154,19 +154,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -49,6 +49,7 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/resources/META-INF/accesstransformer.cfg → src/main/resources/jei_at.cfg

@@ -1,20 +1,20 @@
-#rendering
-public net.minecraft.client.renderer.RenderItem func_191965_a(Lnet/minecraft/client/renderer/block/model/IBakedModel;I)V # renderModel
-public net.minecraft.client.renderer.RenderItem func_191961_a(Lnet/minecraft/client/renderer/block/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V # renderModel
-
-#TextureMap
-protected net.minecraft.client.renderer.texture.TextureMap field_94252_e # mapUploadedSprites
-protected net.minecraft.client.renderer.texture.TextureMap field_94258_i # listAnimatedSprites
-protected net.minecraft.client.renderer.texture.TextureMap field_94249_f # missingImage
-protected net.minecraft.client.renderer.texture.TextureMap field_94254_c # basePath
-protected net.minecraft.client.renderer.texture.TextureMap field_110574_e # mapRegisteredSprites
-protected net.minecraft.client.renderer.texture.TextureMap func_110569_e()V # initMissingImage
-
-#GuiRecipeBook
-public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191904_o # width
-public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191905_p # height
-public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191903_n # xOffset
-public net.minecraft.client.gui.recipebook.GuiRecipeBook field_193018_j # recipeTabs
-
-#Ingredient
-public net.minecraft.item.crafting.Ingredient field_193371_b # matchingStacks
+#rendering
+public net.minecraft.client.renderer.RenderItem func_191965_a(Lnet/minecraft/client/renderer/block/model/IBakedModel;I)V # renderModel
+public net.minecraft.client.renderer.RenderItem func_191961_a(Lnet/minecraft/client/renderer/block/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V # renderModel
+
+#TextureMap
+protected net.minecraft.client.renderer.texture.TextureMap field_94252_e # mapUploadedSprites
+protected net.minecraft.client.renderer.texture.TextureMap field_94258_i # listAnimatedSprites
+protected net.minecraft.client.renderer.texture.TextureMap field_94249_f # missingImage
+protected net.minecraft.client.renderer.texture.TextureMap field_94254_c # basePath
+protected net.minecraft.client.renderer.texture.TextureMap field_110574_e # mapRegisteredSprites
+protected net.minecraft.client.renderer.texture.TextureMap func_110569_e()V # initMissingImage
+
+#GuiRecipeBook
+public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191904_o # width
+public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191905_p # height
+public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191903_n # xOffset
+public net.minecraft.client.gui.recipebook.GuiRecipeBook field_193018_j # recipeTabs
+
+#Ingredient
+public net.minecraft.item.crafting.Ingredient field_193371_b # matchingStacks