diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js new file mode 100644 index 000000000..d8b1a2de0 --- /dev/null +++ b/kubejs/client_scripts/constants.js @@ -0,0 +1 @@ +// priority: 0 \ No newline at end of file diff --git a/kubejs/client_scripts/example.js b/kubejs/client_scripts/example.js deleted file mode 100644 index a0441f6bd..000000000 --- a/kubejs/client_scripts/example.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 - -// Visit the wiki for more info - https://kubejs.com/ - -console.info('Hello, World! (Loaded client scripts)') - diff --git a/kubejs/client_scripts/gregtech/rei.js b/kubejs/client_scripts/gregtech/rei.js new file mode 100644 index 000000000..3fa3f4276 --- /dev/null +++ b/kubejs/client_scripts/gregtech/rei.js @@ -0,0 +1,27 @@ +// priority: 0 + +const stoneTypesToHide = [ + "sand", + "red_sand", + "gravel", + "ore", + "deepslate", + "basalt", + "endstone", + "netherrack", + "andesite", + "diorite", + "granite", + "tuff" +] + +REIEvents.hide('item', event => { + + // Hide unused GT ores + GTRegistries.MATERIALS.forEach(material => { + global.stoneTypesToHide.forEach(stoneTypeName => { + event.hide(`#forge:ores/${stoneTypeName}/${material}`) + }) + }) + +}) \ No newline at end of file diff --git a/kubejs/client_scripts/tfc/rei.js b/kubejs/client_scripts/tfc/rei.js new file mode 100644 index 000000000..366e0ad98 --- /dev/null +++ b/kubejs/client_scripts/tfc/rei.js @@ -0,0 +1,67 @@ +// priority: 0 + +const tfcSimpleMaterials = [ + "gypsum", + "cinnabar", + "cryolite", + "saltpeter", + "sylvite", + "borax", + "halite", + "amethyst", + "opal", + "pyrite", + "topaz" +] + +const tfcOreTypes = [ + "poor", + "normal", + "rich" +] + +const tfcOreMaterials = [ + "bismuthinite", + "cassiterite", + "garnierite", + "hematite", + "limonite", + "magnetite", + "malachite", + "native_copper", + "native_gold", + "native_silver", + "sphalerite", + "tetrahedrite" +] + +const tfcDepositeMaterials = [ + "cassiterite", + "native_copper", + "native_gold", + "native_silver" +] + +REIEvents.hide('item', event => { + + // Hide unused TFC ores + global.allTFCStoneTypeNames.forEach(stoneTypeName => { + tfcSimpleMaterials.forEach(material => { + event.hide(`tfc:ore/${material}/${stoneTypeName}`) + }) + + tfcOreTypes.forEach(oreTypeName => { + tfcOreMaterials.forEach(oreMaterialName => { + event.hide(`tfc:ore/${oreTypeName}_${oreMaterialName}/${stoneTypeName}`) + }) + }) + + tfcDepositeMaterials.forEach(depositeMaterialName => { + event.hide(`tfc:deposit/${depositeMaterialName}/${stoneTypeName}`) + }) + }) + + + + +}) \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 978eeec10..f9ed21d1c 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -26,24 +26,18 @@ const doesMaterialUseNormalFurnace = (material) => { const generateRecipesForRawOres = (event, material) => { const materialOreProperty = material.getProperty($PropertyKey.ORE) - - const ingotPrefix = TagPrefix.getPrefix('ingot') - const gemPrefix = TagPrefix.getPrefix('gem') - const dustPrefix = TagPrefix.getPrefix('dust') - const crushedOrePrefix = TagPrefix.getPrefix('crushedOre') - - const crushedStack = ChemicalHelper.get(crushedOrePrefix, material, 1); + const crushedStack = ChemicalHelper.get(TagPrefix.crushed, material, 1); let ingotStack; const smeltingMaterial = materialOreProperty.getDirectSmeltResult() == null ? material : materialOreProperty.getDirectSmeltResult(); const amountOfCrushedOre = materialOreProperty.getOreMultiplier(); if (smeltingMaterial.hasProperty($PropertyKey.INGOT)) { - ingotStack = ChemicalHelper.get(ingotPrefix, smeltingMaterial, 1); + ingotStack = ChemicalHelper.get(TagPrefix.ingot, smeltingMaterial, 1); } else if (smeltingMaterial.hasProperty($PropertyKey.GEM)) { - ingotStack = ChemicalHelper.get(gemPrefix, smeltingMaterial, 1); + ingotStack = ChemicalHelper.get(TagPrefix.gem, smeltingMaterial, 1); } else { - ingotStack = ChemicalHelper.get(dustPrefix, smeltingMaterial, 1); + ingotStack = ChemicalHelper.get(TagPrefix.dust, smeltingMaterial, 1); } ingotStack.setCount(ingotStack.getCount() * materialOreProperty.getOreMultiplier()); crushedStack.setCount(crushedStack.getCount() * materialOreProperty.getOreMultiplier()); @@ -53,7 +47,7 @@ const generateRecipesForRawOres = (event, material) => { const generateRecipes = (tagPrefixWithMaterial, tagPrefix, multiplier) => { let outputItems; - if (material.hasProperty($PropertyKey.GEM) && !gemPrefix.isIgnored(material)) { + if (material.hasProperty($PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) { outputItems = `${amountOfCrushedOre * multiplier}x #forge:gems/${material}` } else { outputItems = `${amountOfCrushedOre * multiplier}x #forge:crushed_ores/${material}` diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js index 7d23016c7..311c21606 100644 --- a/kubejs/startup_scripts/constants.js +++ b/kubejs/startup_scripts/constants.js @@ -1,5 +1,20 @@ // priority: 1000 +global.stoneTypesToHide = [ + "sand", + "red_sand", + "gravel", + "ore", + "deepslate", + "basalt", + "endstone", + "netherrack", + "andesite", + "diorite", + "granite", + "tuff" +] + global.allTFCStoneTypeNames = [ 'gabbro', 'shale',