From f5f664f02e9bc7dff8d7f955e699066777f11919 Mon Sep 17 00:00:00 2001
From: Timo Ley <timo.ley@tilera.dev>
Date: Fri, 25 Nov 2022 22:28:34 +0100
Subject: [PATCH] fix: Mekanism loading order

---
 build.gradle                                  | 24 +++++++++----------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../mekanism/api/energy/package-info.java     |  4 ----
 3 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/java/mekanism/api/energy/package-info.java

diff --git a/build.gradle b/build.gradle
index 3e030f4..96e9c72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
+            changing = true
+        }
     }
 }
 
@@ -21,7 +23,7 @@ apply plugin: 'maven-publish'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-version = "1.1.0"
+version = "1.1.1"
 group= "universalelectricity"
 archivesBaseName = "basiccomponents"
 
@@ -33,28 +35,24 @@ minecraft {
 repositories {
     maven {                                                                                                                                                                               
                 name = "ic2"                                                                                                                                                                  
-                url = "http://maven.ic2.player.to/"                                                                                                                                           
+                url = "https://maven.ic2.player.to/"    
+                metadataSources {
+                    artifact()
+                }                                                                                                                                       
         }
 }
 
 dependencies {
-    compile 'net.industrial-craft:industrialcraft-2:2.2.660-experimental:dev'
+    implementation 'net.industrial-craft:industrialcraft-2:2.2.660-experimental:dev'
 }
 
-processResources
-{
+processResources {
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
+    filesMatching('mcmod.info') {
         expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-      
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
 }
 
 task deobfJar(type: Jar) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4a0bb8..f6a15a7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java
deleted file mode 100644
index 23773a3..0000000
--- a/src/main/java/mekanism/api/energy/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|energy")
-package mekanism.api.energy;
-import cpw.mods.fml.common.API;
-