diff --git a/build.gradle.kts b/build.gradle.kts index e369e92a..f241b1ae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -151,9 +151,9 @@ dependencies { implementation("thedarkcolour:kotlinforforge:4.4.0") -// implementation(project.the().deobf("mekanism:Mekanism:${mekanismVersion}")) -// implementation(project.the().deobf("curse.maven:applied-mekanistics-574300:3969710")) -// implementation(project.the().deobf("curse.maven:ae2-things-forge-609977:3795991")) + implementation(project.the().deobf("mekanism:Mekanism:${mekanismVersion}")) + implementation(project.the().deobf("curse.maven:applied-mekanistics-574300:4842281")) + implementation(project.the().deobf("curse.maven:ae2-things-forge-609977:4616683")) // implementation(project.the().deobf("curse.maven:the-one-probe-245211:3927520")) compileOnly(project.the().deobf("curse.maven:ftb-teams-404468:3890141")) // compileOnly(project.the().deobf("curse.maven:applied-botanics-610632:3770580")) diff --git a/gradle.properties b/gradle.properties index c4d179dd..ea04cf4b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ aeVersion=15.0.4-beta wthitVersion=4.10.3 jeiVersion=15.2.0.22 -mekanismVersion=1.19.2-10.3.3.470 +mekanismVersion=1.20.1-10.4.5.19 #version.pl=1.12.2-2.3.161 #version.wt=1.12.2-1.0.34 #version.wc=1.12.2-3.12.97 diff --git a/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 b/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 index c1941c64..2cba3c48 100644 --- a/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 +++ b/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-10T22:45:28.674007 vanilla/Recipes +// 1.20.1 2023-11-21T16:44:58.0994017 vanilla/Recipes bcc7bdca8b042f1c348f50764fe0f68743f3acf0 data/ae2additions/advancements/recipes/misc/blocks/wireless_transceiver.json dcbae2ba7887f3263e1dd36961c0b395615275e8 data/ae2additions/advancements/recipes/misc/cells/fluid/1024k.json 247e69635d050ae29ce8b217d834e63c4b4fb576 data/ae2additions/advancements/recipes/misc/cells/fluid/16384k.json @@ -51,12 +51,56 @@ c37aafc19c39407d5f9432fd1f3c0ff2bd935933 data/ae2additions/advancements/recipes/ ae1029b96972abd1300d8dd4dcbaad06ea0363f1 data/ae2additions/advancements/recipes/misc/crafting/65536k_storage.json 8390f1eecc991eb5c940c0e651e012b9bd077284 data/ae2additions/advancements/recipes/misc/super_cell_housing.json 72e538095b1208d217f00a9efabb16602b084961 data/ae2additions/recipes/blocks/wireless_transceiver.json +996ed0099214f135022a8af51c09b282d098fd44 data/ae2additions/recipes/cells/chemical/1024k.json +82a930b1ae3f4d6f04272598974c3eea697c9f58 data/ae2additions/recipes/cells/chemical/16384k.json +f387e3f6b10878c1ca3959603420f9b1024ddbdf data/ae2additions/recipes/cells/chemical/4096k.json +4cb3a71bf235977fd1903181636f9683cc1bfdb7 data/ae2additions/recipes/cells/chemical/casing-1024k.json +de629e90b697439c0633bc8a79a69682500d0b37 data/ae2additions/recipes/cells/chemical/casing-16384k.json +a84656f3eeb8f51cafd2e96f4b7e597219de44ef data/ae2additions/recipes/cells/chemical/casing-4096k.json +0e13cacede05e2040efa57c60cc177eda9e6ea7d data/ae2additions/recipes/cells/chemical/disk-1-casing.json +d6bf0568ccb5fca665119263e7d43d40dc9e09da data/ae2additions/recipes/cells/chemical/disk-1.json +6ade92fc13d12ad863237cdd3d39fec32b13140a data/ae2additions/recipes/cells/chemical/disk-1024-casing.json +2994badfb112349dee1e80bf9dd4e3ef05a8782d data/ae2additions/recipes/cells/chemical/disk-1024.json +30f4ffe8b9039d9f247fcd9e27164cfd84ee7f24 data/ae2additions/recipes/cells/chemical/disk-16-casing.json +3f1f364cd9e819f02a48a43c044dae33a23a9357 data/ae2additions/recipes/cells/chemical/disk-16.json +98732f95dba5fe56316af726244a6a3b1b0eaa28 data/ae2additions/recipes/cells/chemical/disk-16384-casing.json +0e07c3fe834c231fe4dd43a1ce4a0cc67b141c59 data/ae2additions/recipes/cells/chemical/disk-16384.json +4dfede3749c27d7378d05491b855d88aafa1c4dc data/ae2additions/recipes/cells/chemical/disk-256-casing.json +0522668d63eec84ef244e42d4ada3cc932d9969e data/ae2additions/recipes/cells/chemical/disk-256.json +c00c33cd23009a20a68271b3409ed0d2bbf54bc8 data/ae2additions/recipes/cells/chemical/disk-4-casing.json +803838405534017bfd9ba77a2c78d87d0285fc02 data/ae2additions/recipes/cells/chemical/disk-4.json +2e687330bf7942584eb74fa5e3b1150000aca62f data/ae2additions/recipes/cells/chemical/disk-4096-casing.json +593bd9c55a4fe1f49ecaaa0a23b2cad8b2b31891 data/ae2additions/recipes/cells/chemical/disk-4096.json +0e75d38745444188d89b1cf77a435e84b37911dc data/ae2additions/recipes/cells/chemical/disk-64-casing.json +97b2f513e668e877db1a7fba991124824c1eafe6 data/ae2additions/recipes/cells/chemical/disk-64.json +59a25de4f210515d02a9301103eccc879e5a7c5d data/ae2additions/recipes/cells/chemical/disk-65536-casing.json +9ba397c76c8d7b67dfa00793a6bb3f3fb0b17076 data/ae2additions/recipes/cells/chemical/disk-65536.json +188f796ea8ffcb0ff10fd6a661762321470c8eae data/ae2additions/recipes/cells/chemical/disk-housing.json 8941c05dc4016fd124e3f1419f0eb29fafa1ed36 data/ae2additions/recipes/cells/fluid/1024k.json e8cb2ab18f52f84879068187da3f214b265f28b2 data/ae2additions/recipes/cells/fluid/16384k.json 52f97039fc66ba1e9b11c1631d9210f9eb039ac6 data/ae2additions/recipes/cells/fluid/4096k.json 08ef9069caffc9a4d2ee3b383dd512319fcc9022 data/ae2additions/recipes/cells/fluid/casing-1024k.json e7cc98ff666fe3dda57610c633cdbd4dec6f53f8 data/ae2additions/recipes/cells/fluid/casing-16384k.json 17b6e900d5e796d21e06a211f9c8f6c9372afee5 data/ae2additions/recipes/cells/fluid/casing-4096k.json +a21dc3adc40e32b610005b1b05d4f5294af61f91 data/ae2additions/recipes/cells/fluid/disk-1-casing.json +fcf78a222abd718865903babbf6e508090505cb1 data/ae2additions/recipes/cells/fluid/disk-1.json +e5e6e660eab7a580e6b4a5275ff4e1a869b9c24b data/ae2additions/recipes/cells/fluid/disk-1024-casing.json +8ddd22ef61ed0d04c6ea9f4f0d6ca18bd8a3c16c data/ae2additions/recipes/cells/fluid/disk-1024.json +6dec46ff9ee0b0da01ca968c8ddd9d8ad3a39a3c data/ae2additions/recipes/cells/fluid/disk-16-casing.json +1231596a2926278bb0bd2d80eb47a46128f90a96 data/ae2additions/recipes/cells/fluid/disk-16.json +8e09ee2048e003e7bf4676ae67836b353eb8fa81 data/ae2additions/recipes/cells/fluid/disk-16384-casing.json +ebbc69c5ed74671a27ede30b24f42d0f4c065505 data/ae2additions/recipes/cells/fluid/disk-16384.json +f8db2b80815917a6a5c40cf31ec6a3848e239c39 data/ae2additions/recipes/cells/fluid/disk-256-casing.json +05f724d3ac5ec515ab1641f24811336e3afd0640 data/ae2additions/recipes/cells/fluid/disk-256.json +6ed5ea6d48ccbad265c23e51d203b989778f6e84 data/ae2additions/recipes/cells/fluid/disk-4-casing.json +403318ef5b7c2c3c81881c5195749aabfae8f3ee data/ae2additions/recipes/cells/fluid/disk-4.json +6f3dbc53537af866386e02bc9ebaa7f5dd0c21af data/ae2additions/recipes/cells/fluid/disk-4096-casing.json +b3553b0ab276196a7874957963b42433dffb0262 data/ae2additions/recipes/cells/fluid/disk-4096.json +fd4e96ae385d2177d215bc98ae6f9b97d22c5558 data/ae2additions/recipes/cells/fluid/disk-64-casing.json +a10add25a30874784a028bbc3b2de34526d9bd6e data/ae2additions/recipes/cells/fluid/disk-64.json +8558ca921a9b461dc1c9c576203849915f9f8503 data/ae2additions/recipes/cells/fluid/disk-65536-casing.json +d7b65d4a9d5b3d33aaa72690f64a4cfa5df9d9ad data/ae2additions/recipes/cells/fluid/disk-65536.json +e4917a996d6ebe67a5306c417b2614fac2eaa1d8 data/ae2additions/recipes/cells/fluid/disk-housing.json 0e05c6a045548ae8f5505c43bc48253dde3a0178 data/ae2additions/recipes/cells/item/1024k.json 315a4153c63f8aa2560ffe4246dba4aa962cc04c data/ae2additions/recipes/cells/item/16384k.json 58a7588e313f158fefbf90ea01c4380b997a15ae data/ae2additions/recipes/cells/item/4096k.json @@ -65,6 +109,16 @@ e400cbf9b295ee99b52025de34b4611eb3739405 data/ae2additions/recipes/cells/item/ca f6a28615e99b3e671678938b5e15b5348846e45b data/ae2additions/recipes/cells/item/casing-16384k.json 71ea83d8a6f1de3e5922f31b1933a50459c171ce data/ae2additions/recipes/cells/item/casing-4096k.json 0ecfa0ac1c1a2dfd981b2a7f4f19b7559dcd2953 data/ae2additions/recipes/cells/item/casing-65536k.json +d17eb79c4188abea90e97d70515181f4b3ca7b35 data/ae2additions/recipes/cells/item/disk-1024-casing.json +9adb698a3153b855986d5e06a6c4e8df00a66c08 data/ae2additions/recipes/cells/item/disk-1024.json +b54a5ae5c96ed47d0b3fb826708c32a5566e79b4 data/ae2additions/recipes/cells/item/disk-16384-casing.json +43a8e952ac3e0e6bc56edca76fe5c867fa7679d1 data/ae2additions/recipes/cells/item/disk-16384.json +f65075f3b4ff8653beb7717ab3f70171b836d324 data/ae2additions/recipes/cells/item/disk-256-casing.json +fdbccf24449cfdc7965e80bf90a9a4e659b27f73 data/ae2additions/recipes/cells/item/disk-256.json +f502d3ba145ff3ee3ab1dfc0c940bc625deafb49 data/ae2additions/recipes/cells/item/disk-4096-casing.json +3ace12659dda7c30d6fcd5134175ec58fbda7098 data/ae2additions/recipes/cells/item/disk-4096.json +9614f9275ecad70bb0280b2b70c3531afc24e48e data/ae2additions/recipes/cells/item/disk-65536-casing.json +1faeec2fa47302dd734f41613a9b60b7097fca0d data/ae2additions/recipes/cells/item/disk-65536.json 52c3beec940920174a5b2046099a852a68d6e0f7 data/ae2additions/recipes/cells/super/1024k-housing.json e5be841ad23cc9f7907d0c87b3cad2f4ac53cd89 data/ae2additions/recipes/cells/super/1024k.json 6d5e2e93e25dc067a5fdadd9d58f4a8c87e567d6 data/ae2additions/recipes/cells/super/16k-housing.json diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/1024k.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/1024k.json new file mode 100644 index 00000000..6f1f6d17 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/1024k.json @@ -0,0 +1,45 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "item": "ae2:fluix_dust" + }, + "c": { + "item": "ae2additions:cell_component_1024" + }, + "d": { + "tag": "forge:ingots/osmium" + } + }, + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "result": { + "item": "ae2additions:chemical_storage_cell_1024" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/16384k.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/16384k.json new file mode 100644 index 00000000..222c076e --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/16384k.json @@ -0,0 +1,45 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "item": "ae2:fluix_dust" + }, + "c": { + "item": "ae2additions:cell_component_16384" + }, + "d": { + "tag": "forge:ingots/osmium" + } + }, + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "result": { + "item": "ae2additions:chemical_storage_cell_16384" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/4096k.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/4096k.json new file mode 100644 index 00000000..6715eb80 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/4096k.json @@ -0,0 +1,45 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "item": "ae2:fluix_dust" + }, + "c": { + "item": "ae2additions:cell_component_4096" + }, + "d": { + "tag": "forge:ingots/osmium" + } + }, + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "result": { + "item": "ae2additions:chemical_storage_cell_4096" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-1024k.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-1024k.json new file mode 100644 index 00000000..51d88cdd --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-1024k.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "appmek:chemical_cell_housing" + }, + { + "item": "ae2additions:cell_component_1024" + } + ], + "result": { + "item": "ae2additions:chemical_storage_cell_1024" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-16384k.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-16384k.json new file mode 100644 index 00000000..1c136bc8 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-16384k.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "appmek:chemical_cell_housing" + }, + { + "item": "ae2additions:cell_component_16384" + } + ], + "result": { + "item": "ae2additions:chemical_storage_cell_16384" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-4096k.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-4096k.json new file mode 100644 index 00000000..33419579 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-4096k.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "appmek:chemical_cell_housing" + }, + { + "item": "ae2additions:cell_component_4096" + } + ], + "result": { + "item": "ae2additions:chemical_storage_cell_4096" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1-casing.json new file mode 100644 index 00000000..6bf692eb --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2:cell_component_1k" + }, + { + "tag": "mekanism:alloys/infused" + } + ], + "result": { + "item": "ae2additions:disk_chemical_1k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1.json new file mode 100644 index 00000000..d84bec64 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_1k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/infused" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_1k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1024-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1024-casing.json new file mode 100644 index 00000000..19329266 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1024-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2additions:cell_component_1024" + }, + { + "tag": "mekanism:alloys/reinforced" + } + ], + "result": { + "item": "ae2additions:disk_chemical_1024k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1024.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1024.json new file mode 100644 index 00000000..fad09c94 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1024.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_1024" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/reinforced" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_1024k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16-casing.json new file mode 100644 index 00000000..80320c32 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2:cell_component_16k" + }, + { + "tag": "mekanism:alloys/infused" + } + ], + "result": { + "item": "ae2additions:disk_chemical_16k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16.json new file mode 100644 index 00000000..bfe69606 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_16k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/infused" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_16k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16384-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16384-casing.json new file mode 100644 index 00000000..d6a86bd8 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16384-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2additions:cell_component_16384" + }, + { + "tag": "mekanism:alloys/atomic" + } + ], + "result": { + "item": "ae2additions:disk_chemical_16384k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16384.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16384.json new file mode 100644 index 00000000..061d6b3f --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-16384.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_16384" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/atomic" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_16384k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-256-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-256-casing.json new file mode 100644 index 00000000..7c38e5dc --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-256-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2:cell_component_256k" + }, + { + "tag": "mekanism:alloys/reinforced" + } + ], + "result": { + "item": "ae2additions:disk_chemical_256k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-256.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-256.json new file mode 100644 index 00000000..f4c35d3b --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-256.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_256k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/reinforced" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_256k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4-casing.json new file mode 100644 index 00000000..aca10125 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2:cell_component_4k" + }, + { + "tag": "mekanism:alloys/infused" + } + ], + "result": { + "item": "ae2additions:disk_chemical_4k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4.json new file mode 100644 index 00000000..c7bd5d88 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_4k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/infused" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_4k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4096-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4096-casing.json new file mode 100644 index 00000000..fbd87a92 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4096-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2additions:cell_component_4096" + }, + { + "tag": "mekanism:alloys/atomic" + } + ], + "result": { + "item": "ae2additions:disk_chemical_4096k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4096.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4096.json new file mode 100644 index 00000000..e6a09165 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-4096.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_4096" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/atomic" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_4096k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-64-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-64-casing.json new file mode 100644 index 00000000..8e9d8835 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-64-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2:cell_component_64k" + }, + { + "tag": "mekanism:alloys/reinforced" + } + ], + "result": { + "item": "ae2additions:disk_chemical_64k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-64.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-64.json new file mode 100644 index 00000000..2c2be470 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-64.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_64k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/reinforced" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_64k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-65536-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-65536-casing.json new file mode 100644 index 00000000..a4c790ef --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-65536-casing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_chemical_housing" + }, + { + "item": "ae2additions:cell_component_65536" + }, + { + "tag": "mekanism:alloys/atomic" + } + ], + "result": { + "item": "ae2additions:disk_chemical_65536k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-65536.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-65536.json new file mode 100644 index 00000000..6daa1fa3 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-65536.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_65536" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "mekanism:alloys/atomic" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_65536k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-housing.json b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-housing.json new file mode 100644 index 00000000..e2b88d46 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-housing.json @@ -0,0 +1,49 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + }, + { + "type": "forge:mod_loaded", + "modid": "appmek" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:dusts/osmium" + } + }, + "pattern": [ + "aba", + "b b", + "ded" + ], + "result": { + "item": "ae2additions:disk_chemical_housing" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1-casing.json new file mode 100644 index 00000000..d2c39ca9 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2:cell_component_1k" + } + ], + "result": { + "item": "ae2additions:disk_fluid_1k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1.json new file mode 100644 index 00000000..4f4e732c --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_1k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_1k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1024-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1024-casing.json new file mode 100644 index 00000000..57213e32 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1024-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2additions:cell_component_1024" + } + ], + "result": { + "item": "ae2additions:disk_fluid_1024k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1024.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1024.json new file mode 100644 index 00000000..aa8ac67c --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-1024.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_1024" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_1024k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16-casing.json new file mode 100644 index 00000000..5f862c54 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2:cell_component_16k" + } + ], + "result": { + "item": "ae2additions:disk_fluid_16k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16.json new file mode 100644 index 00000000..064da595 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_16k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_16k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16384-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16384-casing.json new file mode 100644 index 00000000..81da2690 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16384-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2additions:cell_component_16384" + } + ], + "result": { + "item": "ae2additions:disk_fluid_16384k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16384.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16384.json new file mode 100644 index 00000000..0fcefefe --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-16384.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_16384" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_16384k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-256-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-256-casing.json new file mode 100644 index 00000000..317a02fd --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-256-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2:cell_component_256k" + } + ], + "result": { + "item": "ae2additions:disk_fluid_256k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-256.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-256.json new file mode 100644 index 00000000..5df631ac --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-256.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_256k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_256k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4-casing.json new file mode 100644 index 00000000..8b98dd34 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2:cell_component_4k" + } + ], + "result": { + "item": "ae2additions:disk_fluid_4k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4.json new file mode 100644 index 00000000..da763db5 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_4k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_4k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4096-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4096-casing.json new file mode 100644 index 00000000..a0bb1ed3 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4096-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2additions:cell_component_4096" + } + ], + "result": { + "item": "ae2additions:disk_fluid_4096k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4096.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4096.json new file mode 100644 index 00000000..4a283437 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-4096.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_4096" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_4096k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-64-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-64-casing.json new file mode 100644 index 00000000..6ed442ff --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-64-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2:cell_component_64k" + } + ], + "result": { + "item": "ae2additions:disk_fluid_64k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-64.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-64.json new file mode 100644 index 00000000..205aa921 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-64.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_64k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_64k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-65536-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-65536-casing.json new file mode 100644 index 00000000..20f230b0 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-65536-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2additions:disk_fluid_housing" + }, + { + "item": "ae2additions:cell_component_65536" + } + ], + "result": { + "item": "ae2additions:disk_fluid_65536k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-65536.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-65536.json new file mode 100644 index 00000000..b9b19a7b --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-65536.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_65536" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_65536k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-housing.json b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-housing.json new file mode 100644 index 00000000..d8aab191 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/fluid/disk-housing.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/lapis" + } + }, + "pattern": [ + "aba", + "b b", + "ded" + ], + "result": { + "item": "ae2additions:disk_fluid_housing" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-1024-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-1024-casing.json new file mode 100644 index 00000000..02226c04 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-1024-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2things:disk_housing" + }, + { + "item": "ae2additions:cell_component_1024" + } + ], + "result": { + "item": "ae2additions:disk_item_1024k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-1024.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-1024.json new file mode 100644 index 00000000..a08722de --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-1024.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_1024" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/amethyst" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_item_1024k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-16384-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-16384-casing.json new file mode 100644 index 00000000..caa0535d --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-16384-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2things:disk_housing" + }, + { + "item": "ae2additions:cell_component_16384" + } + ], + "result": { + "item": "ae2additions:disk_item_16384k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-16384.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-16384.json new file mode 100644 index 00000000..e583ba8e --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-16384.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_16384" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/amethyst" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_item_16384k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-256-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-256-casing.json new file mode 100644 index 00000000..bfa31324 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-256-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2things:disk_housing" + }, + { + "item": "ae2:cell_component_256k" + } + ], + "result": { + "item": "ae2additions:disk_item_256k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-256.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-256.json new file mode 100644 index 00000000..03edc2be --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-256.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2:cell_component_256k" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/amethyst" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_item_256k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-4096-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-4096-casing.json new file mode 100644 index 00000000..19975030 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-4096-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2things:disk_housing" + }, + { + "item": "ae2additions:cell_component_4096" + } + ], + "result": { + "item": "ae2additions:disk_item_4096k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-4096.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-4096.json new file mode 100644 index 00000000..f539aa6a --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-4096.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_4096" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/amethyst" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_item_4096k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-65536-casing.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-65536-casing.json new file mode 100644 index 00000000..4380a812 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-65536-casing.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2things:disk_housing" + }, + { + "item": "ae2additions:cell_component_65536" + } + ], + "result": { + "item": "ae2additions:disk_item_65536k" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2additions/recipes/cells/item/disk-65536.json b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-65536.json new file mode 100644 index 00000000..ce0aad23 --- /dev/null +++ b/src/generated/resources/data/ae2additions/recipes/cells/item/disk-65536.json @@ -0,0 +1,48 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ae2things" + } + ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "a": { + "item": "ae2:quartz_glass" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "ae2additions:cell_component_65536" + }, + "d": { + "tag": "forge:ingots/netherite" + }, + "e": { + "tag": "forge:gems/amethyst" + } + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "result": { + "item": "ae2additions:disk_item_65536k" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/main/kotlin/com/the9grounds/aeadditions/block/CraftingStorageBlock.kt b/src/main/kotlin/com/the9grounds/aeadditions/block/CraftingStorageBlock.kt index 36abea85..1af534f6 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/block/CraftingStorageBlock.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/block/CraftingStorageBlock.kt @@ -5,9 +5,11 @@ import appeng.blockentity.crafting.CraftingBlockEntity import com.the9grounds.aeadditions.block.crafting.ExtendedCraftingUnitType import net.minecraft.core.BlockPos import net.minecraft.resources.ResourceLocation +import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType.Builder import net.minecraft.world.level.block.state.BlockBehaviour import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.storage.loot.LootParams import net.minecraftforge.registries.ForgeRegistries @@ -19,4 +21,9 @@ class CraftingStorageBlock(props: BlockBehaviour.Properties, type: ExtendedCraft val type = Builder.of(supplier, this).build(null) setBlockEntity(CraftingBlockEntity::class.java, type, null, null) } + + override fun getDrops(state: BlockState, p_287596_: LootParams.Builder): MutableList { + return mutableListOf(ItemStack(state.block.asItem(), 1)) + } + } \ No newline at end of file diff --git a/src/main/kotlin/com/the9grounds/aeadditions/block/MEWirelessTransceiverBlock.kt b/src/main/kotlin/com/the9grounds/aeadditions/block/MEWirelessTransceiverBlock.kt index 4c30036b..bdd9af7e 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/block/MEWirelessTransceiverBlock.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/block/MEWirelessTransceiverBlock.kt @@ -6,11 +6,13 @@ import net.minecraft.core.BlockPos import net.minecraft.world.InteractionHand import net.minecraft.world.InteractionResult import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.ItemStack import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.storage.loot.LootParams import net.minecraft.world.phys.BlockHitResult class MEWirelessTransceiverBlock(properties: Properties) : Block(properties), EntityBlock { @@ -54,4 +56,8 @@ class MEWirelessTransceiverBlock(properties: Properties) : Block(properties), En return super.use(blockState, level, pos, player, hand, hit) } + + override fun getDrops(state: BlockState, p_287596_: LootParams.Builder): MutableList { + return mutableListOf(ItemStack(state.block.asItem(), 1)) + } } \ No newline at end of file diff --git a/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAItemModelProvider.kt b/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAItemModelProvider.kt index 73c027ff..57787080 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAItemModelProvider.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAItemModelProvider.kt @@ -23,17 +23,17 @@ class AEAItemModelProvider(output: PackOutput?, modid: String?, existingFileHelp 65536 to Ids.DISK_FLUID_65536k ) -// val chemicalDisks = mapOf( -// 1 to Ids.DISK_CHEMICAL_1k, -// 4 to Ids.DISK_CHEMICAL_4k, -// 16 to Ids.DISK_CHEMICAL_16k, -// 64 to Ids.DISK_CHEMICAL_64k, -// 256 to Ids.DISK_CHEMICAL_256k, -// 1024 to Ids.DISK_CHEMICAL_1024k, -// 4096 to Ids.DISK_CHEMICAL_4096k, -// 16384 to Ids.DISK_CHEMICAL_16384k, -// 65536 to Ids.DISK_CHEMICAL_65536k -// ) + val chemicalDisks = mapOf( + 1 to Ids.DISK_CHEMICAL_1k, + 4 to Ids.DISK_CHEMICAL_4k, + 16 to Ids.DISK_CHEMICAL_16k, + 64 to Ids.DISK_CHEMICAL_64k, + 256 to Ids.DISK_CHEMICAL_256k, + 1024 to Ids.DISK_CHEMICAL_1024k, + 4096 to Ids.DISK_CHEMICAL_4096k, + 16384 to Ids.DISK_CHEMICAL_16384k, + 65536 to Ids.DISK_CHEMICAL_65536k + ) val superCellComponents = mapOf( "1k" to Ids.SUPER_CELL_COMPONENT_1k, "4k" to Ids.SUPER_CELL_COMPONENT_4k, @@ -90,14 +90,14 @@ class AEAItemModelProvider(output: PackOutput?, modid: String?, existingFileHelp ResourceLocation(AEAdditions.ID, "item/disk_fluid_${fluidDisk.key}k") ).texture("layer1", ResourceLocation("ae2:item/storage_cell_led")) } -// for (chemicalDisk in chemicalDisks) { -// this.singleTexture( -// chemicalDisk.value.path, -// mcLoc("item/generated"), -// "layer0", -// ResourceLocation(AEAdditions.ID, "item/disk_chemical_${chemicalDisk.key}k") -// ).texture("layer1", ResourceLocation("ae2:item/storage_cell_led")) -// } + for (chemicalDisk in chemicalDisks) { + this.singleTexture( + chemicalDisk.value.path, + mcLoc("item/generated"), + "layer0", + ResourceLocation(AEAdditions.ID, "item/disk_chemical_${chemicalDisk.key}k") + ).texture("layer1", ResourceLocation("ae2:item/storage_cell_led")) + } diff --git a/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAdditionsRecipeProvider.kt b/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAdditionsRecipeProvider.kt index b2bdcec8..8859daf0 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAdditionsRecipeProvider.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAdditionsRecipeProvider.kt @@ -3,14 +3,22 @@ package com.the9grounds.aeadditions.data.provider import appeng.core.definitions.AEBlocks import appeng.core.definitions.AEItems import com.the9grounds.aeadditions.AEAdditions +import com.the9grounds.aeadditions.integration.Mods +import com.the9grounds.aeadditions.item.storage.DiskCellWithoutMod import com.the9grounds.aeadditions.item.storage.StorageCell import com.the9grounds.aeadditions.registries.Blocks import com.the9grounds.aeadditions.registries.Items +import io.github.projectet.ae2things.item.AETItems +import me.ramidzkh.mekae2.AMItems import net.minecraft.data.PackOutput import net.minecraft.data.recipes.* import net.minecraft.resources.ResourceLocation import net.minecraft.tags.ItemTags +import net.minecraft.tags.TagKey +import net.minecraft.world.item.Item +import net.minecraft.world.level.ItemLike import net.minecraftforge.common.Tags +import net.minecraftforge.common.crafting.ConditionalRecipe import net.minecraftforge.common.crafting.conditions.IConditionBuilder import java.util.function.Consumer @@ -70,11 +78,11 @@ class AEAdditionsRecipeProvider(output: PackOutput) : RecipeProvider(output), IC 4096 to Items.FLUID_STORAGE_CELL_4096k, 16384 to Items.FLUID_STORAGE_CELL_16384k ) -// val chemicalKbs = mapOf( -// 1024 to Items.CHEMICAL_STORAGE_CELL_1024k as StorageCell, -// 4096 to Items.CHEMICAL_STORAGE_CELL_4096k as StorageCell, -// 16384 to Items.CHEMICAL_STORAGE_CELL_16384k as StorageCell -// ) + val chemicalKbs = mapOf( + 1024 to Items.CHEMICAL_STORAGE_CELL_1024k as StorageCell, + 4096 to Items.CHEMICAL_STORAGE_CELL_4096k as StorageCell, + 16384 to Items.CHEMICAL_STORAGE_CELL_16384k as StorageCell + ) val mapOfRequired = mapOf( 4 to 1, 16 to 4, @@ -115,6 +123,36 @@ class AEAdditionsRecipeProvider(output: PackOutput) : RecipeProvider(output), IC 16384 to Items.SUPER_CELL_16M, 65536 to Items.SUPER_CELL_65M, ) + + val diskCells = mapOf( + 256 to Items.DISK_256k, + 1024 to Items.DISK_1024k, + 4096 to Items.DISK_4096k, + 16384 to Items.DISK_16384k, + 65536 to Items.DISK_65536k + ) + val fluidCells = mapOf( + 1 to Items.DISK_FLUID_1k, + 4 to Items.DISK_FLUID_4k, + 16 to Items.DISK_FLUID_16k, + 64 to Items.DISK_FLUID_64k, + 256 to Items.DISK_FLUID_256k, + 1024 to Items.DISK_FLUID_1024k, + 4096 to Items.DISK_FLUID_4096k, + 16384 to Items.DISK_FLUID_16384k, + 65536 to Items.DISK_FLUID_65536k + ) + val chemicalCells = mapOf( + 1 to Items.DISK_CHEMICAL_1k, + 4 to Items.DISK_CHEMICAL_4k, + 16 to Items.DISK_CHEMICAL_16k, + 64 to Items.DISK_CHEMICAL_64k, + 256 to Items.DISK_CHEMICAL_256k, + 1024 to Items.DISK_CHEMICAL_1024k, + 4096 to Items.DISK_CHEMICAL_4096k, + 16384 to Items.DISK_CHEMICAL_16384k, + 65536 to Items.DISK_CHEMICAL_65536k + ) for (superCellComponent in superCellComponents) { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, superCellComponent.value) @@ -156,176 +194,109 @@ class AEAdditionsRecipeProvider(output: PackOutput) : RecipeProvider(output), IC .save(consumer, ResourceLocation(AEAdditions.ID, "cells/super/${superMapReversed[superStorageCell.key]}")) } -// for (fluidCell in fluidCells) { -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// not(modLoaded(Mods.MEGAAE2.modId)) -// ) -// ).addRecipe { -// ShapelessRecipeBuilder.shapeless(fluidCell.value) -// .requires(Items.DISK_FLUID_HOUSING) -// .requires(components[fluidCell.key]) -// .unlockedBy("has_item", has(components[fluidCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-${fluidCell.key}-casing")) -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// not(modLoaded(Mods.MEGAAE2.modId)) -// ) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(fluidCell.value) -// .pattern("aba") -// .pattern("bcb") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('c', components[fluidCell.key]) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', Tags.Items.GEMS_LAPIS) -// .unlockedBy("has_item", has(components[fluidCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-${fluidCell.key}")) -// -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.MEGAAE2.modId) -// ) -// ).addRecipe { -// ShapelessRecipeBuilder.shapeless(fluidCell.value) -// .requires(Items.DISK_FLUID_HOUSING) -// .requires(megaComponents[fluidCell.key]) -// .unlockedBy("has_item", has(megaComponents[fluidCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-${fluidCell.key}-casing-mega")) -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.MEGAAE2.modId) -// ) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(fluidCell.value) -// .pattern("aba") -// .pattern("bcb") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('c', megaComponents[fluidCell.key]) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', Tags.Items.GEMS_LAPIS) -// .unlockedBy("has_item", has(megaComponents[fluidCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-${fluidCell.key}-mega")) -// } + for (fluidCell in fluidCells) { + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + ) + ).addRecipe { + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, fluidCell.value) + .requires(Items.DISK_FLUID_HOUSING) + .requires(components[fluidCell.key]) + .unlockedBy("has_item", has(components[fluidCell.key])) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-${fluidCell.key}-casing")) + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + ) + ).addRecipe { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, fluidCell.value) + .pattern("aba") + .pattern("bcb") + .pattern("ded") + .define('a', AEBlocks.QUARTZ_GLASS) + .define('b', Tags.Items.DUSTS_REDSTONE) + .define('c', components[fluidCell.key]) + .define('d', Tags.Items.INGOTS_NETHERITE) + .define('e', Tags.Items.GEMS_LAPIS) + .unlockedBy("has_item", has(components[fluidCell.key])) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-${fluidCell.key}")) + } -// for (chemicalCell in chemicalCells) { -// when(chemicalCell.key) { -// 1, 4, 16 -> registerChemicalDiskRecipe(chemicalCell, infusedAlloy, components, consumer) -// 64, 256, 1024 -> registerChemicalDiskRecipe(chemicalCell, reinforcedAlloy, components, consumer) -// 4096, 16384, 65536 -> registerChemicalDiskRecipe(chemicalCell, atomicAlloy, components, consumer) -// } -// } + for (chemicalCell in chemicalCells) { + when(chemicalCell.key) { + 1, 4, 16 -> registerChemicalDiskRecipe(chemicalCell, infusedAlloy, components, consumer) + 64, 256, 1024 -> registerChemicalDiskRecipe(chemicalCell, reinforcedAlloy, components, consumer) + 4096, 16384, 65536 -> registerChemicalDiskRecipe(chemicalCell, atomicAlloy, components, consumer) + } + } + + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + modLoaded(Mods.APPMEK.modId) + ) + ).addRecipe { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.DISK_CHEMICAL_HOUSING) + .pattern("aba") + .pattern("b b") + .pattern("ded") + .define('a', AEBlocks.QUARTZ_GLASS) + .define('b', Tags.Items.DUSTS_REDSTONE) + .define('d', Tags.Items.INGOTS_NETHERITE) + .define('e', osmiumDust) + .unlockedBy("has_item", has(Tags.Items.INGOTS_NETHERITE)) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/chemical/disk-housing")) -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.APPMEK.modId) -// ) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(Items.DISK_CHEMICAL_HOUSING) -// .pattern("aba") -// .pattern("b b") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', osmiumDust) -// .unlockedBy("has_item", has(Tags.Items.INGOTS_NETHERITE)) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/chemical/disk-housing")) -// -// ConditionalRecipe.builder().addCondition( -// modLoaded(Mods.AE2THINGS.modId) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(Items.DISK_FLUID_HOUSING) -// .pattern("aba") -// .pattern("b b") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', Tags.Items.GEMS_LAPIS) -// .unlockedBy("has_item", has(Tags.Items.INGOTS_NETHERITE)) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-housing")) + ConditionalRecipe.builder().addCondition( + modLoaded(Mods.AE2THINGS.modId) + ).addRecipe { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.DISK_FLUID_HOUSING) + .pattern("aba") + .pattern("b b") + .pattern("ded") + .define('a', AEBlocks.QUARTZ_GLASS) + .define('b', Tags.Items.DUSTS_REDSTONE) + .define('d', Tags.Items.INGOTS_NETHERITE) + .define('e', Tags.Items.GEMS_LAPIS) + .unlockedBy("has_item", has(Tags.Items.INGOTS_NETHERITE)) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/disk-housing")) -// for (diskCell in diskCells) { -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// not(modLoaded(Mods.MEGAAE2.modId)) -// ) -// ).addRecipe { -// ShapelessRecipeBuilder.shapeless(diskCell.value) -// .requires(AETItems.DISK_HOUSING.get()) -// .requires(components[diskCell.key]) -// .unlockedBy("has_item", has(components[diskCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/item/disk-${diskCell.key}-casing")) -// -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// not(modLoaded(Mods.MEGAAE2.modId)) -// ) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(diskCell.value) -// .pattern("aba") -// .pattern("bcb") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('c', components[diskCell.key]) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', Tags.Items.GEMS_AMETHYST) -// .unlockedBy("has_item", has(components[diskCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/item/disk-${diskCell.key}")) -// -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.MEGAAE2.modId) -// ) -// ).addRecipe { -// ShapelessRecipeBuilder.shapeless(diskCell.value) -// .requires(AETItems.DISK_HOUSING.get()) -// .requires(megaComponents[diskCell.key]) -// .unlockedBy("has_item", has(megaComponents[diskCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/item/disk-${diskCell.key}-casing-mega")) -// -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.MEGAAE2.modId) -// ) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(diskCell.value) -// .pattern("aba") -// .pattern("bcb") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('c', megaComponents[diskCell.key]) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', Tags.Items.GEMS_AMETHYST) -// .unlockedBy("has_item", has(megaComponents[diskCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/item/disk-${diskCell.key}-mega")) -// } + for (diskCell in diskCells) { + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + ) + ).addRecipe { + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, diskCell.value) + .requires(AETItems.DISK_HOUSING.get()) + .requires(components[diskCell.key]) + .unlockedBy("has_item", has(components[diskCell.key])) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/item/disk-${diskCell.key}-casing")) + + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + ) + ).addRecipe { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, diskCell.value) + .pattern("aba") + .pattern("bcb") + .pattern("ded") + .define('a', AEBlocks.QUARTZ_GLASS) + .define('b', Tags.Items.DUSTS_REDSTONE) + .define('c', components[diskCell.key]) + .define('d', Tags.Items.INGOTS_NETHERITE) + .define('e', Tags.Items.GEMS_AMETHYST) + .unlockedBy("has_item", has(components[diskCell.key])) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/item/disk-${diskCell.key}")) + } for (block in craftingStorageBlocks) { ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,block.value.item) @@ -384,27 +355,27 @@ class AEAdditionsRecipeProvider(output: PackOutput) : RecipeProvider(output), IC .unlockedBy("has_item", has(kb.value.component)) .save(consumer, ResourceLocation(AEAdditions.ID, "cells/fluid/${kb.key}k")) } -// for (kb in chemicalKbs) { -// addConditionalRecipeForMekanism("cells/chemical/casing-${kb.key}k", consumer) { -// ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,kb.value) -// .requires(AMItems.CHEMICAL_CELL_HOUSING.get()) -// .requires(components[kb.key]) -// .unlockedBy("has_item", has(components[kb.key])) -// .save(it) -// } -// addConditionalRecipeForMekanism("cells/chemical/${kb.key}k", consumer) { -// ShapedRecipeBuilder.shaped(RecipeCategory.MISC,kb.value) -// .pattern("aba") -// .pattern("bcb") -// .pattern("ddd") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', AEItems.FLUIX_DUST) -// .define('c', components[kb.key]) -// .define('d', osmiumTag) -// .unlockedBy("has_item", has(components[kb.key])) -// .save(it) -// } -// } + for (kb in chemicalKbs) { + addConditionalRecipeForMekanism("cells/chemical/casing-${kb.key}k", consumer) { + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,kb.value) + .requires(AMItems.CHEMICAL_CELL_HOUSING.get()) + .requires(components[kb.key]) + .unlockedBy("has_item", has(components[kb.key])) + .save(it) + } + addConditionalRecipeForMekanism("cells/chemical/${kb.key}k", consumer) { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC,kb.value) + .pattern("aba") + .pattern("bcb") + .pattern("ddd") + .define('a', AEBlocks.QUARTZ_GLASS) + .define('b', AEItems.FLUIX_DUST) + .define('c', components[kb.key]) + .define('d', osmiumTag) + .unlockedBy("has_item", has(components[kb.key])) + .save(it) + } + } ShapedRecipeBuilder.shaped(RecipeCategory.MISC,Blocks.BLOCK_ME_WIRELESS_TRANSCEIVER.block) .pattern("aba") @@ -419,52 +390,52 @@ class AEAdditionsRecipeProvider(output: PackOutput) : RecipeProvider(output), IC .save(consumer, ResourceLocation(AEAdditions.ID, "blocks/wireless_transceiver")) } -// private fun registerChemicalDiskRecipe( -// chemicalCell: Map.Entry, -// alloy: TagKey, -// components: Map, -// consumer: Consumer -// ) { -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.APPMEK.modId) -// ) -// ).addRecipe { -// ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,chemicalCell.value) -// .requires(Items.DISK_CHEMICAL_HOUSING) -// .requires(components[chemicalCell.key]) -// .requires(alloy) -// .unlockedBy("has_item", has(components[chemicalCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/chemical/disk-${chemicalCell.key}-casing")) -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded(Mods.AE2THINGS.modId), -// modLoaded(Mods.APPMEK.modId), -// ) -// ).addRecipe { -// ShapedRecipeBuilder.shaped(RecipeCategory.MISC,chemicalCell.value) -// .pattern("aba") -// .pattern("bcb") -// .pattern("ded") -// .define('a', AEBlocks.QUARTZ_GLASS) -// .define('b', Tags.Items.DUSTS_REDSTONE) -// .define('c', components[chemicalCell.key]) -// .define('d', Tags.Items.INGOTS_NETHERITE) -// .define('e', alloy) -// .unlockedBy("has_item", has(components[chemicalCell.key])) -// .save(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/chemical/disk-${chemicalCell.key}")) -// } -// -// private fun addConditionalRecipeForMekanism(resourcePath: String, consumer: Consumer, factory: (Consumer) -> Unit) { -// ConditionalRecipe.builder().addCondition( -// and( -// modLoaded("appmek"), -// ) -// ).addRecipe() { -// factory(it) -// }.build(consumer, ResourceLocation(AEAdditions.ID, resourcePath)) -// } + private fun registerChemicalDiskRecipe( + chemicalCell: Map.Entry, + alloy: TagKey, + components: Map, + consumer: Consumer + ) { + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + modLoaded(Mods.APPMEK.modId) + ) + ).addRecipe { + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,chemicalCell.value) + .requires(Items.DISK_CHEMICAL_HOUSING) + .requires(components[chemicalCell.key]) + .requires(alloy) + .unlockedBy("has_item", has(components[chemicalCell.key])) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/chemical/disk-${chemicalCell.key}-casing")) + ConditionalRecipe.builder().addCondition( + and( + modLoaded(Mods.AE2THINGS.modId), + modLoaded(Mods.APPMEK.modId), + ) + ).addRecipe { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC,chemicalCell.value) + .pattern("aba") + .pattern("bcb") + .pattern("ded") + .define('a', AEBlocks.QUARTZ_GLASS) + .define('b', Tags.Items.DUSTS_REDSTONE) + .define('c', components[chemicalCell.key]) + .define('d', Tags.Items.INGOTS_NETHERITE) + .define('e', alloy) + .unlockedBy("has_item", has(components[chemicalCell.key])) + .save(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, "cells/chemical/disk-${chemicalCell.key}")) + } + + private fun addConditionalRecipeForMekanism(resourcePath: String, consumer: Consumer, factory: (Consumer) -> Unit) { + ConditionalRecipe.builder().addCondition( + and( + modLoaded("appmek"), + ) + ).addRecipe() { + factory(it) + }.build(consumer, ResourceLocation(AEAdditions.ID, resourcePath)) + } } \ No newline at end of file diff --git a/src/main/kotlin/com/the9grounds/aeadditions/integration/appeng/AppEng.kt b/src/main/kotlin/com/the9grounds/aeadditions/integration/appeng/AppEng.kt index f1410378..62f2efe5 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/integration/appeng/AppEng.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/integration/appeng/AppEng.kt @@ -1,7 +1,9 @@ package com.the9grounds.aeadditions.integration.appeng import appeng.api.storage.StorageCells +import com.the9grounds.aeadditions.integration.Mods import com.the9grounds.aeadditions.me.storage.AEAdditionsCellHandler +import com.the9grounds.aeadditions.me.storage.ExtendedDiskCellHandler import com.the9grounds.aeadditions.me.storage.SuperCellHandler class AppEng { @@ -10,9 +12,9 @@ class AppEng { fun initCellHandler() { StorageCells.addCellHandler(AEAdditionsCellHandler) StorageCells.addCellHandler(SuperCellHandler) -// if (Mods.AE2THINGS.isEnabled) { -// StorageCells.addCellHandler(ExtendedDiskCellHandler()) -// } + if (Mods.AE2THINGS.isEnabled) { + StorageCells.addCellHandler(ExtendedDiskCellHandler()) + } } } } \ No newline at end of file diff --git a/src/main/kotlin/com/the9grounds/aeadditions/item/storage/DiskCell.kt.disabled b/src/main/kotlin/com/the9grounds/aeadditions/item/storage/DiskCell.kt similarity index 92% rename from src/main/kotlin/com/the9grounds/aeadditions/item/storage/DiskCell.kt.disabled rename to src/main/kotlin/com/the9grounds/aeadditions/item/storage/DiskCell.kt index 7dd54eca..539542ae 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/item/storage/DiskCell.kt.disabled +++ b/src/main/kotlin/com/the9grounds/aeadditions/item/storage/DiskCell.kt @@ -12,11 +12,11 @@ import appeng.hooks.AEToolItem import appeng.items.contents.CellConfig import appeng.util.ConfigInventory import appeng.util.InteractionUtil +import io.github.projectet.ae2things.item.AETItems import io.github.projectet.ae2things.storage.DISKCellHandler import io.github.projectet.ae2things.storage.IDISKCellItem import net.minecraft.ChatFormatting import net.minecraft.network.chat.Component -import net.minecraft.network.chat.TextComponent import net.minecraft.world.InteractionHand import net.minecraft.world.InteractionResult import net.minecraft.world.InteractionResultHolder @@ -32,7 +32,7 @@ import net.minecraft.world.level.Level /** * Need to overwrite as the original one puts it into the ae2things creative tab */ -class DiskCell(properties: Item.Properties, private val _keyType: AEKeyType, val component: ItemLike, val housing: ItemLike, val kilobytes: Int, val _idleDrain: Double) : DiskCellWithoutMod(properties), IDISKCellItem, AEToolItem { +class DiskCell(properties: Item.Properties, private val _keyType: AEKeyType, val component: ItemLike, val housing: ItemLike?, val kilobytes: Int, val _idleDrain: Double) : DiskCellWithoutMod(properties), IDISKCellItem, AEToolItem { override fun getKeyType(): AEKeyType { return _keyType } @@ -109,7 +109,7 @@ class DiskCell(properties: Item.Properties, private val _keyType: AEKeyType, val } // drop empty storage cell case - playerInventory.placeItemBackInInventory(ItemStack(housing)) + playerInventory.placeItemBackInInventory(ItemStack(housing ?: AETItems.DISK_HOUSING.get())) return true } } @@ -133,8 +133,7 @@ class DiskCell(properties: Item.Properties, private val _keyType: AEKeyType, val context: TooltipFlag? ) { tooltip.add( - TextComponent("Deep Item Storage disK - Storage for dummies") - .withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC) + Component.literal("Deep Item Storage disK - Storage for dummies").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC) ) addCellInformationToTooltip(stack, tooltip) } diff --git a/src/main/kotlin/com/the9grounds/aeadditions/me/storage/ExtendedDiskCellHandler.kt.disabled b/src/main/kotlin/com/the9grounds/aeadditions/me/storage/ExtendedDiskCellHandler.kt similarity index 100% rename from src/main/kotlin/com/the9grounds/aeadditions/me/storage/ExtendedDiskCellHandler.kt.disabled rename to src/main/kotlin/com/the9grounds/aeadditions/me/storage/ExtendedDiskCellHandler.kt diff --git a/src/main/kotlin/com/the9grounds/aeadditions/registries/Cells.kt b/src/main/kotlin/com/the9grounds/aeadditions/registries/Cells.kt index 5f3b80fb..0af964bc 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/registries/Cells.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/registries/Cells.kt @@ -1,6 +1,7 @@ package com.the9grounds.aeadditions.registries import appeng.api.client.StorageCellModels +import com.the9grounds.aeadditions.integration.Mods import net.minecraft.resources.ResourceLocation object Cells { @@ -26,11 +27,11 @@ object Cells { StorageCellModels.registerModel(Items.SUPER_CELL_16M, ResourceLocation("ae2additions:block/drive/cells/super/16m")) StorageCellModels.registerModel(Items.SUPER_CELL_65M, ResourceLocation("ae2additions:block/drive/cells/super/65m")) -// if (Mods.APPMEK.isEnabled) { -// StorageCellModels.registerModel(Items.CHEMICAL_STORAGE_CELL_1024k, ResourceLocation("ae2additions:block/drive/cells/chemical/1024k")) -// StorageCellModels.registerModel(Items.CHEMICAL_STORAGE_CELL_4096k, ResourceLocation("ae2additions:block/drive/cells/chemical/4096k")) -// StorageCellModels.registerModel(Items.CHEMICAL_STORAGE_CELL_16384k, ResourceLocation("ae2additions:block/drive/cells/chemical/16384k")) -// } + if (Mods.APPMEK.isEnabled) { + StorageCellModels.registerModel(Items.CHEMICAL_STORAGE_CELL_1024k, ResourceLocation("ae2additions:block/drive/cells/chemical/1024k")) + StorageCellModels.registerModel(Items.CHEMICAL_STORAGE_CELL_4096k, ResourceLocation("ae2additions:block/drive/cells/chemical/4096k")) + StorageCellModels.registerModel(Items.CHEMICAL_STORAGE_CELL_16384k, ResourceLocation("ae2additions:block/drive/cells/chemical/16384k")) + } // if (Mods.AE2THINGS.isEnabled) { // StorageCellModels.registerModel(Items.DISK_256k, ResourceLocation("ae2additions:block/drive/cells/item/disk_256k")) // StorageCellModels.registerModel(Items.DISK_1024k, ResourceLocation("ae2additions:block/drive/cells/item/disk_1024k")) diff --git a/src/main/kotlin/com/the9grounds/aeadditions/registries/Items.kt b/src/main/kotlin/com/the9grounds/aeadditions/registries/Items.kt index 7813e9fb..841e8968 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/registries/Items.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/registries/Items.kt @@ -6,11 +6,16 @@ import appeng.items.materials.StorageComponentItem import com.the9grounds.aeadditions.AEAdditions import com.the9grounds.aeadditions.core.CreativeTab import com.the9grounds.aeadditions.integration.Mods +import com.the9grounds.aeadditions.item.storage.DiskCell +import com.the9grounds.aeadditions.item.storage.DiskCellWithoutMod import com.the9grounds.aeadditions.item.storage.StorageCell import com.the9grounds.aeadditions.item.storage.SuperStorageCell +import me.ramidzkh.mekae2.AMItems +import me.ramidzkh.mekae2.ae2.MekanismKeyType import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.Item import net.minecraft.world.item.Rarity +import net.minecraft.world.level.ItemLike import net.minecraftforge.registries.DeferredRegister import net.minecraftforge.registries.ForgeRegistries import thedarkcolour.kotlinforforge.forge.registerObject @@ -37,7 +42,7 @@ object Items { val SUPER_CELL_COMPONENT_65M = createItem(Ids.SUPER_CELL_COMPONENT_65M) { properties -> StorageComponentItem(properties, 65536) } val ITEM_STORAGE_CELL_1024k = createItem(Ids.ITEM_STORAGE_CELL_1024) { properties -> StorageCell(properties.stacksTo(1), CELL_COMPONENT_1024k, AEItems.ITEM_CELL_HOUSING, 4.0, 4096, 1024, 100, AEKeyType.items())} - val ITEM_STORAGE_CELL_4096k = createItem(Ids.ITEM_STORAGE_CELL_4096) { properties -> StorageCell(properties.stacksTo(1).rarity(Rarity.RARE), CELL_COMPONENT_4096k, AEItems.ITEM_CELL_HOUSING, 5.0, 8192, 8192, 150, AEKeyType.items())} + val ITEM_STORAGE_CELL_4096k = createItem(Ids.ITEM_STORAGE_CELL_4096) { properties -> StorageCell(properties.stacksTo(1).rarity(Rarity.RARE), CELL_COMPONENT_4096k, AEItems.ITEM_CELL_HOUSING, 5.0, 8192, 4096, 150, AEKeyType.items())} val ITEM_STORAGE_CELL_16384k = createItem(Ids.ITEM_STORAGE_CELL_16384) { properties -> StorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), CELL_COMPONENT_16384k, AEItems.ITEM_CELL_HOUSING, 6.0, 32768, 16384, 200, AEKeyType.items())} val ITEM_STORAGE_CELL_65536k = createItem(Ids.ITEM_STORAGE_CELL_65536) { properties -> StorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), CELL_COMPONENT_65536k, AEItems.ITEM_CELL_HOUSING, 10.0, 131072, 65536, 300, AEKeyType.items())} @@ -58,61 +63,61 @@ object Items { val SUPER_CELL_65M = createItem(Ids.SUPER_CELL_65M) { properties -> SuperStorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), SUPER_CELL_COMPONENT_65M, SUPER_CELL_HOUSING, 30.0, 131072, 65536, 300) } val DISK_FLUID_HOUSING = createItem(Ids.DISK_FLUID_HOUSING, { Item(it.stacksTo(64))}, Mods.AE2THINGS) -// val DISK_CHEMICAL_HOUSING = createItem(Ids.DISK_CHEMICAL_HOUSING, { Item(it.stacksTo(64))}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_HOUSING = createItem(Ids.DISK_CHEMICAL_HOUSING, { Item(it.stacksTo(64))}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_256k by createItemForMod(Ids.DISK_256k, { loadDiskCell(it.stacksTo(1), AEKeyType.items(), AEItems.CELL_COMPONENT_256K, getAEThingsHousing(),256, 3.0) }, Mods.AE2THINGS) -// val DISK_1024k by createItemForMod(Ids.DISK_1024k, { loadDiskCell(it.stacksTo(1), AEKeyType.items(), getCorrectComponent(1024), getAEThingsHousing(), 1024, 5.0) }, Mods.AE2THINGS) -// val DISK_4096k by createItemForMod(Ids.DISK_4096k, { loadDiskCell(it.stacksTo(1).rarity(Rarity.UNCOMMON), AEKeyType.items(), getCorrectComponent(4096), getAEThingsHousing(), 4096, 8.0) }, Mods.AE2THINGS) -// val DISK_16384k by createItemForMod(Ids.DISK_16384k, { loadDiskCell(it.stacksTo(1).rarity(Rarity.RARE), AEKeyType.items(), getCorrectComponent(16384), getAEThingsHousing(), 16384, 10.0) }, Mods.AE2THINGS) -// val DISK_65536k by createItemForMod(Ids.DISK_65536k, { loadDiskCell(it.stacksTo(1).rarity(Rarity.EPIC), AEKeyType.items(), getCorrectComponent(65536), getAEThingsHousing(), 65536, 15.0) }, Mods.AE2THINGS) -// -// val DISK_FLUID_1k = createItem(Ids.DISK_FLUID_1k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_1K, DISK_FLUID_HOUSING, 1, .5)}, Mods.AE2THINGS) -// val DISK_FLUID_4k = createItem(Ids.DISK_FLUID_4k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_4K, DISK_FLUID_HOUSING, 4, 1.0)}, Mods.AE2THINGS) -// val DISK_FLUID_16k = createItem(Ids.DISK_FLUID_16k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_16K, DISK_FLUID_HOUSING, 16, 1.5)}, Mods.AE2THINGS) -// val DISK_FLUID_64k = createItem(Ids.DISK_FLUID_64k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_64K, DISK_FLUID_HOUSING, 64, 2.0)}, Mods.AE2THINGS) -// val DISK_FLUID_256k = createItem(Ids.DISK_FLUID_256k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_256K, DISK_FLUID_HOUSING, 256, 4.0)}, Mods.AE2THINGS) -// val DISK_FLUID_1024k = createItem(Ids.DISK_FLUID_1024k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(1024), DISK_FLUID_HOUSING, 1024, 6.0)}, Mods.AE2THINGS) -// val DISK_FLUID_4096k = createItem(Ids.DISK_FLUID_4096k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(4096), DISK_FLUID_HOUSING, 4096, 8.0)}, Mods.AE2THINGS) -// val DISK_FLUID_16384k = createItem(Ids.DISK_FLUID_16384k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(16384), DISK_FLUID_HOUSING, 16384, 10.0)}, Mods.AE2THINGS) -// val DISK_FLUID_65536k = createItem(Ids.DISK_FLUID_65536k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(65536), DISK_FLUID_HOUSING, 65536, 15.0)}, Mods.AE2THINGS) -// -// val DISK_CHEMICAL_1k = createItem(Ids.DISK_CHEMICAL_1k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(1), DISK_CHEMICAL_HOUSING, 1, .5)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_4k = createItem(Ids.DISK_CHEMICAL_4k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(4), DISK_CHEMICAL_HOUSING, 4, 1.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_16k = createItem(Ids.DISK_CHEMICAL_16k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(16), DISK_CHEMICAL_HOUSING, 16, 1.5)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_64k = createItem(Ids.DISK_CHEMICAL_64k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(64), DISK_CHEMICAL_HOUSING, 64, 2.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_256k = createItem(Ids.DISK_CHEMICAL_256k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(256), DISK_CHEMICAL_HOUSING, 256, 4.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_1024k = createItem(Ids.DISK_CHEMICAL_1024k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(1024), DISK_CHEMICAL_HOUSING, 1024, 6.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_4096k = createItem(Ids.DISK_CHEMICAL_4096k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(4096), DISK_CHEMICAL_HOUSING, 4096, 8.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_16384k = createItem(Ids.DISK_CHEMICAL_16384k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(16384), DISK_CHEMICAL_HOUSING, 16384, 10.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val DISK_CHEMICAL_65536k = createItem(Ids.DISK_CHEMICAL_65536k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), getCorrectComponent(65536), DISK_CHEMICAL_HOUSING, 65536, 15.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_256k = createItemForMod(Ids.DISK_256k, { loadDiskCell(it.stacksTo(1), AEKeyType.items(), AEItems.CELL_COMPONENT_256K, getAEThingsHousing(),256, 3.0) }, Mods.AE2THINGS) + val DISK_1024k = createItemForMod(Ids.DISK_1024k, { loadDiskCell(it.stacksTo(1), AEKeyType.items(), CELL_COMPONENT_1024k, getAEThingsHousing(), 1024, 5.0) }, Mods.AE2THINGS) + val DISK_4096k = createItemForMod(Ids.DISK_4096k, { loadDiskCell(it.stacksTo(1).rarity(Rarity.UNCOMMON), AEKeyType.items(), CELL_COMPONENT_4096k, getAEThingsHousing(), 4096, 8.0) }, Mods.AE2THINGS) + val DISK_16384k = createItemForMod(Ids.DISK_16384k, { loadDiskCell(it.stacksTo(1).rarity(Rarity.RARE), AEKeyType.items(), CELL_COMPONENT_16384k, getAEThingsHousing(), 16384, 10.0) }, Mods.AE2THINGS) + val DISK_65536k = createItemForMod(Ids.DISK_65536k, { loadDiskCell(it.stacksTo(1).rarity(Rarity.EPIC), AEKeyType.items(), CELL_COMPONENT_65536k, getAEThingsHousing(), 65536, 15.0) }, Mods.AE2THINGS) + + val DISK_FLUID_1k = createItem(Ids.DISK_FLUID_1k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_1K, DISK_FLUID_HOUSING, 1, .5)}, Mods.AE2THINGS) + val DISK_FLUID_4k = createItem(Ids.DISK_FLUID_4k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_4K, DISK_FLUID_HOUSING, 4, 1.0)}, Mods.AE2THINGS) + val DISK_FLUID_16k = createItem(Ids.DISK_FLUID_16k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_16K, DISK_FLUID_HOUSING, 16, 1.5)}, Mods.AE2THINGS) + val DISK_FLUID_64k = createItem(Ids.DISK_FLUID_64k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_64K, DISK_FLUID_HOUSING, 64, 2.0)}, Mods.AE2THINGS) + val DISK_FLUID_256k = createItem(Ids.DISK_FLUID_256k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), AEItems.CELL_COMPONENT_256K, DISK_FLUID_HOUSING, 256, 4.0)}, Mods.AE2THINGS) + val DISK_FLUID_1024k = createItem(Ids.DISK_FLUID_1024k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), CELL_COMPONENT_1024k, DISK_FLUID_HOUSING, 1024, 6.0)}, Mods.AE2THINGS) + val DISK_FLUID_4096k = createItem(Ids.DISK_FLUID_4096k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), CELL_COMPONENT_4096k, DISK_FLUID_HOUSING, 4096, 8.0)}, Mods.AE2THINGS) + val DISK_FLUID_16384k = createItem(Ids.DISK_FLUID_16384k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), CELL_COMPONENT_16384k, DISK_FLUID_HOUSING, 16384, 10.0)}, Mods.AE2THINGS) + val DISK_FLUID_65536k = createItem(Ids.DISK_FLUID_65536k, { loadDiskCell(it.stacksTo(1), AEKeyType.fluids(), CELL_COMPONENT_65536k, DISK_FLUID_HOUSING, 65536, 15.0)}, Mods.AE2THINGS) + + val DISK_CHEMICAL_1k = createItem(Ids.DISK_CHEMICAL_1k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, AEItems.CELL_COMPONENT_1K, DISK_CHEMICAL_HOUSING, 1, .5)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_4k = createItem(Ids.DISK_CHEMICAL_4k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, AEItems.CELL_COMPONENT_4K, DISK_CHEMICAL_HOUSING, 4, 1.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_16k = createItem(Ids.DISK_CHEMICAL_16k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, AEItems.CELL_COMPONENT_16K, DISK_CHEMICAL_HOUSING, 16, 1.5)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_64k = createItem(Ids.DISK_CHEMICAL_64k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, AEItems.CELL_COMPONENT_64K, DISK_CHEMICAL_HOUSING, 64, 2.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_256k = createItem(Ids.DISK_CHEMICAL_256k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, AEItems.CELL_COMPONENT_256K, DISK_CHEMICAL_HOUSING, 256, 4.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_1024k = createItem(Ids.DISK_CHEMICAL_1024k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, CELL_COMPONENT_1024k, DISK_CHEMICAL_HOUSING, 1024, 6.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_4096k = createItem(Ids.DISK_CHEMICAL_4096k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, CELL_COMPONENT_4096k, DISK_CHEMICAL_HOUSING, 4096, 8.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_16384k = createItem(Ids.DISK_CHEMICAL_16384k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, CELL_COMPONENT_16384k, DISK_CHEMICAL_HOUSING, 16384, 10.0)}, Mods.AE2THINGS, Mods.APPMEK) + val DISK_CHEMICAL_65536k = createItem(Ids.DISK_CHEMICAL_65536k, { loadDiskCell(it.stacksTo(1), MekanismKeyType.TYPE, CELL_COMPONENT_65536k, DISK_CHEMICAL_HOUSING, 65536, 15.0)}, Mods.AE2THINGS, Mods.APPMEK) -// val CHEMICAL_STORAGE_CELL_1024k by REGISTRY.registerObject(Ids.CHEMICAL_STORAGE_CELL_1024.path) { -// constructItem({ properties -> -// if (Mods.APPMEK.isEnabled) { -// return@constructItem StorageCell(properties.stacksTo(1).rarity(Rarity.RARE), CELL_COMPONENT_1024k, AMItems.CHEMICAL_CELL_HOUSING.get(), 4.0, 4096, 1024, 8, MekanismKeyType.TYPE) -// } -// Item(properties) -// }, Ids.CHEMICAL_STORAGE_CELL_1024, Mods.APPMEK) -// } -// val CHEMICAL_STORAGE_CELL_4096k by REGISTRY.registerObject(Ids.CHEMICAL_STORAGE_CELL_4096.path) { -// constructItem({ properties -> -// if (Mods.APPMEK.isEnabled) { -// return@constructItem StorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), CELL_COMPONENT_4096k, AMItems.CHEMICAL_CELL_HOUSING.get(), 5.0, 8192, 4096, 12, MekanismKeyType.TYPE) -// } -// -// Item(properties) -// }, Ids.CHEMICAL_STORAGE_CELL_4096, Mods.APPMEK) -// } -// -// val CHEMICAL_STORAGE_CELL_16384k by REGISTRY.registerObject(Ids.CHEMICAL_STORAGE_CELL_16384.path) { -// constructItem({ properties -> -// if (Mods.APPMEK.isEnabled) { -// return@constructItem StorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), CELL_COMPONENT_16384k, AMItems.CHEMICAL_CELL_HOUSING.get(), 6.0, 32768, 16384, 15, MekanismKeyType.TYPE) -// } -// -// Item(properties) -// }, Ids.CHEMICAL_STORAGE_CELL_16384, Mods.APPMEK) -// } + val CHEMICAL_STORAGE_CELL_1024k by REGISTRY.registerObject(Ids.CHEMICAL_STORAGE_CELL_1024.path) { + constructItem({ properties -> + if (Mods.APPMEK.isEnabled) { + return@constructItem StorageCell(properties.stacksTo(1).rarity(Rarity.RARE), CELL_COMPONENT_1024k, AMItems.CHEMICAL_CELL_HOUSING.get(), 4.0, 4096, 1024, 8, MekanismKeyType.TYPE) + } + Item(properties) + }, Ids.CHEMICAL_STORAGE_CELL_1024, Mods.APPMEK) + } + val CHEMICAL_STORAGE_CELL_4096k by REGISTRY.registerObject(Ids.CHEMICAL_STORAGE_CELL_4096.path) { + constructItem({ properties -> + if (Mods.APPMEK.isEnabled) { + return@constructItem StorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), CELL_COMPONENT_4096k, AMItems.CHEMICAL_CELL_HOUSING.get(), 5.0, 8192, 4096, 12, MekanismKeyType.TYPE) + } + + Item(properties) + }, Ids.CHEMICAL_STORAGE_CELL_4096, Mods.APPMEK) + } + + val CHEMICAL_STORAGE_CELL_16384k by REGISTRY.registerObject(Ids.CHEMICAL_STORAGE_CELL_16384.path) { + constructItem({ properties -> + if (Mods.APPMEK.isEnabled) { + return@constructItem StorageCell(properties.stacksTo(1).rarity(Rarity.EPIC), CELL_COMPONENT_16384k, AMItems.CHEMICAL_CELL_HOUSING.get(), 6.0, 32768, 16384, 15, MekanismKeyType.TYPE) + } + + Item(properties) + }, Ids.CHEMICAL_STORAGE_CELL_16384, Mods.APPMEK) + } fun init() { @@ -136,10 +141,13 @@ object Items { return item } - fun createItemForMod(id: ResourceLocation, factory: (Item.Properties) -> T, vararg requiredMod: Mods): ReadOnlyProperty { - return REGISTRY.registerObject(id.path) { - constructItem(factory, id, *requiredMod) + fun createItemForMod(id: ResourceLocation, factory: (Item.Properties) -> T, vararg requiredMod: Mods): T { + val item = constructItem(factory, id, *requiredMod) + REGISTRY.registerObject(id.path) { + item } + + return item } private fun constructItem( @@ -195,19 +203,19 @@ object Items { } } -// fun loadDiskCell(props: Item.Properties, keyType: AEKeyType, component: ItemLike, housing: ItemLike, kiloBytes: Int, idleDrain: Double): DiskCellWithoutMod { -// return if (Mods.AE2THINGS.isEnabled) { -// DiskCell(props, keyType, component, housing, kiloBytes, idleDrain) -// } else { -// DiskCellWithoutMod(props) -// } -// } -// -// private fun getAEThingsHousing(): Item { -// return if (Mods.AE2THINGS.isEnabled) { -// AETItems.DISK_HOUSING.get() -// } else { -// DISK_FLUID_HOUSING -// } -// } + fun loadDiskCell(props: Item.Properties, keyType: AEKeyType, component: ItemLike, housing: ItemLike?, kiloBytes: Int, idleDrain: Double): DiskCellWithoutMod { + return if (Mods.AE2THINGS.isEnabled) { + DiskCell(props, keyType, component, housing, kiloBytes, idleDrain) + } else { + DiskCellWithoutMod(props) + } + } + + private fun getAEThingsHousing(): Item? { + return if (Mods.AE2THINGS.isEnabled) { + null + } else { + DISK_FLUID_HOUSING + } + } } \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 166276ba..8db51b1d 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -40,18 +40,18 @@ mandatory=false ordering="AFTER" versionRange="[10.3.3,)" side="BOTH" -#[[dependencies.ae2additions]] -#modId="appmek" -#mandatory=false -#ordering="AFTER" -#versionRange="[1.3.1,)" -#side="BOTH" -#[[dependencies.ae2additions]] -#modId="ae2things" -#mandatory=false -#ordering="AFTER" -#versionRange="[1.0.0,)" -#side="BOTH" +[[dependencies.ae2additions]] +modId="appmek" +mandatory=false +ordering="AFTER" +versionRange="[1.3.1,)" +side="BOTH" +[[dependencies.ae2additions]] +modId="ae2things" +mandatory=false +ordering="AFTER" +versionRange="[1.0.0,)" +side="BOTH" #[[dependencies.ae2additions]] #modId="ftbteams" #mandatory=false