Merge pull request #9 from Leialoha/1.20

v0.3.0-1.20 - Porting to 1.20

build.gradle

@@ -14,17 +14,18 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
+    id 'org.spongepowered.mixin' version '0.7.+'
     id 'maven-publish'
 }
-apply plugin: 'org.spongepowered.mixin'
+// apply plugin: 'org.spongepowered.mixin'
 
 // apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'
 
 version = mod_version
 group = mod_group_id
 
 base {
-    archivesName = "${mod_id}-${mod_version}"
+    archivesName = "${mod_id}-${minecraft_version}"
 }
 
 // Mojang ships Java 8 to end users in 1.16-.
@@ -214,6 +215,9 @@ dependencies {
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
+    // Apply Mixin AP
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
     compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
@@ -230,23 +234,29 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
     //Project MMO
-    compileOnly fg.deobf("curse.maven:project-mmo-${pmmo_version}")
+    // compileOnly fg.deobf("curse.maven:project-mmo-${pmmo_version}")
     //runtimeOnly fg.deobf("curse.maven:project-mmo:${pmmo_version}")
 
     // Mekanism
-    compileOnly "mekanism:Mekanism:${mekanism_version}:api"
+    // compileOnly "mekanism:Mekanism:${mekanism_version}:api"
 
     // If you want to test/use Mekanism & its modules during `runClient` invocation, use the following
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}")// core
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:additions")// Mekanism: Additions
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:generators")// Mekanism: Generators
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:tools")// Mekanism: Tools
+    // runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}")// core
+    // runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:additions")// Mekanism: Additions
+    // runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:generators")// Mekanism: Generators
+    // runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:tools")// Mekanism: Tools
 
     implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-${minecraft_version}:${gamestages_version}")
     implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-${minecraft_version}:${bookshelf_version}")
     // compileOnly fg.deobf("net.darkhax.bookshelf:Bookshelf-Common-${minecraft_version}:${bookshelf_version}")
 }
 
+mixin {
+    // MixinGradle Settings
+    add sourceSets.main, 'cuboidmod.refmap.json'
+    config 'cuboidmod.mixins.json'
+}
+
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.

gradle.properties

@@ -8,24 +8,24 @@ org.gradle.daemon=false
 
 # The Minecraft version must agree with the Forge version to get a valid artifact
 mapping_channel=official
-minecraft_version=1.19.2
-minecraft_version_range=[1.19,1.20)
+minecraft_version=1.20.1
+minecraft_version_range=[1.20,1.21)
 
-forge_version=43.3.0
-forge_version_range=[43,)
+forge_version=47.2.0
+forge_version_range=[47,)
 
 ## Mod Properties
 mod_id=cuboidmod
 mod_name=CuboidDroid's Support Mod
 mod_license=All Rights Reserved
-mod_version=0.2.8
+mod_version=0.3.0-Indev.13
 mod_group_id=com.cuboiddroid.cuboidmod
 mod_authors=CuboidDroid, Leialoha
 
 ## Dependency Properties
-jei_version=11.6.0.1019
-pmmo_version=353935:4630715
-mekanism_version=1.19.2-10.3.9.13
-gamestages_version=11.1.4
-gamestages_version_range=[11,)
-bookshelf_version=16.3.20
+jei_version=15.3.0.4
+pmmo_version=353935:5249087
+mekanism_version=1.20.1-10.4.6.20
+gamestages_version=15.0.1
+gamestages_version_range=[15,)
+bookshelf_version=20.1.10

src/generated/resources/.cache/1831d5c174a2e5d234406a6386e9f4de74fcf295

@@ -0,0 +1,43 @@
+// 1.20.1	2024-05-01T14:56:54.4586729	Tags for minecraft:block mod id cuboidmod
+089954857dc856af8d77f71c1cfce2cb05056635 data/cuboidmod/tags/blocks/furnaces/eumus.json
+70bb7857b11a8b10b040b14136d1726d0f697069 data/cuboidmod/tags/blocks/furnaces/kudbebedda.json
+c6d5f1acc85e74791fda23ccb40fa51d791b3c6e data/cuboidmod/tags/blocks/furnaces/notarfbadium.json
+019db0a46dde846ed26784cb22ad6bdd5169c8c7 data/cuboidmod/tags/blocks/furnaces/notsogudium.json
+d6d927255b49399f978afe6879e646a01616dd64 data/cuboidmod/tags/blocks/furnaces/thatldu.json
+a0d4c1728424ebada05df18302694b4710e25cdf data/cuboidmod/tags/blocks/furnaces/wikidium.json
+aa4cc8c022df504530cefc20e0695cfd3a0562e7 data/cuboidmod/tags/blocks/needs_kudbebedda_tool.json
+ff29c74674439bbe9fe2ab1ee591c85adf931b4d data/cuboidmod/tags/blocks/needs_notarfbadium_tool.json
+8d26f60b00fca42e8416b3851608a546f6f1b8cf data/cuboidmod/tags/blocks/needs_notsogudium_tool.json
+df003e3cbb282458806957969fb47733d249f8b0 data/cuboidmod/tags/blocks/needs_wikidium_tool.json
+6a85da5ddd96e2528b4380ef100eb09b114a0668 data/forge/tags/blocks/chests.json
+2fe2bbc5a84d60397fcf377013360dffd96a8dab data/forge/tags/blocks/chests/kudbebedda.json
+a2ee7b50fbb9b2d07d0cd2e7bda3e7482377b5f6 data/forge/tags/blocks/chests/notarfbadium.json
+ad73f6c1bbbe0ee9221df9575cecc85cdd8bcf82 data/forge/tags/blocks/chests/notsogudium.json
+3eca6ba862e4f19d1a784340b6c52744ecbc0549 data/forge/tags/blocks/chests/thatldu.json
+cbdc9392325e216346d4dbd39a923c3a6a5a84e1 data/forge/tags/blocks/chests/wikidium.json
+d565644cd7ac61d34bc246117b8f209c9a696cf2 data/forge/tags/blocks/crafting_tables/kudbebedda.json
+56ff66ec8f8ce31b548a8b24ea43d0e6f788c2d9 data/forge/tags/blocks/crafting_tables/notarfbadium.json
+0137573a1a31f241dc429bf284423e389c6f24ae data/forge/tags/blocks/crafting_tables/notsogudium.json
+7a7b0b60960e290ddb4764339fdf2ba4ea8d89d0 data/forge/tags/blocks/crafting_tables/thatldu.json
+7e8df7688014c80d73468b55c18b7f5dc18e9af5 data/forge/tags/blocks/crafting_tables/wikidium.json
+b662bb9181cfbe3622c877dd10dc8fa89e8447ce data/forge/tags/blocks/needs_wood_tool.json
+d70ff4d025b6d10856396248e1d996a2c7d34688 data/forge/tags/blocks/ores.json
+656e241e3d55d7c3a3d6c9a3765ee52c475b5662 data/forge/tags/blocks/ores/kudbebedda.json
+e1da5998b51d1b938629fa8ad634c28c619fee79 data/forge/tags/blocks/ores/notarfbadium.json
+c215084651bf6a3b7b182f8606c545b415b883ec data/forge/tags/blocks/ores/notsogudium.json
+b66faee0e05f6955d6c055dcd998322d7c7e7e26 data/forge/tags/blocks/ores/thatldu.json
+738df3472e4c8427fa8345edbaf8639ec077572b data/forge/tags/blocks/ores/wikidium.json
+73f2c9bfb6e55a8d12b5095404204838c590c866 data/forge/tags/blocks/storage_blocks.json
+824dbe601299d56d563ae95b80fc9dc317e61f24 data/forge/tags/blocks/storage_blocks/carbon_nanotube.json
+f290e1550572555dde4686d2c89375d973445bc7 data/forge/tags/blocks/storage_blocks/cellulose.json
+434138fa526f8b707a5dd620fb35feffa911de06 data/forge/tags/blocks/storage_blocks/kudbebedda.json
+b468ec8ec2a3aaedb1b1008b54f35fb2d38c0c13 data/forge/tags/blocks/storage_blocks/notarfbadium.json
+671f983b34fbd7658070caf743247bf78dbb8d66 data/forge/tags/blocks/storage_blocks/notsogudium.json
+87b2584b2857aadc627e11861737f62ae9e15f42 data/forge/tags/blocks/storage_blocks/protein_fiber.json
+0ee774f5ee9e966627975b9f71c2c20ba3db764d data/forge/tags/blocks/storage_blocks/protein_paste.json
+9f38ed993437d5586b86a3e85a05815406949bde data/forge/tags/blocks/storage_blocks/silica.json
+869a980902ae7bcc7f6630cf9bfd438f2915caaf data/forge/tags/blocks/storage_blocks/thatldu.json
+36dd1e561e8b9527fa9608a96f91fc00b941927b data/forge/tags/blocks/storage_blocks/wikidium.json
+90db11b187a9877c5a12fd0b2b6528a7782f6575 data/minecraft/tags/blocks/mineable/axe.json
+3f44a901553159cdd09d9f076a004d70ebdf78ac data/minecraft/tags/blocks/mineable/pickaxe.json
+ccd1b3b2564708a8512a7060271bc86d2c430d86 data/minecraft/tags/blocks/mineable/shovel.json

src/generated/resources/.cache/2efe03a7ab1d85e2fd577f1a90f87e97ae61a22d

@@ -0,0 +1,60 @@
+// 1.20.1	2024-05-02T01:04:59.0732254	Block Models: cuboidmod
+9ce598d645dba76f457ab13efe4938ae91f25033 assets/cuboidmod/models/block/cryogenic_dimensional_teleporter.json
+fdc4be4fa41459fae0014f2c1f76972844f250c8 assets/cuboidmod/models/block/cryogenic_dimensional_teleporter_lit.json
+67a25737dc43809a6e7b0c8f98c7dea46415b0fb assets/cuboidmod/models/block/fiber_optic_tree.json
+7a07d3a161ba3af9493ee8f0047dadcc3c3658df assets/cuboidmod/models/block/fiber_optic_tree_1.json
+cb0753f476f545ea163863b3f3009a88c5fe562b assets/cuboidmod/models/block/fiber_optic_tree_10.json
+f0b07e493a087c496431f914af3eaa74d5b88054 assets/cuboidmod/models/block/fiber_optic_tree_11.json
+4b68a19abf1b719b9ec72aa6b9f265d369020b1b assets/cuboidmod/models/block/fiber_optic_tree_12.json
+80da4876520b56cecf2f0e305837e0f3a7e5908e assets/cuboidmod/models/block/fiber_optic_tree_13.json
+ba64987c753034219107d7c0139ba54230049d2f assets/cuboidmod/models/block/fiber_optic_tree_14.json
+dbfb65be1800b9dee703cba2d7e57fd57728c88e assets/cuboidmod/models/block/fiber_optic_tree_15.json
+d1463bd099d3c8421cf89d07129618501e446208 assets/cuboidmod/models/block/fiber_optic_tree_2.json
+5c10ca7394ac995ec45af165c33edac061a7485b assets/cuboidmod/models/block/fiber_optic_tree_3.json
+096a33383299b3ee80f6bb065d49d8fae8671b6c assets/cuboidmod/models/block/fiber_optic_tree_4.json
+7030731b3640b2af8093a89faedc189c15e342e5 assets/cuboidmod/models/block/fiber_optic_tree_5.json
+aabc688e36bbd6151ce0209d2c8797743019327e assets/cuboidmod/models/block/fiber_optic_tree_6.json
+8a8480baaacc555cd14ec442ded2f80eaee18eb7 assets/cuboidmod/models/block/fiber_optic_tree_7.json
+3a6908865bf321184258f5d0090d9d46e079ffbb assets/cuboidmod/models/block/fiber_optic_tree_8.json
+741cadef220b3b14ef31b9819f25ea1d4851ce4c assets/cuboidmod/models/block/fiber_optic_tree_9.json
+84471b1c3471ec63a6fab553232e7d1e1e7d9385 assets/cuboidmod/models/block/kudbebedda_chest.json
+1eb2a178df4049581c057918516dca0911d31366 assets/cuboidmod/models/block/kudbebedda_quantum_collapser.json
+680543d3c0679515e09ee66ca56b0cc4deac8dfb assets/cuboidmod/models/block/kudbebedda_quantum_collapser_lit.json
+2106d0c72e1bd4b633cf52720d2c9ca232e8c00f assets/cuboidmod/models/block/kudbebedda_singularity_power_generator.json
+6e4a5c44f27821e5e61fa514a84c53c3b684bfe0 assets/cuboidmod/models/block/kudbebedda_singularity_power_generator_lit.json
+84d2aa80f3c3af31ba14d8685df12e0d5d945d55 assets/cuboidmod/models/block/kudbebedda_singularity_resource_generator.json
+217489fcdb1f81efcfb48a78b16136b9a4782d29 assets/cuboidmod/models/block/kudbebedda_singularity_resource_generator_lit.json
+4f84344abefbbb1f603fe40a40b9a8ff2615e92f assets/cuboidmod/models/block/molecular_recycler.json
+593684d93e338c8022a548e1cd7a25387a950a42 assets/cuboidmod/models/block/molecular_recycler_lit.json
+6cb5b5df4a494653a320caa1e5856e44828aee1c assets/cuboidmod/models/block/notarfbadium_chest.json
+191a315b578c8e80e3b2d518de9b949eee44be79 assets/cuboidmod/models/block/notarfbadium_quantum_collapser.json
+e23ad5dc5ac7b638c55b1270f7cf127e61ed7667 assets/cuboidmod/models/block/notarfbadium_quantum_collapser_lit.json
+bd6734f3b5b63763fd7077cdf88aa120a12f08f8 assets/cuboidmod/models/block/notarfbadium_singularity_power_generator.json
+5d23139a9433b79c6adab270967501da5a70d3c7 assets/cuboidmod/models/block/notarfbadium_singularity_power_generator_lit.json
+503aca0750ac19ff531cd13260b6b4e0522bd0fe assets/cuboidmod/models/block/notarfbadium_singularity_resource_generator.json
+db5fadfe5413a068ee3353cedf7b93a9a33c4278 assets/cuboidmod/models/block/notarfbadium_singularity_resource_generator_lit.json
+eada8ef96f7b34859fdda4e5e8a5beac3b188c47 assets/cuboidmod/models/block/notsogudium_chest.json
+bb4cfbedcfe8c500fcf47499f4534f4d32f14e10 assets/cuboidmod/models/block/notsogudium_quantum_collapser.json
+46a56711db2c57b0d337d8441b94679f43cc80f1 assets/cuboidmod/models/block/notsogudium_quantum_collapser_lit.json
+598dc8ab3ee4dd04f25cd1cc2e2ba9d226dd1947 assets/cuboidmod/models/block/notsogudium_singularity_power_generator.json
+d40f6eade42b4153a15c30c8aaa7f32f90f56e68 assets/cuboidmod/models/block/notsogudium_singularity_power_generator_lit.json
+77745eb4bd2f624cc9048a72936a4e58a1d11752 assets/cuboidmod/models/block/notsogudium_singularity_resource_generator.json
+b3d0539d1a1394b488d2107a147372af79e1a9d9 assets/cuboidmod/models/block/notsogudium_singularity_resource_generator_lit.json
+be273fab1841c1c79bb554005768c63c49cfe6d1 assets/cuboidmod/models/block/quantum_transmutation_chamber.json
+be273fab1841c1c79bb554005768c63c49cfe6d1 assets/cuboidmod/models/block/quantum_transmutation_chamber_lit.json
+e40cb1516da70f49ee37cbf1ff5297e6f273a1de assets/cuboidmod/models/block/refined_inscriber.json
+b67710be06b43a9e39f00522e018b12e738433e7 assets/cuboidmod/models/block/refined_inscriber_lit.json
+e29027dd7588e208d3101905d59e21fc33f70f7b assets/cuboidmod/models/block/thatldu_chest.json
+60e573f3a5eb335287e4d7310b22f3908f05cf48 assets/cuboidmod/models/block/thatldu_quantum_collapser.json
+6a0ce5fc8fc96c04b07e7f6c42b7a8433b4d6a21 assets/cuboidmod/models/block/thatldu_quantum_collapser_lit.json
+02a0b73629dd2530f7913a7f94c7aa42fa2b3c6e assets/cuboidmod/models/block/thatldu_singularity_power_generator.json
+3d4b6dd1202fdbbe1a8775e2f8200ea2b7531fd0 assets/cuboidmod/models/block/thatldu_singularity_power_generator_lit.json
+8e7b218e1af3eaa746724d94ae071d6c919f27ad assets/cuboidmod/models/block/thatldu_singularity_resource_generator.json
+4c1a77fe96fc42e5ed3264c3535c4b9c49c95742 assets/cuboidmod/models/block/thatldu_singularity_resource_generator_lit.json
+851125fb9aca1afb8f96113e08842100aa4d3dca assets/cuboidmod/models/block/wikidium_chest.json
+c61f49873f5920a442105a087dea3b60dd3a91bd assets/cuboidmod/models/block/wikidium_quantum_collapser.json
+3a1cacd43239eafb94b36c5779bbf7bdf9e7953c assets/cuboidmod/models/block/wikidium_quantum_collapser_lit.json
+dcf5bb2dd96aedae0698edc211bb315a194dac1f assets/cuboidmod/models/block/wikidium_singularity_power_generator.json
+112248797f36856336932408a396de66a3c0dcb4 assets/cuboidmod/models/block/wikidium_singularity_power_generator_lit.json
+8f4fe9c5dfe6516d00601aad0b1ec588a0eff835 assets/cuboidmod/models/block/wikidium_singularity_resource_generator.json
+14d8dd66ea49c42fa504cd148624a7be8969fc37 assets/cuboidmod/models/block/wikidium_singularity_resource_generator_lit.json