Skip to content

Commit

Permalink
Update to ForgeGradle 2.0 and Forge 11.14.3.1559
Browse files Browse the repository at this point in the history
  • Loading branch information
mezz committed Nov 11, 2015
1 parent 6986a54 commit 64507ed
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 48 deletions.
41 changes: 21 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

.gradle
run/
JustEnoughItems.iml
JustEnoughItems.ipr
JustEnoughItems.iws
out/
.idea
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

.gradle
run/
JustEnoughItems.iml
JustEnoughItems.ipr
JustEnoughItems.iws
out/
.idea
build/*
43 changes: 17 additions & 26 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,45 +1,33 @@
buildscript {
repositories {
mavenCentral()
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
}
}

apply plugin: 'forge'
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.0"
version = version_major + '.' + version_minor + '.' + version_patch
group= "mezz.jei" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "jei"
archivesBaseName = "jei_" + mcversion

// java version
sourceCompatibility = 1.8
targetCompatibility = 1.8

minecraft {
version = "1.8-11.14.3.1502"
version = mcversion + "-" + forgeversion
runDir = "run"
mappings = 'snapshot_20141214'
mappings = "snapshot_nodoc_20151110"
}

dependencies {
// you may put jars on which you depend on in ./libs
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"

// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env

// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html

}

Expand All @@ -61,10 +49,13 @@ processResources
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}

// Move access transformers to META-INF
rename '(.+_at.cfg)', 'META-INF/$1'
}

jar {
manifest {
attributes 'FMLAT': 'jei_at.cfg'
}
manifest {
attributes 'FMLAT': 'jei_at.cfg'
}
}
5 changes: 5 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mcversion=1.8
forgeversion=11.14.3.1559
version_major=1
version_minor=0
version_patch=0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
2 changes: 1 addition & 1 deletion src/main/java/mezz/jei/util/Commands.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static void giveOneFromStack(@Nonnull ItemStack itemstack) {
*/
public static void giveStack(@Nonnull ItemStack itemStack, int amount) {
EntityPlayerSP sender = Minecraft.getMinecraft().thePlayer;
String senderName = sender.getName();
String senderName = sender.getCommandSenderName();

List<String> commandStrings = new ArrayList<String>();
commandStrings.add("/give");
Expand Down
File renamed without changes.

0 comments on commit 64507ed

Please sign in to comment.