Finalize 0.8

.github/FUNDING.yml

@@ -1 +1,2 @@
-patreon: srendi
+ko_fi: srendi
+github: SirEndii

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+For now, just a prototype changelog so I don't need to remember/search everything I did
+### Added
+- NBT Hashes for filters and item/fluid properties. Lightweight version of the fingerprints, cc also uses nbt hashes for everything nbt related
+
 ## [1.19.2-0.7.37r] - 2024-10-06
 
 ### Added

README.md

@@ -66,7 +66,7 @@ will close pull requests related to translations.
 [CurseForge]: https://www.curseforge.com/minecraft/mc-mods/advanced-peripherals
 [Actions]: https://github.com/Seniorendi/AdvancedPeripherals/actions
 [Crowdin]: https://crowdin.com/project/advanced-peripherals
-[Discord]: https://discord.com/invite/QuF3hWDtWC
+[Discord]: https://discord.intelligence-modding.de
 [Banner]: https://www.bisecthosting.com/images/CF/Advanced_Peripherals/BH_AP_Header.png 'Advanced Peripherals'
 
 [PeripheralsPlusOne]: https://github.com/rolandoislas/PeripheralsPlusOne

build.gradle

@@ -201,12 +201,12 @@ repositories {
         }
     }
     maven {
-        name = "Modmaven Jei"
+        name = "Modmaven"
         url = 'https://modmaven.dev/'
         content {
-            includeGroup("mezz.jei")
             includeGroup("appeng")
             includeGroup("mekanism")
+            includeGroup("mezz.jei")
         }
     }
     maven {
@@ -246,7 +246,17 @@ repositories {
     maven {
         url = "https://cursemaven.com"
         content {
-            includeGroup "curse.maven"
+            includeGroup("curse.maven")
+        }
+    }
+    maven {
+        url = "https://maven.valkyrienskies.org"
+        content {
+            includeGroup("org.valkyrienskies")
+            includeGroup("org.valkyrienskies.core")
+            includeGroup("com.github.LlamaLad7")
+            includeGroup("com.github.Rubydesic")
+            includeGroup("org.mapstruct")
         }
     }
 }
@@ -313,31 +323,37 @@ dependencies {
     compileOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
     compileOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
     compileOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
-    // IMPORTANT. This should be removed/uncommented when running `runData`
-    runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
-    runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
-    runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
-    runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
-    runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
-
-    //Patchouli
+    // IMPORTANT. This should be removed/commented when running `runData`
+    // Automated now, tho if you are not executing runData directly it's no help
+    if (!project.gradle.startParameter.taskNames.contains("runData")) {
+        runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
+        runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
+        runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
+        runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
+        runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
+    }
+
+    // Patchouli
     compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
     runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
 
     // Create
     compileOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
     runtimeOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
 
-    //Removed until fully ported
-    //testImplementation fg.deobf("site.siredvin.ttoolkit:ttoolkit-${minecraft_version}:${ttoolkit_version}")
+    // DimStorage
+    compileOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
+    compileOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")
+    // runtimeOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
+    // runtimeOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")
 
     //Powah
     compileOnly fg.deobf("curse.maven:powah-633483:${powah_version}")
     runtimeOnly fg.deobf("curse.maven:powah-633483:${powah_version}")
     runtimeOnly fg.deobf("me.shedaniel.cloth:cloth-config-forge:8.2.88")
     runtimeOnly fg.deobf("dev.architectury:architectury-forge:6.2.43")
 
-    // Crash utilities. Used to debug the chunky turtle. Can be uncommented if not needed
+    // Crash utilities. Used to debug the chunky turtle. Can be commented if not needed
     runtimeOnly fg.deobf("curse.maven:crash-utilities-371813:4406293")
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
@@ -352,9 +368,26 @@ dependencies {
     // JEI
     implementation fg.deobf("mezz.jei:jei-${jei_version}")
 
+    // Jade
+    implementation fg.deobf("curse.maven:jade-324717:${jade_version}")
+
     // Create Crafts & Additions
     compileOnly fg.deobf("curse.maven:createaddition-439890:5099757")
     // runtimeOnly fg.deobf("curse.maven:createaddition-439890:5099757")
+
+    // Valkyrien Skies 2
+    compileOnly("org.joml:joml:1.10.4")
+    compileOnly("org.joml:joml-primitives:1.10.0")
+    // compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-common:${vs2_version}")
+    compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
+    compileOnly "org.valkyrienskies.core:api:${vs_core_version}"
+    compileOnly "org.valkyrienskies.core:api-game:${vs_core_version}"
+    compileOnly "org.valkyrienskies.core:util:${vs_core_version}"
+    compileOnly "org.valkyrienskies.core:impl:${vs_core_version}"
+    runtimeOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
+    runtimeOnly fg.deobf("curse.maven:valkyrien-skies-258371:${valkyrien_skies_version}")
+    runtimeOnly fg.deobf("curse.maven:eureka-ships-654384:${eureka_ships_version}")
+    runtimeOnly fg.deobf("curse.maven:clockwork-807792:${clockwork_version}")
 }
 
 
@@ -389,12 +422,12 @@ task setupServer(type: Copy) {
 }
 
 ["Client", "Server"].forEach { name ->
-    tasks.register("test$name", JavaExec.class).configure {
+    tasks.register("test${name}", JavaExec.class).configure {
         it.group('In-game tests')
         it.description("Runs tests on a temporary Minecraft instance.")
-        it.dependsOn(setupServer, "prepareRunTest$name", "cleanTest$name", 'compileTestModJava')
+        it.dependsOn(setupServer, "prepareRunTest${name}", "cleanTest${name}", 'compileTestModJava')
 
-        JavaExec exec = tasks.getByName("runTest$name")
+        JavaExec exec = tasks.getByName("runTest${name}")
         exec.copyTo(it)
         it.setClasspath(exec.getClasspath())
         it.mainClass = exec.mainClass
@@ -433,6 +466,8 @@ jar {
 
 jar.finalizedBy('reobfJar')
 
+compileKotlin.enabled = false
+
 tasks.withType(Checkstyle) {
     reports {
         xml.required = false

config/checkstyle/checkstyle.xml

@@ -37,7 +37,6 @@
         </module>
 
         <!-- Class design. As if we've ever followed good practice here. -->
-        <module name="InterfaceIsType" />
         <module name="MutableException" />
         <module name="OneTopLevelClass" />
 

gradle.properties

@@ -1,52 +1,66 @@
-org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx4G
 org.gradle.logging.level=info
 
 # Minecraft related
 mod_id=advancedperipherals
 # do not include mod_version/minecraft_version with equals sign anywhere else in the file (even in comments)
 # also do not add space around the equal sign
 # since we are using poor grep command to do automation :p
-mod_version=0.7.38r
+mod_version=0.8r
 minecraft_version=1.19.2
 mod_artifact_suffix=
-forge_version=43.3.8
+
+forge_version=43.4.0
 loader_version=43
+
 release_type=release
+
 mappings_channel=parchment
-mappings_version=2022.11.27-1.19.2
-jb_annotations=21.0.1
+mappings_version=2022.11.20-1.19.2
 
 # Test dependencies
-junit_version=5.7.2
 hamcrest_version=2.2
+jb_annotations=21.0.1
+junit_version=5.7.2
 kotlin_version=1.8.0
-kotlinx_coroutines_version=1.6.0-RC3
+kotlinx_coroutines_version=1.7.3
 ttoolkit_version=0.1.3
 
 # Mod dependencies
 cc_version=1.101.3
-curios_version=1.19.2-5.1.4.1
-minecolonies_version=1.19.2-1.1.473-BETA
-appliedenergistics_version=12.9.5
-patchouli_version=1.19.2-77
-refinedstorage_version=1.11.6
+
+ae2additions_version=4646599
+ae2things_version=4367610
+appliedenergistics_version=12.9.12
+appliedmekanistics_version=4734608
 botania_version=1.19.2-440-FORGE
+clockwork_version=5171528
 create_version=0.5.1.f-46
 createca_version=5099757
+curios_version=1.19.2-5.1.4.1
+dimstorage_version=3927875
+eureka_ships_version=5321628
+kotlinforforge_version=3.12.0
 mekanism_version=1.19.2-10.3.9.13
-ae2things_version=4367610
+minecolonies_version=1.19.2-1.1.473-BETA
+patchouli_version=1.19.2-77
 powah_version=4183078
-ae2additions_version=4646599
-kotlinforforge_version=3.12.0
-appliedmekanistics_version=4734608
+refinedstorage_version=1.11.7
+valkyrien_skies_version=4994898
+vs2_version=2.1.2-beta.1+a04911c932
+vs_core_version=1.1.0+2a62e6a823
 
 # Mod dependencies which are needed for other mods
 # For minecolonies
-structurize_version=1.19.2-1.0.649-BETA
-multipiston_version=1.19.2-1.2.21-ALPHA
 blockui_version=1.19.2-0.0.102-ALPHA
 domumornamentum_version=1.19-1.0.141-BETA
+multipiston_version=1.19.2-1.2.21-ALPHA
+structurize_version=1.19.2-1.0.649-BETA
+
+# For DimStorage
+edivadlib_version=3927847
 
-# Mod dependencies for testing stuff(Only used in the dev environment)
-jei_version=1.19.2-forge:11.6.0.1016
+# Mod dependencies for testing stuff (Only used in the dev environment)
+jade_version=4914105
+jei_version=1.19.2-forge:11.6.0.1016

qodana.yaml

@@ -16,7 +16,8 @@ exclude:
       - src/test/resources/*
       - src/testMod/resources/*
       - src/server-files/resources/*
-include:
   - name: CheckDependencyLicenses
+
+include:
   - name: TrivialIf
   - name: NullableProblems

src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b

@@ -0,0 +1,3 @@
+// 1.19.2	2025-01-20T07:59:27.474151	Tags for minecraft:item
+de4b4f45ec18b2b1f0db1c36882981042e20ee23 data/advancedperipherals/tags/items/p2p_attunements/cable_p2p_tunnel.json
+72eba3b11f69e16c87488f7c4ba7cfdad42c378e data/advancedperipherals/tags/items/smart_glasses.json

src/generated/resources/.cache/2db41954e490230d51b10affff25ee2ee27b8d5b

@@ -1,2 +1,2 @@
-// 1.19.2	2023-07-19T14:31:39.6951106	AP POI Type Tags
+// 1.19.2	2024-05-28T14:53:16.655175	AP POI Type Tags
 d3d6b837660a4e213f287ad9d11e12368b90cd8e data/minecraft/tags/point_of_interest_type/acquirable_job_site.json

src/generated/resources/.cache/5a761efb7472ef97566e41e81451930a004134bf

@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-19T14:31:39.6751301	Turtle Upgrades
+// 1.19.2	2024-05-28T14:53:16.655476	Turtle Upgrades
 b8f19ae0fb5bb898facc08e3787e0f96c8211881 data/advancedperipherals/computercraft/turtle_upgrades/chatty_turtle.json
 fe98c60e7d61139aacf2d0872873e610aac8a37b data/advancedperipherals/computercraft/turtle_upgrades/chunky_turtle.json
 ae619da638ad89d7302d832d6c09e2c87401c539 data/advancedperipherals/computercraft/turtle_upgrades/compass_turtle.json
@@ -10,4 +10,5 @@ c9b2df2d4fed11f60a8e6f8da77b2fa53dd13572 data/advancedperipherals/computercraft/
 42fc2b9a2601ef44d617cb18302c2c4fff31d282 data/advancedperipherals/computercraft/turtle_upgrades/overpowered_husbandry_automata.json
 fa7743922ef6b4dd3e633f2857e4047d533f13b5 data/advancedperipherals/computercraft/turtle_upgrades/overpowered_weak_automata.json
 4054c59ceb099f17c4555fd5f36b2f8b4109f624 data/advancedperipherals/computercraft/turtle_upgrades/player_turtle.json
+fa6624d0dab03bd26c2cccecad51848d5071ecd3 data/advancedperipherals/computercraft/turtle_upgrades/saddle_turtle.json
 c8059a2717cfac5b02898658c4d2d52fbd5710d4 data/advancedperipherals/computercraft/turtle_upgrades/weak_automata.json

src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2

@@ -1,14 +1,17 @@
-// 1.19.2	2024-01-15T20:01:57.516745	LootTables
-d865e8ac35302c486faf5c7122569c554186186d data/advancedperipherals/loot_tables/blocks/block_reader.json
-a6f896cc3dbd8da12737825ec71e32970f54025c data/advancedperipherals/loot_tables/blocks/chat_box.json
-f50f506ae1987537f76be4c05a81689b25798f91 data/advancedperipherals/loot_tables/blocks/colony_integrator.json
-1d1b858d09538dc66bab2c33a2f9c58361a9c472 data/advancedperipherals/loot_tables/blocks/energy_detector.json
-317004b1358ef9bf83957d2d6796529a226161c7 data/advancedperipherals/loot_tables/blocks/environment_detector.json
-d5a3964f518b138cbd7305c819a36af3d9340e4a data/advancedperipherals/loot_tables/blocks/geo_scanner.json
-8aa1deea908fd02f049e047c8ca16679bbef68a2 data/advancedperipherals/loot_tables/blocks/inventory_manager.json
-9a2898a63e2e0c087ce8eba211c63d1c8b9fd4aa data/advancedperipherals/loot_tables/blocks/me_bridge.json
-973770040bacb61482adb9739fd1d977f16c107f data/advancedperipherals/loot_tables/blocks/nbt_storage.json
-b4b80e8c9d62b53d9252cdfc5918c077d3a01f6e data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
-58b6adbea5d4ae43ed9af0b627df2b8a4907acde data/advancedperipherals/loot_tables/blocks/player_detector.json
-a58aebcc52684302968e7af4f50a12aff93aaf2d data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
-0ef1678f88b8fcb744bfd95261f66745340be8f4 data/advancedperipherals/loot_tables/blocks/rs_bridge.json
+// 1.19.2	2025-01-16T15:46:41.860623	LootTables
+618b63c020ab64890c8a2d2506dd61cd30259a44 data/advancedperipherals/loot_tables/blocks/block_reader.json
+0923665563d05307a7fa7d711a2d7a994a31eb6e data/advancedperipherals/loot_tables/blocks/chat_box.json
+bf2a80256cfba0bd8c0283d493882e5816882f1f data/advancedperipherals/loot_tables/blocks/colony_integrator.json
+cff4b81aa381bc0d1172b0a4c8bb35c1b954a018 data/advancedperipherals/loot_tables/blocks/distance_detector.json
+1c5dbe1a8e07e040a3c2893a002cd535ee41dc20 data/advancedperipherals/loot_tables/blocks/energy_detector.json
+8cc03eca1d191f725bc558836f26a85a466cb127 data/advancedperipherals/loot_tables/blocks/environment_detector.json
+12589e7642b383029457d97a64637494ea8507a3 data/advancedperipherals/loot_tables/blocks/fluid_detector.json
+421a3ece56485bd46374844639bfd606ce4665ec data/advancedperipherals/loot_tables/blocks/gas_detector.json
+a2ae352dce564b878daecf47026f268dd432fbcf data/advancedperipherals/loot_tables/blocks/geo_scanner.json
+807d449d02c0af701f84d3e806ebac20d3a1f91c data/advancedperipherals/loot_tables/blocks/inventory_manager.json
+bb9b442dfad1d5f31397585c8394c85243fa169a data/advancedperipherals/loot_tables/blocks/me_bridge.json
+52b1fe2e265be456ebf48d7e0d9ebcc8c994176f data/advancedperipherals/loot_tables/blocks/nbt_storage.json
+2651e6053857a31f5bccc360969924848a197ad5 data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
+6b5058b6bc49689bf2b858b89f3981a4bb681750 data/advancedperipherals/loot_tables/blocks/player_detector.json
+6af6542c7b64aa22dbfcdb01299daf4911827a49 data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
+b221c6a82da0875264a112b54f847ac6a1f36797 data/advancedperipherals/loot_tables/blocks/rs_bridge.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,5 @@
-// 1.19.2	2024-01-15T20:01:57.5157458	Recipes
+// 1.19.2	2024-05-28T14:53:16.657381	Recipes
+045608027e4a5ea2d7dee7f402346b8e69f21675 data/advancedperipherals/advancements/recipes/advancedperipheralstab/armor/smart_glasses_netherite.json
 db2dada2fdf42ca1bbf47f1eb075d1f9de89dfa8 data/advancedperipherals/advancements/recipes/advancedperipheralstab/block_reader.json
 77c55e8500be4a344ca563a8bf7642257cdc7b8b data/advancedperipherals/advancements/recipes/advancedperipheralstab/chat_box.json
 96208b06b0c3c125762cd517506a5ffb6b1d55ac data/advancedperipherals/advancements/recipes/advancedperipheralstab/chunk_controller.json
@@ -16,6 +17,7 @@ d27c1267208fd9036c5c45f7f6cbd4f6f67b3845 data/advancedperipherals/advancements/r
 d8870644bb7d48c5ae33dcea2afbcfa106729d7b data/advancedperipherals/advancements/recipes/advancedperipheralstab/player_detector.json
 7acff70533792bd089a655f8f24cdea6995aac0c data/advancedperipherals/advancements/recipes/advancedperipheralstab/redstone_integrator.json
 fc0c3d99bec43318802f357083c7d98fde92567f data/advancedperipherals/advancements/recipes/advancedperipheralstab/weak_automata_core.json
+66999fea36aa4113567753f104630f6490dda6ba data/advancedperipherals/recipes/armor/smart_glasses_netherite.json
 b10b5cbcc668438001744d5b90d9838ab4d293cb data/advancedperipherals/recipes/block_reader.json
 3c9618832fe0ac32cac0f04fbc5afad225418239 data/advancedperipherals/recipes/chat_box.json
 a78adfcca4c7579b143aac5648a7eca9085c0dba data/advancedperipherals/recipes/chunk_controller.json
@@ -25,8 +27,8 @@ f1f468c732f8c802c27776d3fd7aac432bcac8e3 data/advancedperipherals/recipes/comput
 55c257e4e8548d1453a7ab96c547d64c22b3e1d6 data/advancedperipherals/recipes/environment_detector.json
 2ddf64c122165bcd3a277db8a1c7e96b4d510c67 data/advancedperipherals/recipes/geo_scanner.json
 ebe70aa9fe80c5b962c13aa1fbadc32269ba81b9 data/advancedperipherals/recipes/inventory_manager.json
-809bc6929cf5eab72648e8f1fb565b58749fec12 data/advancedperipherals/recipes/memory_card.json
 82895838af6c6aea0c60e3a3fbf71073ab684167 data/advancedperipherals/recipes/me_bridge.json
+809bc6929cf5eab72648e8f1fb565b58749fec12 data/advancedperipherals/recipes/memory_card.json
 8a73c4eb66e7a1cdc8e51d33466cf5a30da9270e data/advancedperipherals/recipes/nbt_storage.json
 360432f30d61291066aa8c54692629f7a92e178d data/advancedperipherals/recipes/overpowered_end_automata_core.json
 4ea6e90d13a61d90ad245539d20020ff9cb843e1 data/advancedperipherals/recipes/overpowered_husbandry_automata_core.json

src/generated/resources/.cache/ae219fa7c7d3297c14e454863eac3998a4eab78c

@@ -1,6 +1,7 @@
-// 1.19.2	2023-07-19T14:31:39.6815264	Pocket Computer Upgrades
+// 1.19.2	2025-01-25T19:46:21.23515	Pocket Computer Upgrades
 b672635324c0df354e587efc81d0b19a581eae2f data/advancedperipherals/computercraft/pocket_upgrades/chatty_pocket.json
 30b8f663613c7ce77048fd69631afcc11a682276 data/advancedperipherals/computercraft/pocket_upgrades/colony_pocket.json
+661dc77bd0442bfb2a5ed80cff271071817bb22d data/advancedperipherals/computercraft/pocket_upgrades/distance_pocket.json
 d4647159c2f2693a9c5e8d12bf740635751d29a8 data/advancedperipherals/computercraft/pocket_upgrades/environment_pocket.json
 8216a0a7d8ebe3ae738c8fc3626df25eb0a2e07a data/advancedperipherals/computercraft/pocket_upgrades/geoscanner_pocket.json
 a38aa83593f7ad0ace98e01bb3b5f06f272ef734 data/advancedperipherals/computercraft/pocket_upgrades/player_pocket.json