diff --git a/CHANGELOG.md b/CHANGELOG.md index e192afb8c..49a41d2d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fixed missing quern recipes for softwood/hardwood pulp (#1561) @Pyritie - Fixed duplicate red alloy mixing recipe (#1565) @Pyritie - Fixed many raw ores missing smelting recipes (#1566) @Pyritie +- Fixed duplicate fluix block, preventing AE2 controllers from being crafted @Pyritie ## [0.10.7] - 07-08-2025 - Fixed an issue with mod dependencies diff --git a/kubejs/startup_scripts/ae2/materials.js b/kubejs/startup_scripts/ae2/materials.js index b154b53ea..316f6fe33 100644 --- a/kubejs/startup_scripts/ae2/materials.js +++ b/kubejs/startup_scripts/ae2/materials.js @@ -11,7 +11,7 @@ const registerAE2Materials = (event) => { GTMaterialFlags.CRYSTALLIZABLE, GTMaterialFlags.DISABLE_DECOMPOSITION ) - .components('1x nether_quartz', '1x certus_quartz', '1x ruby') + .components('1x nether_quartz', '1x certus_quartz') .color(0x8f5ccb) .secondaryColor(0x252f5a) } \ No newline at end of file diff --git a/kubejs/startup_scripts/ae2/tag_prefixes.js b/kubejs/startup_scripts/ae2/tag_prefixes.js index 3f9019ddd..e5b1f25b5 100644 --- a/kubejs/startup_scripts/ae2/tag_prefixes.js +++ b/kubejs/startup_scripts/ae2/tag_prefixes.js @@ -2,11 +2,12 @@ "use strict"; const registerAE2TagPrefixes = (event) => { + const $AE_BLOCKS = Java.loadClass('appeng.core.definitions.AEBlocks'); const $AE_ITEMS = Java.loadClass('appeng.core.definitions.AEItems'); const Fluix = GTCEuAPI.materialManager.getMaterial('tfg:fluix') - // Blocks have to be handled in java because ae2 is weird + TagPrefix.block.setIgnored(Fluix, $AE_BLOCKS.FLUIX_BLOCK); TagPrefix.dust.setIgnored(Fluix, $AE_ITEMS.FLUIX_DUST); TagPrefix.gem.setIgnored(Fluix, $AE_ITEMS.FLUIX_CRYSTAL); diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index fc8ffef11..259ecaccc 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -368,19 +368,20 @@ const registerGTCEuMaterialModification = (event) => { global.MINECRAFT_DYE_NAMES.forEach(colorName => { - let material = GTCEuAPI.materialManager.getMaterial(`gtceu:${colorName}_dye`); + let material = GTMaterials.get(`gtceu:${colorName}_dye`); let property = material.getProperty(PropertyKey.FLUID); property.getStorage().store($FluidStorageKeys.LIQUID, () => Fluid.of(`tfc:${colorName}_dye`).fluid, null); }); - let rose_quartz = GTCEuAPI.materialManager.getMaterial('greate:rose_quartz'); + let rose_quartz = GTMaterials.get('greate:rose_quartz'); rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY()); rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz); rose_quartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) - GTCEuAPI.materialManager.getMaterial('tfg:kaolinite').setFormula("Al2Si2O5(OH)4", true) - GTCEuAPI.materialManager.getMaterial('tfg:vitrified_pearl').setFormula("(Al2Si2O5(OH)4)(BeK4N5)", true) - GTCEuAPI.materialManager.getMaterial('tfg:tmos').setFormula("Si(OCH3)4", true) - + GTMaterials.get('tfg:kaolinite').setFormula("Al2Si2O5(OH)4", true) + GTMaterials.get('tfg:vitrified_pearl').setFormula("(Al2Si2O5(OH)4)(BeK4N5)", true) + GTMaterials.get('tfg:tmos').setFormula("Si(OCH3)4", true) + GTMaterials.get('tfg:fluix').setFormula("?(?SiO2)(SiO2)", true) + GTMaterials.CertusQuartz.setFormula("?SiO2", true) }