Merge branch 'master' into CI-exp

Jenkinsfile

@@ -0,0 +1,30 @@
+pipeline {
+  agent {
+    docker {
+      image 'jackcartersmith/gradle_mc:stable_1.12'
+    }
+
+  }
+  stages {
+    stage('Setup') {
+      steps {
+        sh 'cd /var/lib/jenkins/workspace/Orbital-Satellite_*'
+        sh 'chmod u+x gradlew'
+        sh './gradlew setupCIWorkspace'
+      }
+    }
+    stage('Compile') {
+      steps {
+        sh './gradlew clean'
+        sh './gradlew check'
+        sh './gradlew build'
+      }
+    }
+    stage('JAR release') {
+      steps {
+        archiveArtifacts(artifacts: 'build/libs/OrbitalSatellite-*.jar', excludes: 'build/libs/OrbitalSatellite-*-sources.jar')
+        cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true)
+      }
+    }
+  }
+}

README.md

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

gradle.properties

@@ -1,7 +1,3 @@
 # 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 = "30f9f06606e9ab799c59ec743cab264c8310531d", dependencies = "required-after:forge@[14.23.5.2838,)")
+		certificateFingerprint = "3ce4f2265ef35e83d8d32f87fa6394a56e9b0e49", dependencies = "required-after:forge@[14.23.5.2768,)")
 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

@@ -0,0 +1,50 @@
+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,6 +18,7 @@ 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);