more 1.21 port finally

lucaargolo · Jan 11, 2025 · 8318818 · 8318818
1 parent 0e5c316
commit 8318818
Show file tree

Hide file tree

Showing 284 changed files with 723 additions and 607 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ out/
 # fabric
 
 run/
+/.kotlin/errors/errors-1736588313060.log
+/.kotlin/errors/errors-1736588322464.log
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,6 @@ import com.matthewprenger.cursegradle.CurseProject
 import com.matthewprenger.cursegradle.CurseRelation
 import com.matthewprenger.cursegradle.Options
 import org.ajoberstar.grgit.Grgit
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.kohsuke.github.GHReleaseBuilder
 import org.kohsuke.github.GitHub
 
@@ -26,17 +25,6 @@ operator fun Project.get(property: String): String {
     return property(property) as String
 }
 
-configure<JavaPluginExtension> {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-tasks.compileKotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_21)
-    }
-}
-
 version = project["mod_version"]
 group = project["maven_group"]
 
@@ -72,6 +60,10 @@ fun getBranch(): String {
     return branch.substring(branch.lastIndexOf("/") + 1)
 }
 
+fabricApi {
+    configureDataGeneration()
+}
+
 loom {
     accessWidenerPath.set(file("src/main/resources/kibe.accesswidener"))
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@
 org.gradle.jvmargs=-Xmx4G
 
 # Gradle Plugins
-kotlin_version=2.0.0
-loom_version=1.7-SNAPSHOT
+kotlin_version=2.1.0
+loom_version=1.9-SNAPSHOT
 grgit_version=5.0.0
 cursegradle_version=1.4.0
 modrinth_version=2.8.7
@@ -16,17 +16,17 @@ maven_group=io.github.lucaargolo
 # Fabric Properties
 minecraft_version=1.21.1
 yarn_mappings=1.21.1+build.3
-loader_version=0.16.5
+loader_version=0.16.10
 
 # Fabric API
-fabric_version=0.105.0+1.21.1
-fabric_kotlin_version=1.11.0+kotlin.2.0.0
+fabric_version=0.114.0+1.21.1
+fabric_kotlin_version=1.13.0+kotlin.2.1.0
 
 # Libraries
 pal_version=1.10.0
 trinkets_version=3.10.0
-modmenu_version=11.0.2
-rei_version=16.0.783
+modmenu_version=11.0.3
+rei_version=16.0.788
 
 # Publishing
 curseforge_id=388832

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/generated/.cache/57d693d5a5164e98778a1b02a20274468c444f42 b/src/main/generated/.cache/57d693d5a5164e98778a1b02a20274468c444f42
@@ -0,0 +1,59 @@
+// 1.21.1	2025-01-11T07:02:56.143777	Kibe/Block Loot Tables
+00da3269b202ce6ff043adcaeb7a043658394cfa data/kibe/loot_table/blocks/light_gray_elevator.json
+206667674caf8bba9c9f0119c698ed3ac09db1b0 data/kibe/loot_table/blocks/green_elevator.json
+fe36fe9859dba61fc2d70601e0eeb75f5f2e7393 data/kibe/loot_table/blocks/tank.json
+5ccdfce02e3ffa357b425df50600b829007ed790 data/kibe/loot_table/blocks/wither_proof_glass.json
+67860da57d3aa593fc4195a592935eb8579e5751 data/kibe/loot_table/blocks/basalt_generator_mk2.json
+4ad924df09736b2c074bfa7704fff83de7d35cdf data/kibe/loot_table/blocks/lime_elevator.json
+c6d79317ae328e6b9333d111ec4ac498a363624d data/kibe/loot_table/blocks/xp_shower.json
+9ec7fe7895732cb7ad7ee9c779ca0a9f4e37e639 data/kibe/loot_table/blocks/cobblestone_generator_mk1.json
+761183fcb9d392758d28bea4dfc16bcc4665e3df data/kibe/loot_table/blocks/cyan_elevator.json
+90fd07d5f854b2f2cd9c58c113bb427929e1a7a7 data/kibe/loot_table/blocks/cooler.json
+82292f2a0663cbcbe9c227f487d61dd53de4da2c data/kibe/loot_table/blocks/redstone_timer.json
+04d2334154f91aa873b5fbce28d6dbe8e2fc6c8a data/kibe/loot_table/blocks/red_elevator.json
+8d45bafed3128146a5da1593afbfe035c429d75c data/kibe/loot_table/blocks/basalt_generator_mk4.json
+5e45e37a0e54648e465c928471a45ada3c3e4a2d data/kibe/loot_table/blocks/wither_builder.json
+cf71628e43ca85b4c1069694d0746a57f5dbbd09 data/kibe/loot_table/blocks/basalt_generator_mk1.json
+d0a739480489f36ddd09af077cf9f07579511cba data/kibe/loot_table/blocks/diamond_spikes.json
+0c9fa5b7c1d69f4ea9693a6fbdc091998fee321d data/kibe/loot_table/blocks/breaker.json
+a7b12d676b813a97776589264df8b4a8c421312f data/kibe/loot_table/blocks/pink_elevator.json
+28f5d635c5e392a5ca90bbec60c49169c0209448 data/kibe/loot_table/blocks/yellow_elevator.json
+e95ff314a0c2be8d2c0682f10ed18d556a592d51 data/kibe/loot_table/blocks/xp_drain.json
+cc82124547ada545fc03d068fc6385aa43ae5735 data/kibe/loot_table/blocks/cobblestone_generator_mk3.json
+9403ea12abe1a24702b61fc26c7d8707e7ea23b2 data/kibe/loot_table/blocks/light_blue_elevator.json
+c2d6b0e293c5645d27abee80dfee79506dc6c798 data/kibe/loot_table/blocks/trash_can.json
+61b8257f9ad73334d47db90467a5a613c8f9a0fb data/kibe/loot_table/blocks/iron_spikes.json
+a9efdea4519a238cff34eba83e2d9fc8c16520fd data/kibe/loot_table/blocks/black_elevator.json
+ca7499d2dd9adefed9a09fe74fec50bbb824f879 data/kibe/loot_table/blocks/light_source.json
+ddc1c4e1d040de71182c2ace88ac940deba5949f data/kibe/loot_table/blocks/dehumidifier.json
+3fbe59cca5038994e279e0af2f092c09e14e9d8e data/kibe/loot_table/blocks/chunk_loader.json
+9e0c84ab8398f6eab18cfe9eb155a8a9e908933f data/kibe/loot_table/blocks/heater.json
+ae88c0d7c22365a9ba828bba4d38b17f28e5c170 data/kibe/loot_table/blocks/stone_spikes.json
+7b27e2fadd18c5f060c61732dd3aec800269da3c data/kibe/loot_table/blocks/big_torch.json
+0a107037214d11dfd2832e6dfcf8ce70d8052ef4 data/kibe/loot_table/blocks/cursed_dirt.json
+889928445ddbaaa54f96c1007ce85f0e7f590212 data/kibe/loot_table/blocks/orange_elevator.json
+572c64443eea0370a8ab19660fee51182af27cfb data/kibe/loot_table/blocks/wither_proof_sand.json
+f53ce521d723ce8f3f38cbfef13b2ab75bf48d1e data/kibe/loot_table/blocks/igniter.json
+3a1d659f067ef84dad5a664fbd96da6c79b579b6 data/kibe/loot_table/blocks/cobblestone_generator_mk4.json
+fbaafcea4c466fdae8de051f5e52fd2064baf9d9 data/kibe/loot_table/blocks/basalt_generator_mk5.json
+be370d681a994caf5a36296c19b780a4a67ab391 data/kibe/loot_table/blocks/magenta_elevator.json
+d541e3c07e931c44b9a70480a7de084ba10fe630 data/kibe/loot_table/blocks/brown_elevator.json
+f24de7f2a1ffe6689dec1cc284bb1c63dda8a0a1 data/kibe/loot_table/blocks/cobblestone_generator_mk5.json
+82acd8e19b81070431e243d65927ac1a29a4d53d data/kibe/loot_table/blocks/entangled_chest.json
+c4a36e530f2cb86176d5bb89d73ab7a21b0eb45e data/kibe/loot_table/blocks/gray_elevator.json
+d207a49a37fe83ae6e09f12e73920947284f97c5 data/kibe/loot_table/blocks/regular_conveyor_belt.json
+1564ccc747a99bbb198a9be11512bd33c30df4de data/kibe/loot_table/blocks/cobblestone_generator_mk2.json
+bb9b6e2536efdf2faed8ee2c2522c96b6f6d68c8 data/kibe/loot_table/blocks/fast_conveyor_belt.json
+c07b3c749f9af8896ae6655f864dce7d889041c7 data/kibe/loot_table/blocks/gold_spikes.json
+209d2fbde86a983450b23e6a14f1f30fbaef4132 data/kibe/loot_table/blocks/blue_elevator.json
+a5d815f16eaee2b4596abef2077476da12ca1c73 data/kibe/loot_table/blocks/fluid_hopper.json
+18723e9012ea2f9118515c07f9a35ffafc7f8716 data/kibe/loot_table/blocks/white_elevator.json
+1ee5ce0b2f47fd5be3d2d169b048a0147f3d6db0 data/kibe/loot_table/blocks/obsidian_sand.json
+6af680e9742081dc4bfa234b8a30f2385195ceca data/kibe/loot_table/blocks/wither_proof_block.json
+b3a63fd135f4848636812ef39da7ed7851a152a7 data/kibe/loot_table/blocks/purple_elevator.json
+d728797ae8da8a2e699f711edf5552d2f3ea8fcf data/kibe/loot_table/blocks/placer.json
+3d9a45a86aec0f1bc02dd4bc951b5f2069d797a2 data/kibe/loot_table/blocks/vacuum_hopper.json
+2b5f63d061fcd0d0c4806b2656728131a37ebe5e data/kibe/loot_table/blocks/entangled_tank.json
+2349e235ce70e66f24b761f1cbf8128ff52df197 data/kibe/loot_table/blocks/express_conveyor_belt.json
+4ff4ff68f3afee01a6359bf35bd27af48a59cdb3 data/kibe/loot_table/blocks/drawbridge.json
+def5a85cbce7171918c4e5e9e95c91c14b01fab3 data/kibe/loot_table/blocks/basalt_generator_mk3.json
diff --git a/...t_tables/blocks/basalt_generator_mk1.json → ...ot_table/blocks/basalt_generator_mk1.json b/...t_tables/blocks/basalt_generator_mk1.json → ...ot_table/blocks/basalt_generator_mk1.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:basalt_generator_mk1"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...t_tables/blocks/basalt_generator_mk2.json → ...ot_table/blocks/basalt_generator_mk2.json b/...t_tables/blocks/basalt_generator_mk2.json → ...ot_table/blocks/basalt_generator_mk2.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:basalt_generator_mk2"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...t_tables/blocks/basalt_generator_mk3.json → ...ot_table/blocks/basalt_generator_mk3.json b/...t_tables/blocks/basalt_generator_mk3.json → ...ot_table/blocks/basalt_generator_mk3.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:basalt_generator_mk3"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...t_tables/blocks/basalt_generator_mk4.json → ...ot_table/blocks/basalt_generator_mk4.json b/...t_tables/blocks/basalt_generator_mk4.json → ...ot_table/blocks/basalt_generator_mk4.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:basalt_generator_mk4"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...t_tables/blocks/basalt_generator_mk5.json → ...ot_table/blocks/basalt_generator_mk5.json b/...t_tables/blocks/basalt_generator_mk5.json → ...ot_table/blocks/basalt_generator_mk5.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:basalt_generator_mk5"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...ta/kibe/loot_tables/blocks/big_torch.json → ...ata/kibe/loot_table/blocks/big_torch.json b/...ta/kibe/loot_tables/blocks/big_torch.json → ...ata/kibe/loot_table/blocks/big_torch.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:big_torch"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...be/loot_tables/blocks/black_elevator.json → ...ibe/loot_table/blocks/black_elevator.json b/...be/loot_tables/blocks/black_elevator.json → ...ibe/loot_table/blocks/black_elevator.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:black_elevator"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...ibe/loot_tables/blocks/blue_elevator.json → ...kibe/loot_table/blocks/blue_elevator.json b/...ibe/loot_tables/blocks/blue_elevator.json → ...kibe/loot_table/blocks/blue_elevator.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:blue_elevator"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }
diff --git a/...data/kibe/loot_tables/blocks/breaker.json → .../data/kibe/loot_table/blocks/breaker.json b/...data/kibe/loot_tables/blocks/breaker.json → .../data/kibe/loot_table/blocks/breaker.json
@@ -2,18 +2,19 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "kibe:breaker"
         }
       ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
+      "rolls": 1.0
     }
   ]
 }