From 408aeedb0f60e6cd376b08e6817f12c3cbaae580 Mon Sep 17 00:00:00 2001
From: JackCarterSmith <arechristopher1@gmail.com>
Date: Sun, 2 Jun 2019 21:25:42 +0200
Subject: [PATCH] Update forge version

Updated maven repo
---
 README.md                                     |  2 +-
 build.gradle                                  | 25 ++++------
 .../orbsat/common/compat/AlbedoHelper.java    | 50 -------------------
 .../common/compat/OrbsatCompatModule.java     |  1 -
 4 files changed, 11 insertions(+), 67 deletions(-)
 delete mode 100644 src/main/java/jackcartersmith/orbsat/common/compat/AlbedoHelper.java

diff --git a/README.md b/README.md
index 2fab29c..b30203d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Une reprise du mod (mort) ORBITAL BOMBARDMENT de la 1.6.4. Celui ci permet d'ajouter 
 au jeu de nouveaux blocs et items pour tirer de puissantes salves destructrices sur 
-vos fuc***** cochons !
+vos fuc$@# cochons !
 
 Bien sûr pour le moment je compte seulement porter le mod sur la 1.7.10/1.10.2. 
 Après peut être je continuerai à ajouter des élèments pour agrandir ces fonctionnalités.
diff --git a/build.gradle b/build.gradle
index 42cc6ba..d458b02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,10 +14,10 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 
 version = "0.1.3"
-//group = "fr.jackcartersmith.orbsat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-group = "jackcartersmith"
-def archiveGroup = group
-archivesBaseName = "OrbitalSatellite"
+group = "fr.jackcartersmith.orbsat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+//group = "jackcartersmith"
+//def archiveGroup = group
+//archivesBaseName = "OrbitalSatellite"
 
 sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 compileJava {
@@ -25,8 +25,8 @@ compileJava {
 }
 
 minecraft {
-    version = "1.12.2-14.23.5.2768"
-    runDir = "run"
+    version = "1.12.2-14.23.5.2838"
+    runDir = "eclipse"
     
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
@@ -65,9 +65,6 @@ repositories {
         name 'CoFH Maven'
         url "http://maven.covers1624.net/"
     }
-    maven { // Albedo Lights
-        url 'https://repo.elytradev.com/'
-    }
 }
 
 dependencies {
@@ -94,12 +91,10 @@ dependencies {
 	
     compileOnly "mezz.jei:jei_1.12.2:4.10.+"
     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"
-    compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+'
-    compileOnly 'baubles:Baubles:1.12:1.5.2'
-    deobfCompile 'elucent:albedo:2.0-SNAPSHOT'
-
+    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 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+'
+    //compileOnly 'baubles:Baubles:1.12:1.5.2'
 }
 
 processResources {
diff --git a/src/main/java/jackcartersmith/orbsat/common/compat/AlbedoHelper.java b/src/main/java/jackcartersmith/orbsat/common/compat/AlbedoHelper.java
deleted file mode 100644
index 7469186..0000000
--- a/src/main/java/jackcartersmith/orbsat/common/compat/AlbedoHelper.java
+++ /dev/null
@@ -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()
-	{
-	}
-}
diff --git a/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java b/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java
index c49f4d5..f6c9b26 100644
--- a/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java
+++ b/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);