Removed old compat module

Updated maven repo

README.md

@@ -1,4 +1,5 @@
 # ORBITAL SATELLITE - Pig Striker !!!
+[![Build Status](https://ci.jcsmith.fr/job/OrbitalSatellite/badge/icon)](https://ci.jcsmith.fr/job/OrbitalSatellite/)
 
 ## Description
 Ce mod est une reprise du mod Orbital Bombardment de la 1.6.4.

build.gradle

@@ -1,139 +1,132 @@
-import groovy.json.JsonOutput
+buildscript {
-
+    repositories {
-buildscript {
+        jcenter()
-    repositories {
+		mavenCentral()
-        jcenter()
+		mavenLocal()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        maven { url = "http://files.minecraftforge.net/maven" }
-    }
+    }
-    dependencies {
+    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-    }
+		classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1"
-}
+    }
-apply plugin: 'net.minecraftforge.gradle.forge'
+}
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+
-
+repositories {
-
+    maven {
-version = "0.1.3"
+        name = "JEI"
-//group = "fr.jackcartersmith.orbsat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+        url "http://dvs1.progwml6.com/files/maven"
-group = "jackcartersmith"
+    }
-def archiveGroup = group
+    maven { // HWYLA
-archivesBaseName = "OrbitalSatellite"
+        name "TehNuts WAILA fork"
-
+        url "http://tehnut.info/maven"
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+    }
-compileJava {
+    maven { // OpenComputers
-    sourceCompatibility = targetCompatibility = '1.8'
+        name "OpenComputers"
-}
+        url "http://maven.cil.li/"
-
+    }
-minecraft {
+    repositories {//Curseforge maven, in case some other maven goes offline
-    version = "1.12.2-14.23.5.2768"
+        maven {
-    runDir = "run"
+            name = "CurseForge"
-    
+            url = "https://minecraft.curseforge.com/api/maven/"
-    // the mappings can be changed at any time, and must be in the following format.
+        }
-    // snapshot_YYYYMMDD   snapshot are built nightly.
+    }
-    // stable_#            stables are built at the discretion of the MCP team.
+    /*maven { //IC2
-    // Use non-default mappings at your own risk. they may not always work.
+        name = "ic2"
-    // simply re-run your setup task after changing the mappings to update your workspace.
+        url = "http://maven.ic2.player.to/"
-    mappings = "stable_39"
+    }*/
-	//mappings = "snapshot_20171003"
+    maven {
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+        name = "CoFH Maven"
-}
+        url = "http://maven.covers1624.net"
-
+    }
-repositories {
+}
-    maven { // JEI & Tinkers
+
-        name 'DVS1 Maven FS'
+apply plugin: 'net.minecraftforge.gradle.forge'
-        url 'http://dvs1.progwml6.com/files/maven'
+
-    }
+ext.buildNumber = "0"
-    maven { // HWYLA
+if (System.getenv("BUILD_NUMBER") != null) {
-        name "TehNuts WAILA fork"
+	buildNumber = System.getenv("BUILD_NUMBER")
-        url "http://tehnut.info/maven"
+
-    }
+}
-    maven { // OpenComputers
+
-        name "OpenComputers"
+version = "$baseVersion.$buildNumber"
-        url "http://maven.cil.li/"
+group = "fr.jackcartersmith.orbsat"
-    }
+archivesBaseName = "OrbitalSatellite-$project.minecraftVersion"
-    repositories {//Curseforge maven, in case some other maven goes offline
+
-        maven {
+sourceCompatibility = targetCompatibility = 1.8
-            name = "CurseForge"
+compileJava {
-            url = "https://minecraft.curseforge.com/api/maven/"
+    sourceCompatibility = targetCompatibility = 1.8
-        }
+}
-    }
+
-    /*maven { //IC2
+minecraft {
-        name = "ic2"
+    version = "$project.minecraftVersion-$project.forgeVersion"
-        url = "http://maven.ic2.player.to/"
+    runDir = "eclipse"
-    }*/
+    
-    maven { // Redstone Flux
+    mappings = "stable_39"
-        name 'CoFH Maven'
+	//mappings = "snapshot_20171003"
-        url "http://maven.covers1624.net/"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-    }
+}
-    maven { // Albedo Lights
+
-        url 'https://repo.elytradev.com/'
+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"
-dependencies {
+    //compile "some.group:artifact:version"
-    // you may put jars on which you depend on in ./libs
+      
-    // or you may define them like so..
+    // real examples
-    //compile "some.group:artifact:version:classifier"
+    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile "some.group:artifact:version"
+    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-      
+
-    // real examples
+    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+
-
+    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
-    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    // except that these dependencies get remapped to your current MCP mappings
-    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
+    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
+
-    // except that these dependencies get remapped to your current MCP mappings
+    // for more info...
-    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
+	
-    // for more info...
+    compile "mezz.jei:jei_1.12.2:4.10.+:api"
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+    deobfCompile "cofh:RedstoneFlux:1.12-2.1.0.6:universal"
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+    compile "li.cil.oc:OpenComputers:MC1.12.2-1.7.+:api"
-	
+    compile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2:api"
-    compileOnly "mezz.jei:jei_1.12.2:4.10.+"
+    //compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+'
-    compileOnly "cofh:RedstoneFlux:1.12-2.+:deobf"
+    //compileOnly 'baubles:Baubles:1.12:1.5.2'
-    compileOnly "opencomputers:OpenComputers:MC1.12.2:1.7.2.67"//li.cil.oc:OpenComputers:MC1.12.1-1.7.0.+"
+}
-    compileOnly "mcp.mobius.waila:Hwyla:1.8.20-B35_1.12"
+
-    compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+'
+task signJar(type: SignJar, dependsOn: reobfJar) {
-    compileOnly 'baubles:Baubles:1.12:1.5.2'
+    onlyIf { // Skip the task if our secret data isn't available
-    deobfCompile "albedo:albedo:0.1.3"
+        project.hasProperty('keyStore')
-
+    }
-}
+    dependsOn reobfJar
-
+    if (project.hasProperty('keyStore')) { // This needs to be a path to the keystore file
-processResources {
+        keyStore = project.keyStore
-    // this will ensure that this task is redone when the versions change.
+        alias = project.keyStoreAlias
-    inputs.property "version", project.version
+        storePass = project.keyStorePass
-    inputs.property "mcversion", project.minecraft.version
+        keyPass = project.keyStoreKeyPass
-
+        inputFile = jar.archivePath
-    // replace stuff in mcmod.info, nothing else
+        outputFile = jar.archivePath
-    from(sourceSets.main.resources.srcDirs) {
+    }
-        include "mcmod.info"
+}
-
+build.dependsOn signJar
-        // replace version and mcversion
+
-        expand "version": project.version, "mcversion": "1.12"
+processResources {
-    }
+    // this will ensure that this task is redone when the versions change.
-
+    inputs.property "version", project.version
-    // copy everything else, thats not the mcmod.info
+    inputs.property "mcversion", project.minecraft.version
-    from(sourceSets.main.resources.srcDirs) {
+
-        exclude "mcmod.info"
+    // replace stuff in mcmod.info, nothing else
-    }
+    from(sourceSets.main.resources.srcDirs) {
-}
+        include "mcmod.info"
-
+
-task signJar(type: SignJar, dependsOn: reobfJar) {
+        // replace version and mcversion
-    onlyIf { // Skip the task if our secret data isn't available
+        expand "version": project.version, "mcversion": "1.12.2"
-        project.hasProperty('keyStore')
+    }
-    }
+
-    dependsOn reobfJar
+    // copy everything else, thats not the mcmod.info
-    if (project.hasProperty('keyStore')) { // This needs to be a path to the keystore file
+    from(sourceSets.main.resources.srcDirs) {
-        keyStore = project.keyStore
+        exclude "mcmod.info"
-        alias = project.keyStoreAlias
+    }
-        storePass = project.keyStorePass
+}
-        keyPass = project.keyStoreKeyPass
-        inputFile = jar.archivePath
-        outputFile = jar.archivePath
-    }
-}
-
-build.dependsOn signJar

gradle.properties

@@ -1,3 +1,7 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
+baseVersion=1.0
+minecraftVersion=1.12.2
+forgeVersion=14.23.5.2838
 org.gradle.jvmargs=-Xmx4G
+

src/main/java/jackcartersmith/orbsat/OrbitalSatellite.java

@@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraftforge.fml.relauncher.Side;
 
 @Mod(modid = OrbitalSatellite.MODID, name = OrbitalSatellite.NAME, version = OrbitalSatellite.VERSION, modLanguage = "java", 
-		certificateFingerprint = "3ce4f2265ef35e83d8d32f87fa6394a56e9b0e49", dependencies = "required-after:forge@[14.23.5.2768,)")
+certificateFingerprint = "30f9f06606e9ab799c59ec743cab264c8310531d", dependencies = "required-after:forge@[14.23.5.2838,)")
 public class OrbitalSatellite {
     public static final String MODID = "orbsat";
     public static final String NAME = "Orbital Satellite";

src/main/java/jackcartersmith/orbsat/common/compat/AlbedoHelper.java

@@ -1,50 +0,0 @@
-package jackcartersmith.orbsat.common.compat;
-
-import elucent.albedo.event.GatherLightsEvent;
-import elucent.albedo.lighting.Light;
-import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public class AlbedoHelper extends OrbsatCompatModule
-{
-	@Override
-	public void preInit()
-	{
-	}
-
-	@Override
-	public void init()
-	{
-		MinecraftForge.EVENT_BUS.register(this);
-	}
-
-	/*
-	@SubscribeEvent
-	@SideOnly(Side.CLIENT)
-	public void gatherLights(GatherLightsEvent event)
-	{
-		for(LightningAnimation animation : TileEntityTeslaCoil.effectMap.values())
-		{
-			if(animation.shoudlRecalculateLightning())
-				animation.createLightning(Utils.RAND);
-
-			Light.Builder builder = Light.builder();
-			builder.radius(2.5f);
-			builder.color(77/255f, 74/255f, 152/255f);
-			for(Vec3d point : animation.subPoints)
-			{
-				builder.pos(point);
-				event.getLightList().add(builder.build());
-			}
-		}
-	}
-	*/
-
-	@Override
-	public void postInit()
-	{
-	}
-}

src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java

@@ -18,7 +18,6 @@ public abstract class OrbsatCompatModule {
 	
 	static
 	{
-		moduleClasses.put("albedo", AlbedoHelper.class);
 		//moduleClasses.put("baubles", BaublesHelper.class);
 		//moduleClasses.put("opencomputers", OCHelper.class);
 		moduleClasses.put("waila", WailaHelper.class);