Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to new forge, new ForgeGradle, and new mappings. #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to new forge, new ForgeGradle, and new mappings. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/bin/
/eclipse/
/.settings/
.project
.classpath
*.launch
13 changes: 8 additions & 5 deletions build/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
buildscript {
repositories {
mavenCentral()
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
Expand All @@ -11,11 +12,12 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
}
}

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

group = "codechicken" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "CodeChickenLib"
Expand All @@ -36,7 +38,8 @@ println config.minecraft_version + "-" + config.forge_version
// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
minecraft {
version = config.minecraft_version + "-" + config.forge_version
mappings = "snapshot_nodoc_20150404"
mappings = "snapshot_nodoc_20150918"
runDir = 'eclipse'
}

sourceSets {
Expand Down Expand Up @@ -68,7 +71,7 @@ jar {
manifest commonManifest
}

task sourceJar(type: Jar) {
task sourcesJar(type: Jar) {
from sourceSets.main.java
classifier = 'src'
}
Expand All @@ -81,7 +84,7 @@ task devJar(type: Jar) {

// Tell the artifact system about our extra jars
artifacts {
archives sourceJar, devJar
archives sourcesJar, devJar
}

// Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around
Expand Down
2 changes: 1 addition & 1 deletion build/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
minecraft_version=1.8
forge_version=11.14.1.1353
forge_version=11.14.3.1514
mod_version=1.1.2
Binary file modified build/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions build/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Mar 26 13:33:58 CDT 2014
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
2 changes: 1 addition & 1 deletion src/codechicken/lib/data/MCDataIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static void writeFluidStack(MCDataOutput out, FluidStack fluid) {
if (fluid == null) {
out.writeShort(-1);
} else {
out.writeShort(fluid.fluidID);
out.writeShort(fluid.getFluidID());
out.writeVarInt(fluid.amount);
out.writeNBTTagCompound(fluid.tag);
}
Expand Down