Kr/cherrypick (#2164)

Co-authored-by: marisathewitch <[email protected]>
Co-authored-by: Western01 <[email protected]>
Co-authored-by: YoungOnion <[email protected]>
Co-authored-by: iouter <[email protected]>
Co-authored-by: Karthi Suresh <[email protected]>
Co-authored-by: mikerooni <[email protected]>
Co-authored-by: Ghostipedia <[email protected]>
Co-authored-by: Electrolyte <[email protected]>
Co-authored-by: Austin <[email protected]>
Co-authored-by: Dumitru Mițca <[email protected]>
Co-authored-by: Deepa <[email protected]>
Co-authored-by: kross <[email protected]>
Co-authored-by: Spicierspace153 <[email protected]>
Co-authored-by: Spicierspace153 <[email protected]>
Co-authored-by: eragaxshim <[email protected]>
Co-authored-by: Zorbatron <[email protected]>

dependencies.gradle

@@ -54,5 +54,10 @@ dependencies {
 
     // JAVD
     compileOnly(forge.javd) { transitive = false }
-    //modRuntimeOnly("curse.maven:trenzalore-870210:4848244")
+
+    compileOnly(forge.ftbteams)
+    compileOnly(forge.ftblibrary)
+
+    compileOnly(forge.argonauts)
+    compileOnly(forge.resourceful)
 }

settings.gradle

@@ -39,6 +39,10 @@ dependencyResolutionManagement {
         def jadeForgeVersion = "5366595"
         def worldStripperForgeFile = "4578579"
         def javdVersion = "4803995"
+        def ftbteamsForgeFile = "5631446"
+        def ftblibraryForgeFile = "5754910"
+        def argonautsForgeFile = "5263580"
+        def resourcefulForgeFile = "5659871"
 
         // Libs
         def parchmentVersion = "2024.07.28" // https://parchmentmc.org/docs/getting-started
@@ -107,6 +111,18 @@ dependencyResolutionManagement {
 
             def javd = version("javd", javdVersion)
             library("javd", "curse.maven", "javd-370890").versionRef(javd)
+
+            def ftbteams = version("ftbteams", ftbteamsForgeFile)
+            library("ftbteams", "curse.maven", "ftb-teams-forge-404468").versionRef(ftbteams)
+
+            def ftblibrary = version("ftblibrary", ftblibraryForgeFile)
+            library("ftblibrary", "curse.maven", "ftb-library-forge-404465").versionRef(ftblibrary)
+
+            def argonautslib = version("argonauts", argonautsForgeFile)
+            library("argonauts", "curse.maven", "argonauts-845833").versionRef(argonautslib)
+
+            def resourceful = version("resourceful", resourcefulForgeFile)
+            library("resourceful", "curse.maven", "resourceful-lib-570073").versionRef(resourceful)
         }
 
         libs {

src/generated/resources/assets/gtceu/compass/nodes/covers/storage_cover.json

@@ -0,0 +1,18 @@
+{
+  "button_texture": {
+    "type": "item",
+    "res": "gtceu:storage_cover"
+  },
+  "items": [
+    "gtceu:storage_cover"
+  ],
+  "page": "gtceu:covers/storage_cover",
+  "position": [
+    -300,
+    150
+  ],
+  "pre_nodes": [
+    "gtceu:covers/cover"
+  ],
+  "section": "gtceu:covers"
+}

src/generated/resources/assets/gtceu/compass/nodes/materials/frame.json

@@ -4,8 +4,7 @@
     "res": "gtceu:aluminium_frame"
   },
   "items": [
-    "#forge:frames",
-    "#minecraft:climbable"
+    "#c:frames"
   ],
   "page": "gtceu:materials/frame",
   "position": [

src/generated/resources/assets/gtceu/models/item/dough.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/dough"
+  }
+}

src/generated/resources/assets/gtceu/models/item/storage_cover.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/storage_cover"
+  }
+}

src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json → src/generated/resources/data/ae2/tags/item/p2p_attunements/fluid_p2p_tunnel.json

@@ -52,7 +52,7 @@
     "gtceu:oxygen_plasma_bucket",
     "gtceu:palladium_bucket",
     "gtceu:platinum_bucket",
-    "gtceu:plutonium_bucket",
+    "gtceu:plutonium_239_bucket",
     "gtceu:plutonium_241_bucket",
     "gtceu:potassium_bucket",
     "gtceu:radon_bucket",
@@ -67,7 +67,7 @@
     "gtceu:titanium_bucket",
     "gtceu:tritium_bucket",
     "gtceu:tungsten_bucket",
-    "gtceu:uranium_bucket",
+    "gtceu:uranium_238_bucket",
     "gtceu:uranium_235_bucket",
     "gtceu:vanadium_bucket",
     "gtceu:xenon_bucket",
@@ -310,9 +310,9 @@
     "gtceu:raw_growth_medium_bucket",
     "gtceu:sterilized_growth_medium_bucket",
     "gtceu:oil_bucket",
-    "gtceu:oil_heavy_bucket",
-    "gtceu:oil_medium_bucket",
-    "gtceu:oil_light_bucket",
+    "gtceu:heavy_oil_bucket",
+    "gtceu:raw_oil_bucket",
+    "gtceu:light_oil_bucket",
     "gtceu:natural_gas_bucket",
     "gtceu:bacteria_bucket",
     "gtceu:bacterial_sludge_bucket",

src/generated/resources/data/c/tags/block/cobblestones.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "gtceu:red_granite_cobblestone",
+    "gtceu:marble_cobblestone",
+    "gtceu:light_concrete_cobblestone",
+    "gtceu:dark_concrete_cobblestone"
+  ]
+}

src/generated/resources/data/c/tags/block/stones.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "gtceu:red_granite",
+    "gtceu:marble",
+    "gtceu:light_concrete",
+    "gtceu:dark_concrete"
+  ]
+}

src/generated/resources/data/c/tags/item/dough.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "gtceu:dough"
+  ]
+}

src/generated/resources/data/gtceu/tags/item/conveyor_modules.json

@@ -0,0 +1,32 @@
+{
+  "values": [
+    "gtceu:lv_conveyor_module",
+    "gtceu:mv_conveyor_module",
+    "gtceu:hv_conveyor_module",
+    "gtceu:ev_conveyor_module",
+    "gtceu:iv_conveyor_module",
+    "gtceu:luv_conveyor_module",
+    "gtceu:zpm_conveyor_module",
+    "gtceu:uv_conveyor_module",
+    {
+      "id": "gtceu:uhv_conveyor_module",
+      "required": false
+    },
+    {
+      "id": "gtceu:uev_conveyor_module",
+      "required": false
+    },
+    {
+      "id": "gtceu:uiv_conveyor_module",
+      "required": false
+    },
+    {
+      "id": "gtceu:uxv_conveyor_module",
+      "required": false
+    },
+    {
+      "id": "gtceu:opv_conveyor_module",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/gtceu/tags/item/electric_motors.json

@@ -0,0 +1,32 @@
+{
+  "values": [
+    "gtceu:lv_electric_motor",
+    "gtceu:mv_electric_motor",
+    "gtceu:hv_electric_motor",
+    "gtceu:ev_electric_motor",
+    "gtceu:iv_electric_motor",
+    "gtceu:luv_electric_motor",
+    "gtceu:zpm_electric_motor",
+    "gtceu:uv_electric_motor",
+    {
+      "id": "gtceu:uhv_electric_motor",
+      "required": false
+    },
+    {
+      "id": "gtceu:uev_electric_motor",
+      "required": false
+    },
+    {
+      "id": "gtceu:uiv_electric_motor",
+      "required": false
+    },
+    {
+      "id": "gtceu:uxv_electric_motor",
+      "required": false
+    },
+    {
+      "id": "gtceu:opv_electric_motor",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/gtceu/tags/item/electric_pistons.json

@@ -0,0 +1,32 @@
+{
+  "values": [
+    "gtceu:lv_electric_piston",
+    "gtceu:mv_electric_piston",
+    "gtceu:hv_electric_piston",
+    "gtceu:ev_electric_piston",
+    "gtceu:iv_electric_piston",
+    "gtceu:luv_electric_piston",
+    "gtceu:zpm_electric_piston",
+    "gtceu:uv_electric_piston",
+    {
+      "id": "gtceu:uhv_electric_piston",
+      "required": false
+    },
+    {
+      "id": "gtceu:uev_electric_piston",
+      "required": false
+    },
+    {
+      "id": "gtceu:uiv_electric_piston",
+      "required": false
+    },
+    {
+      "id": "gtceu:uxv_electric_piston",
+      "required": false
+    },
+    {
+      "id": "gtceu:opv_electric_piston",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/gtceu/tags/item/electric_pumps.json

@@ -0,0 +1,31 @@
+{
+  "values": [
+    "gtceu:lv_electric_pump",
+    "gtceu:mv_electric_pump",
+    "gtceu:hv_electric_pump",
+    "gtceu:ev_electric_pump",
+    "gtceu:iv_electric_pump",
+    "gtceu:zpm_electric_pump",
+    "gtceu:uv_electric_pump",
+    {
+      "id": "gtceu:uhv_electric_pump",
+      "required": false
+    },
+    {
+      "id": "gtceu:uev_electric_pump",
+      "required": false
+    },
+    {
+      "id": "gtceu:uiv_electric_pump",
+      "required": false
+    },
+    {
+      "id": "gtceu:uxv_electric_pump",
+      "required": false
+    },
+    {
+      "id": "gtceu:opv_electric_pump",
+      "required": false
+    }
+  ]
+}