Removed the AE from AE2

nekosmp · Apr 15, 2023 · 4af3a11 · 4af3a11
1 parent 2005de0
commit 4af3a11
Show file tree

Hide file tree

Showing 905 changed files with 331 additions and 91,811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,6 @@ build
 !.github/
 
 # Explicit ignores
-Thumbs.db
+Thumbs.db
+
+libs/markdown/bin/
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@
 plugins {
     id 'fabric-loom' version '1.0-SNAPSHOT'
     id 'maven-publish'
-    id "com.diffplug.spotless" version "5.12.4"
+    //id "com.diffplug.spotless" version "5.12.4"
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "com.modrinth.minotaur" version "1.2.1"
     id 'io.github.juuxel.loom-quiltflower' version '1.7.1'
@@ -452,34 +452,34 @@ publishing {
 
 /////////////
 // Spotless
-spotless {
-
-    java {
-        target 'src/*/java/appeng/**/*.java'
-
-        endWithNewline()
-        indentWithSpaces()
-        removeUnusedImports()
-        toggleOffOn()
-        eclipse().configFile 'codeformat/codeformat.xml'
-        importOrderFile 'codeformat/ae2.importorder'
-
-        // courtesy of diffplug/spotless#240
-        // https://github.com/diffplug/spotless/issues/240#issuecomment-385206606
-        custom 'noWildcardImports', {
-            if (it.contains('*;\n')) {
-                throw new Error('No wildcard imports allowed')
-            }
-        }
-        bumpThisNumberIfACustomStepChanges(1)
-    }
-
-    format 'json', {
-        target 'src/*/resources/**/*.json'
-        targetExclude 'src/generated/resources/**'
-        prettier().config(['parser': 'json'])
-    }
-}
+//spotless {
+//
+//    java {
+//        target 'src/*/java/appeng/**/*.java'
+//
+//        endWithNewline()
+//        indentWithSpaces()
+//        removeUnusedImports()
+//        toggleOffOn()
+//        eclipse().configFile 'codeformat/codeformat.xml'
+//        importOrderFile 'codeformat/ae2.importorder'
+//
+//        // courtesy of diffplug/spotless#240
+//        // https://github.com/diffplug/spotless/issues/240#issuecomment-385206606
+//        custom 'noWildcardImports', {
+//            if (it.contains('*;\n')) {
+//                throw new Error('No wildcard imports allowed')
+//            }
+//        }
+//        bumpThisNumberIfACustomStepChanges(1)
+//    }
+//
+//    format 'json', {
+//        target 'src/*/resources/**/*.json'
+//        targetExclude 'src/generated/resources/**'
+//        prettier().config(['parser': 'json'])
+//    }
+//}
 
 import com.modrinth.minotaur.TaskModrinthUpload
 

diff --git a/src/main/java/appeng/api/behaviors/PickupStrategy.java b/src/main/java/appeng/api/behaviors/PickupStrategy.java
diff --git a/src/main/java/appeng/api/behaviors/PlacementStrategy.java b/src/main/java/appeng/api/behaviors/PlacementStrategy.java
diff --git a/src/main/java/appeng/api/behaviors/StackTransferContext.java b/src/main/java/appeng/api/behaviors/StackTransferContext.java
@@ -2,7 +2,6 @@
 
 import org.jetbrains.annotations.ApiStatus;
 
-import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IStorageService;
 import appeng.api.stacks.AEItemKey;
@@ -19,8 +18,6 @@ public interface StackTransferContext {
 
     IStorageService getInternalStorage();
 
-    IEnergySource getEnergySource();
-
     IActionSource getActionSource();
 
     int getOperationsRemaining();

diff --git a/src/main/java/appeng/api/config/CondenserOutput.java b/src/main/java/appeng/api/config/CondenserOutput.java
diff --git a/src/main/java/appeng/api/config/CpuSelectionMode.java b/src/main/java/appeng/api/config/CpuSelectionMode.java
diff --git a/src/main/java/appeng/api/config/LevelEmitterMode.java b/src/main/java/appeng/api/config/LevelEmitterMode.java
diff --git a/src/main/java/appeng/api/config/NetworkEmitterMode.java b/src/main/java/appeng/api/config/NetworkEmitterMode.java
diff --git a/src/main/java/appeng/api/config/PowerMultiplier.java b/src/main/java/appeng/api/config/PowerMultiplier.java