Update to 1.19.2

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
         pullRequests: true
         issues: true
         issuesWoLabels: true
-        excludeLabels: 1.12.2,1.16.5,forge
+        excludeLabels: 1.12.2,1.16.5,forge,1.18.2
         prWoLabels: true
     - name: Build with Gradle
       run: ./gradlew build publishCurseForge

build.gradle.kts

@@ -2,7 +2,7 @@ import net.darkhax.curseforgegradle.Constants as CFG_Constants
 
 plugins {
     id("fabric-loom")
-    val kotlinVersion: String = "1.6.21"
+    val kotlinVersion: String = "1.7.20"
     kotlin("jvm").version(kotlinVersion)
     id("net.darkhax.curseforgegradle") version "1.0.10"
 }
@@ -59,11 +59,20 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api", "fabric-api", fabricVersion)
     val fabricKotlinVersion: String by project
     modImplementation("net.fabricmc", "fabric-language-kotlin", fabricKotlinVersion)
-    modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion")
-    modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion")
+//    modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion")
+//    modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion")
+
+    modImplementation("teamreborn", "energy", "2.2.0") {
+        exclude(group = "net.fabricmc.fabric-api")
+    }
+
+//    include modApi('teamreborn:energy:<latest_version>') {
+//        exclude(group: "net.fabricmc.fabric-api")
+//    }
 
-    modImplementation("appeng:appliedenergistics2-fabric:$aeVersion")
-    modImplementation("curse.maven:ae2-things-563800:3796436")
+//    modImplementation("appeng:appliedenergistics2-fabric:$aeVersion")
+//    modImplementation("curse.maven:ae2-things-563800:3796436")
+    modImplementation("curse.maven:ae2-223794:4030069")
 
     annotationProcessor("org.spongepowered:mixin:0.8.5:processor")
     modCompileOnly("org.spongepowered:mixin:0.8.5") { isTransitive = false }
@@ -83,8 +92,8 @@ tasks {
     }
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions { jvmTarget = javaVersion.toString() }
-        sourceCompatibility = javaVersion.toString()
-        targetCompatibility = javaVersion.toString()
+//        sourceCompatibility = javaVersion.toString()
+//        targetCompatibility = javaVersion.toString()
     }
     jar { from("LICENSE") { rename { "${it}_${base.archivesName}" } } }
     processResources {

gradle.properties

@@ -16,24 +16,24 @@
 #fabricKotlinVersion = 1.7.4+kotlin.1.6.21
 #
 
-modBaseName=AEAdditions-1.18.2
-aeVersion=11.1.0
+modBaseName=AEAdditions-1.19.2
+aeVersion=12.8.3-beta
 modCurseId=493962
-reiVersion=8.2.469
+reiVersion=9.1.550
 kotlin.code.style = official
 org.gradle.jvmargs = -Xmx1G
 org.gradle.warning.mode = all
 # Check these on https://fabricmc.net/develop/
-minecraftVersion = 1.18.2
-yarnMappings = 1.18.2+build.3
-loaderVersion = 0.13.3
+minecraftVersion = 1.19.2
+yarnMappings = 1.19.2+build.24
+loaderVersion = 0.14.9
 # Fabric API
-fabricVersion = 0.51.1+1.18.2
-loomVersion = 0.11-SNAPSHOT
+fabricVersion = 0.63.0+1.19.2
+loomVersion = 1.0-SNAPSHOT
 # Mod Properties
 modVersion = 3.0.3
 mavenGroup = com.the9grounds
-archivesBaseName = AEAdditions-1.18.2
+archivesBaseName = AEAdditions-1.19.2
 # Kotlin
 systemProp.kotlinVersion = 1.6.21
-fabricKotlinVersion = 1.7.4+kotlin.1.6.21
+fabricKotlinVersion = 1.8.5+kotlin.1.7.20

src/main/kotlin/com/the9grounds/aeadditions/AEAdditions.kt

@@ -1,19 +1,15 @@
 package com.the9grounds.aeadditions
 
 import appeng.api.IAEAddonEntrypoint
-import appeng.api.stacks.AEKeyType
 import appeng.items.storage.BasicStorageCell
 import com.the9grounds.aeadditions.integration.Integration
-import com.the9grounds.aeadditions.integration.Mods
 import com.the9grounds.aeadditions.integration.appeng.AppEng
 import com.the9grounds.aeadditions.integration.appeng.InitUpgrades
-import com.the9grounds.aeadditions.item.storage.DiskCell
 import com.the9grounds.aeadditions.item.storage.StorageCell
 import com.the9grounds.aeadditions.registries.Blocks
 import com.the9grounds.aeadditions.registries.Cells
 import com.the9grounds.aeadditions.registries.Items
 import com.the9grounds.aeadditions.registries.client.Models
-import io.github.projectet.ae2things.item.DISKDrive
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap
@@ -40,10 +36,10 @@ object AEAdditions : IAEAddonEntrypoint {
 
         itemColorsRegister(BasicStorageCell::getColor, storageCells)
 
-        if (Mods.AE2THINGS.isEnabled) {
-            val diskCells = Items.ITEMS.filter { it is DiskCell && it.keyType == AEKeyType.fluids() }.toTypedArray()
-            itemColorsRegister(DISKDrive::getColor, diskCells)
-        }
+//        if (Mods.AE2THINGS.isEnabled) {
+//            val diskCells = Items.ITEMS.filter { it is DiskCell && it.keyType == AEKeyType.fluids() }.toTypedArray()
+//            itemColorsRegister(DISKDrive::getColor, diskCells)
+//        }
     }
 
     @Environment(EnvType.CLIENT)

src/main/kotlin/com/the9grounds/aeadditions/api/IAEAdditionsStorageCell.kt

@@ -4,7 +4,6 @@ import appeng.api.stacks.AEKey
 import appeng.api.stacks.AEKeyType
 import appeng.api.storage.cells.ICellWorkbenchItem
 import net.minecraft.world.item.ItemStack
-import javax.annotation.Nonnull
 
 interface IAEAdditionsStorageCell : ICellWorkbenchItem {
 
@@ -20,7 +19,7 @@ interface IAEAdditionsStorageCell : ICellWorkbenchItem {
      *
      * @return number of bytes
      */
-    fun getBytes(@Nonnull cellItem: ItemStack): Int
+    fun getBytes(cellItem: ItemStack): Int
 
     /**
      * Determines the number of bytes used for any type included on the cell.
@@ -29,7 +28,7 @@ interface IAEAdditionsStorageCell : ICellWorkbenchItem {
      *
      * @return number of bytes
      */
-    fun getBytesPerType(@Nonnull cellItem: ItemStack): Int
+    fun getBytesPerType(cellItem: ItemStack): Int
 
     /**
      * Allows you to fine tune which items are allowed on a given cell, if you don't care, just return false; As the
@@ -71,7 +70,7 @@ interface IAEAdditionsStorageCell : ICellWorkbenchItem {
      *
      * @return number of types
      */
-    fun getTotalTypes(@Nonnull cellItem: ItemStack): Int
+    fun getTotalTypes(cellItem: ItemStack): Int
 
     /**
      * @return drain in ae/t this storage cell will use.

src/main/kotlin/com/the9grounds/aeadditions/block/crafting/ExtendedCraftingUnitType.kt

@@ -10,7 +10,7 @@ enum class ExtendedCraftingUnitType(val kiloBytes: Int) : ICraftingUnitType {
     STORAGE_16384(16384),
     STORAGE_65536(65536);
 
-    override fun getStorageBytes(): Int = 1024 * kiloBytes
+    override fun getStorageBytes(): Long = 1024L * kiloBytes
 
     override fun getAcceleratorThreads(): Int = 0
 

src/main/kotlin/com/the9grounds/aeadditions/integration/appeng/AppEng.kt

@@ -1,9 +1,7 @@
 package com.the9grounds.aeadditions.integration.appeng
 
 import appeng.api.storage.StorageCells
-import com.the9grounds.aeadditions.integration.Mods
 import com.the9grounds.aeadditions.me.storage.AEAdditionsCellHandler
-import com.the9grounds.aeadditions.me.storage.ExtendedDiskCellHandler
 import com.the9grounds.aeadditions.me.storage.SuperCellHandler
 
 class AppEng {
@@ -13,9 +11,9 @@ class AppEng {
         fun initCellHandler() {
             StorageCells.addCellHandler(AEAdditionsCellHandler)
             StorageCells.addCellHandler(SuperCellHandler)
-            if (Mods.AE2THINGS.isEnabled) {
-                StorageCells.addCellHandler(ExtendedDiskCellHandler())
-            }
+//            if (Mods.AE2THINGS.isEnabled) {
+//                StorageCells.addCellHandler(ExtendedDiskCellHandler())
+//            }
         }
     }
 }