Merge pull request Ladysnake#663 from mrsterner/1.20

1.20.1 Update
Redfan2 · Jun 16, 2024 · be4ec79 · be4ec79
2 parents e31d647 + cb79509
commit be4ec79
Show file tree

Hide file tree

Showing 586 changed files with 1,059 additions and 741 deletions.
diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
@@ -16,9 +16,10 @@ jobs:
         runs-on: ${{ matrix.os }}
         steps:
             - name: checkout repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
               with:
-                filter: tree:0
+                  fetch-depth: 0
+                  filter: 'blob:none'
             - name: validate gradle wrapper
               uses: gradle/wrapper-validation-action@v1
             - name: setup jdk ${{ matrix.java }}

diff --git a/build.gradle b/build.gradle
@@ -183,7 +183,8 @@ dependencies {
     modCompileOnly (compatLibs.trinkets) { transitive = false }
 //    modLocalRuntime compatLibs.trinkets
     modCompileOnly (compatLibs.pehkui) { transitive = false }
-//    modLocalRuntime compatLibs.pehkui
+//    modApi (compatLibs.pehkui) { transitive = false }
+
     modCompileOnly (compatLibs.snowmercy) { transitive = false }
 //    modLocalRuntime compatLibs.snowmercy
     modCompileOnly (compatLibs.bundles.origins) { transitive = false }
@@ -195,14 +196,15 @@ dependencies {
 
     modCompileOnly (compatLibs.eldritchMobs) { transitive = false }
 //    modLocalRuntime compatLibs.eldritchMobs
-    modCompileOnly (compatLibs.haema) { transitive = false }
+//    modCompileOnly (compatLibs.haema) { transitive = false }
 //    modLocalRuntime compatLibs.bundles.haema
     modCompileOnly (compatLibs.golemsGalore) { transitive = false }
 //    modLocalRuntime compatLibs.bundles.golemsGalore
     modCompileOnly (compatLibs.bumblezone) { transitive = false }
 //    modLocalRuntime compatLibs.bumblezone
     modCompileOnly (compatLibs.bewitchment) { transitive = false }
-//    modLocalRuntime compatLibs.bundles.bewitchment
+    modLocalRuntime (compatLibs.bundles.bewitchment) { transitive = false }
+//    modApi("com.github.Virtuoel:Pehkui:${compatLibs.pehkui}")
     modLocalImplementation (compatLibs.trinkets) {
         exclude group: "net.fabricmc"
         exclude group: "net.fabricmc.fabric-api"

diff --git a/expansions/pandemonium/build.gradle b/expansions/pandemonium/build.gradle
@@ -11,7 +11,6 @@ dependencies {
     modCompileOnly libs.modmenu
     modCompileOnly libs.bundles.cloth
     modCompileOnly (compatLibs.origins) { transitive = false }
-    modCompileOnly compatLibs.haema
 }
 
 jar {

diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/Pandemonium.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/Pandemonium.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/PandemoniumRequiemPlugin.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/PandemoniumRequiemPlugin.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/client/ClientMessageHandling.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/client/ClientMessageHandling.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/client/PandemoniumClient.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/client/PandemoniumClient.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/PandemoniumConfig.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/PandemoniumConfig.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/...sions/pandemonium/src/main/java/ladysnake/pandemonium/common/block/PandemoniumBlocks.java b/...sions/pandemonium/src/main/java/ladysnake/pandemonium/common/block/PandemoniumBlocks.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/...ns/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/PandemoniumEntities.java b/...ns/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/PandemoniumEntities.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/...um/src/main/java/ladysnake/pandemonium/common/entity/effect/PandemoniumStatusEffects.java b/...um/src/main/java/ladysnake/pandemonium/common/entity/effect/PandemoniumStatusEffects.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/item/PandemoniumItems.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/item/PandemoniumItems.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ public final class PandemoniumItems {
 
     public static void init() {
         registerItem(PandemoniumItems.BALEFUL_SOUL_VESSEL, "baleful_soul_vessel");
-        ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS.getId()).register(entries -> entries.addItem(BALEFUL_SOUL_VESSEL));
+        ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS_AND_UTILITIES).register(entries -> entries.addItem(BALEFUL_SOUL_VESSEL));
     }
 
     public static <T extends Item> void registerItem(T item, String name) {

diff --git a/...pandemonium/src/main/java/ladysnake/pandemonium/common/network/ServerMessageHandling.java b/...pandemonium/src/main/java/ladysnake/pandemonium/common/network/ServerMessageHandling.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/...ndemonium/src/main/java/ladysnake/pandemonium/common/remnant/PandemoniumRemnantTypes.java b/...ndemonium/src/main/java/ladysnake/pandemonium/common/remnant/PandemoniumRemnantTypes.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/...ions/pandemonium/src/main/java/ladysnake/pandemonium/compat/PandemoniumModMenuCompat.java b/...ions/pandemonium/src/main/java/ladysnake/pandemonium/compat/PandemoniumModMenuCompat.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/gradle/compat-libs.versions.toml b/gradle/compat-libs.versions.toml
@@ -1,38 +1,39 @@
 [versions]
 acu = "3.3.1"
-aea = "8d8c414"
+aea = "1.7.4+1.20.0"
 amecs = "1.1.5+mc21w16a"
 autoconfig = "3.2.2"
-apoli = "2.7.1"
+apoli = "2.9.0"
 backslot = "3476614"
 betterGraves = "0.4.0"
-bewitchment = "3637935" # v1.18-9
+bewitchment = "5205373" # v1.18-9
 biomeMakeover = "3634309" # v1.18.1-1.4.4
 bumblezone = "3646901" # v4.3.1
-calio = "1.9.0"
-collective = "4399626" # 6.48
+calio = "1.11.0"
+collective = "5378112" # 7.61
 eldritchMobs = "v1.12.6"
 fallflyinglib = "3.0.0-beta.2"
 flk = "1.6.0+kotlin.1.5.0"
 golemsGalore = "3328376" # v1.0.0+mc1.17
-haema = "1.9.9+1.18.2"
+kano="0.4.1"
 libgui = "3.3.5+1.16.5"
+midnightlib="1.4.1-fabric"
 mobz = "3498091"
 omegaConfig = "1.2.1-1.18.1"
-origins = "1.8.1"
-patchouli = "1.18-61-FABRIC-SNAPSHOT"
-pehkui = "3.1.0"
+origins = "1.10.0"
+patchouli = "1.20.1-84-FABRIC"
+pehkui = "3.7.8"
 reach = "2.1.1"
-shea = "1.0.1"
+shea = "1.2.0"
 snowmercy = "2.0.1"
 somnus = "0.0.14-1.17.1"
 structurized = "1.4.0+1.18"
-trinkets = "3.5.0"
-wood = "2.0.2"
+trinkets = "3.7.2"
+wood = "7.0.3"
 
 [libraries]
 apoli =         { group = "com.github.apace100",     name = "apoli", version.ref = "apoli" }
-additionalEntityAttributes = { module = "com.github.DaFuqs:AdditionalEntityAttributes", version.ref = "aea" }
+additionalEntityAttributes = { group = "maven.modrinth", name = "AdditionalEntityAttributes", version.ref = "aea" }
 betterGraves =  { group = "io.github.CerulanLumina", name = "better-graves", version.ref = "betterGraves"}
 bewitchment =   { group = "curse.maven",             name = "bewitchment-394915", version.ref = "bewitchment"}
 biomeMakeover = { group = "curse.maven",             name = "biome-makeover-412182", version.ref = "biomeMakeover" }
@@ -42,21 +43,21 @@ collective =    { group = "curse.maven", name = "collective-342584", version.ref
 eldritchMobs =  { group = "maven.modrinth",   name = "eldritch-mobs", version.ref = "eldritchMobs" }
 flk =           { group = "net.fabricmc",            name = "fabric-language-kotlin", version.ref = "flk" }
 golemsGalore =  { group = "curse.maven",             name = "golems-galore-387197", version.ref = "golemsGalore" }
-haema =         { group = "com.williambl.haema",     name = "haema", version.ref = "haema" }
 libgui =        { group = "io.github.cottonmc",      name = "LibGui", version.ref = "libgui" }
+midnightlib =   { module = "maven.modrinth:midnightlib", version.ref = "midnightlib"}
 mobz =          { group = "curse.maven",             name = "mobz-336554", version.ref = "mobz" }
 omegaConfig =   { group = "com.github.Draylar.omega-config", name = "omega-config-base", version.ref = "omegaConfig" }
 origins =       { group = "maven.modrinth",     name = "origins", version.ref = "origins" }
 patchouli =     { group = "vazkii.patchouli",        name = "Patchouli", version.ref = "patchouli" }
 pehkui =        { module= "com.github.Virtuoel:Pehkui", version.ref = "pehkui" }
+kano_config =   { module= "com.github.Virtuoel:KanosConfig", version.ref = "kano"}
 snowmercy =     { module = "io.github.ladysnake:Snow-Mercy", version.ref = "snowmercy" }
 stepHeightEntityAttributes = { module = "com.github.emilyploszaj:step-height-entity-attribute", version.ref = "shea" }
 structurized =  { module = "com.github.Frqnny:structurized", version.ref = "structurized" }
 trinkets =      { module = "dev.emi:trinkets", version.ref = "trinkets" }
 woodApi =       { module = "com.terraformersmc.terraform-api:terraform-wood-api-v1", version.ref = "wood" }
 
 [bundles]
-bewitchment = ["bewitchment", "stepHeightEntityAttributes", "patchouli", "pehkui", "trinkets", "woodApi"]
-haema = ["haema", "patchouli", "flk"]
+bewitchment = ["bewitchment", "stepHeightEntityAttributes", "patchouli", "pehkui", "kano_config", "midnightlib", "trinkets", "woodApi"]
 golemsGalore = ["golemsGalore", "structurized"]
 origins = ["apoli", "calio", "origins"]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 automatone = "0.11.0"
-blabber = "1.4.4-mc1.20.1-SNAPSHOT"
+blabber = "1.5.1-mc1.20.1"
 cca = "5.2.2"
 chenille = "0.12.0"
 chime = "cec3bcbaed508eb5f564deac8c33923dcccfdf7e"

diff --git a/gradle/test-libs.versions.toml b/gradle/test-libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-elmendorf = "0.12.0"
+elmendorf = "0.11.0"
 junit = "4.13.2"
 mockito = "4.2.0"
 
 [libraries]
-elmendorf = { group = "org.ladysnake", name = "elmendorf", version.ref = "elmendorf" }
+elmendorf = { group = "io.github.ladysnake", name = "elmendorf", version.ref = "elmendorf" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/RequiemApi.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/RequiemApi.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/RequiemPlayer.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/RequiemPlayer.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/RequiemPlugin.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/RequiemPlugin.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/annotation/AccessedThroughReflection.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/annotation/AccessedThroughReflection.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/annotation/CalledThroughReflection.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/annotation/CalledThroughReflection.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/annotation/FieldsAreNonnullByDefault.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/annotation/FieldsAreNonnullByDefault.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/...-api/src/main/java/ladysnake/requiem/api/v1/annotation/MethodsReturnNonnullByDefault.java b/...-api/src/main/java/ladysnake/requiem/api/v1/annotation/MethodsReturnNonnullByDefault.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/ObeliskDescriptor.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/ObeliskDescriptor.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/ObeliskEffectRune.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/ObeliskEffectRune.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/ObeliskRune.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/ObeliskRune.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/VagrantTargetableBlock.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/block/VagrantTargetableBlock.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/CurableEntityComponent.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/CurableEntityComponent.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/ExternalJumpingMount.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/ExternalJumpingMount.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/InventoryLimiter.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/InventoryLimiter.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/InventoryPart.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/InventoryPart.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/InventoryShape.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/InventoryShape.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/MovementAlterer.java b/requiem-api/src/main/java/ladysnake/requiem/api/v1/entity/MovementAlterer.java
@@ -1,6 +1,6 @@
 /*
  * Requiem
- * Copyright (C) 2017-2023 Ladysnake
+ * Copyright (C) 2017-2024 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public