Skip to content
This repository has been archived by the owner on Oct 1, 2018. It is now read-only.

Port to MC 1.12 #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 55 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
apply plugin: 'java'
apply plugin: 'forge'

dependencies {
compile ("appeng:appliedenergistics2:rv1-stable-1:dev") {
exclude group: "net.industrial-craft", module: "industrialcraft-2"
exclude group: "mcp.mobius.waila", module: "Waila"
exclude group: "codechicken", module: "ForgeMultipart"
exclude group: "codechicken", module: "CodeChickenCore"
exclude group: "codechicken", module: "NotEnoughItems"
}
}
defaultTasks 'fullBuild'

buildscript {
repositories {
mavenCentral()
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
Expand All @@ -24,8 +13,53 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}

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

repositories {
maven {
name 'ForgeFS'
url 'http://files.minecraftforge.net/maven'
}
maven {
name 'amadornes'
url 'http://maven.amadornes.com/'
}
maven {
name 'prog'
url 'http://dvs1.progwml6.com/files/maven'
}
maven {
name 'tesla'
url 'http://maven.epoxide.org'
}
maven {
name 'curseforge'
url 'https://minecraft.curseforge.com/api/maven/'
}
maven {
name 'opencomputers'
url 'http://maven.cil.li/'
}
maven {
name 'hwyla'
url 'http://tehnut.info/maven'
}
maven {
name 'CoFH Maven'
url = 'http://maven.covers1624.net'
}
maven {
name 'buildcraft'
url 'https://mod-buildcraft.com/maven/'
}
}

dependencies {
compile ("appeng:appliedenergistics2:rv5-alpha-4")
}

configurations.all {
Expand All @@ -42,17 +76,19 @@ configFile.withReader {
project.ext.config = new ConfigSlurper().parse prop
}

sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

version="build-$System.env.DRONE_BUILD_NUMBER"
group = config.group
archivesBaseName = config.archivesBaseName

minecraft {
version = config.minecraft_version + "-" + config.forge_version

replace "@version@", project.version
version = config.minecraft_version + "-" + config.forge_version
mappings = "${config.mappings_version}"
runDir = "run"
useDepAts = true
replace "@version@", project.version
}

sourceSets {
Expand Down
5 changes: 3 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
group=appeng.spatialiocompat
archivesBaseName=spatialiocompat
minecraft_version=1.7.10
forge_version=10.13.2.1230
minecraft_version=1.12
forge_version=14.21.1.2443
mappings_version=snapshot_20170625
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Dec 26 12:21:47 CET 2014
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
13 changes: 7 additions & 6 deletions src/main/java/spatialiocompat/SIOCompat.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

import java.util.List;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;

import com.google.common.collect.Lists;

import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;

import spatialiocompat.core.SIOCompatMarker;
import spatialiocompat.core.SIOModule;
import spatialiocompat.modules.BigReactors;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spatialiocompat/core/SIOBaseModule.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package spatialiocompat.core;


import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLInterModComms;


/**
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/spatialiocompat/core/SIOCompatMarker.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import java.util.Collection;
import java.util.LinkedList;

import net.minecraftforge.fml.common.ICrashCallable;

import org.apache.commons.lang3.StringUtils;

import cpw.mods.fml.common.ICrashCallable;



/**
Expand Down