chore: update forgegradle

build.gradle

@@ -11,16 +11,19 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
+            changing = true
+        }
     }
 }
 
 apply plugin: 'forge'
+apply plugin: 'maven-publish'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-version = "1.0"
+version = "1.0.1"
 group = "universalelectricity"
 archivesBaseName = "atomicscience"
 
@@ -34,21 +37,52 @@ repositories {
 }
 
 dependencies {
-    compile "universalelectricity:basiccomponents:1.0.0-dirty:deobf"
+    implementation "universalelectricity:basiccomponents:1.1.1:deobf"
 }
 
-processResources
+processResources {
-{
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
 
-    from(sourceSets.main.resources.srcDirs) {
+    filesMatching('mcmod.info') {
-        include 'mcmod.info'
-                
         expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-      
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
 }
+
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'deobf'
+}
+
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
+}
+
+publishing {
+    tasks.publish.dependsOn 'build'
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = project.archivesBaseName
+
+            artifact deobfJar
+            artifact sourcesJar
+            artifact jar
+        }
+    }
+
+    repositories {
+        if (project.hasProperty('mvnURL')) {
+                maven {
+                    credentials {
+                        username findProperty("mvnUsername")
+                        password findProperty("mvnPassword")
+                    }
+                    url = findProperty("mvnURL")
+                }
+        }
+        else {
+                mavenLocal()
+        }
+    }
+}

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

src/main/java/atomicscience/AtomicScience.java

@@ -232,7 +232,6 @@ public class AtomicScience {
     bFulminationGenerator = new BFulminationGenerator();
     bAtomicAssembler = new BAtomicAssembler();
     bReactorTap = new BReactorTap();
-    bSuperConductor = new BSuperconductor();
     itHazmatHelmet =
         (new ItHazmatSuite(
 
@@ -372,7 +371,6 @@ public class AtomicScience {
     GameRegistry.registerTileEntity(TAutoBuilder.class, "ASAutoBuilder");
     GameRegistry.registerTileEntity(TFissionReactor.class, "ASFissionReactor");
     GameRegistry.registerTileEntity(TReactorTap.class, "ASReactorTap");
-    GameRegistry.registerTileEntity(TSuperconductor.class, "ASSuperconductor");
     proxy.preInit();
 
     channel = NetworkRegistry.INSTANCE.newSimpleChannel("AtomicScience");

src/main/java/atomicscience/BSuperconductor.java

@@ -1,18 +0,0 @@
-package atomicscience;
-
-import basiccomponents.common.block.BlockCopperWire;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-public class BSuperconductor extends BlockCopperWire {
-  public BSuperconductor() {
-    super();
-    this.setBlockName("atomicscience:superconductor");
-    this.setCreativeTab(TabAS.INSTANCE);
-  }
-
-  @Override
-  public TileEntity createNewTileEntity(World var1, int meta) {
-    return new TSuperconductor();
-  }
-}

src/main/java/atomicscience/TSuperconductor.java

@@ -1,15 +0,0 @@
-package atomicscience;
-
-import basiccomponents.common.tileentity.TileEntityCopperWire;
-
-public class TSuperconductor extends TileEntityCopperWire {
-    @Override
-    public double getResistance() {
-        return 0;
-    }
-
-    @Override
-    public double getCurrentCapcity() {
-        return Double.MAX_VALUE;
-    }
-}

src/main/java/icbm/api/ICBMFlags.java

@@ -1,15 +1,11 @@
 package icbm.api;
 
+import universalelectricity.prefab.flag.FlagRegistry;
+
 public class ICBMFlags {
-  // TODO: WTF
+  public static final String FLAG_BAN_GLOBAL = FlagRegistry.registerFlag("ban_icbm");
-  // public static final String FLAG_BAN_GLOBAL =
+  public static final String FLAG_BAN_EXPLOSIVE = FlagRegistry.registerFlag("ban_explosive");
-  // FlagRegistry.registerFlag("ban_icbm");
+  public static final String FLAG_BAN_GRENADE = FlagRegistry.registerFlag("ban_grenade");
-  // public static final String FLAG_BAN_EXPLOSIVE =
+  public static final String FLAG_BAN_MISSILE = FlagRegistry.registerFlag("ban_missile");
-  // FlagRegistry.registerFlag("ban_explosive");
+  public static final String FLAG_BAN_MINECART = FlagRegistry.registerFlag("ban_minecart");
-  // public static final String FLAG_BAN_GRENADE =
-  // FlagRegistry.registerFlag("ban_grenade");
-  // public static final String FLAG_BAN_MISSILE =
-  // FlagRegistry.registerFlag("ban_missile");
-  // public static final String FLAG_BAN_MINECART =
-  // FlagRegistry.registerFlag("ban_minecart");
 }