diff --git a/kubejs/server_scripts/tfg/food/data.planters.js b/kubejs/server_scripts/tfg/food/data.planters.js index e694e6ca7..caac37e0b 100644 --- a/kubejs/server_scripts/tfg/food/data.planters.js +++ b/kubejs/server_scripts/tfg/food/data.planters.js @@ -3,6 +3,8 @@ /** @param {Internal.TFCDataEventJS} event */ function registerTFGFLPlanters(event) { + const $FarmlandBlockEntity = Java.loadClass("net.dries007.tfc.common.blockentities.FarmlandBlockEntity") + event.firmalifePlantable( "tfg:sunflower_seeds", "large", @@ -11,7 +13,7 @@ function registerTFGFLPlanters(event) { 0.15, "tfg:sunflower_seeds", "tfg:sunflower_product", - "nitrogen", + $FarmlandBlockEntity.NutrientType.NITROGEN, [ "tfg:block/crop/sunflower_greenhouse_0", "tfg:block/crop/sunflower_greenhouse_1", @@ -29,7 +31,7 @@ function registerTFGFLPlanters(event) { 0.15, "tfg:rapeseed_seeds", "tfg:rapeseed_product", - "phosphorous", + $FarmlandBlockEntity.NutrientType.PHOSPHOROUS, [ "tfg:block/crop/rapeseed_greenhouse_0", "tfg:block/crop/rapeseed_greenhouse_1", @@ -47,7 +49,7 @@ function registerTFGFLPlanters(event) { 0.2, "tfg:flax_seeds", "tfg:flax_product", - "nitrogen", + $FarmlandBlockEntity.NutrientType.NITROGEN, [ "tfg:block/crop/flax_age_0", "tfg:block/crop/flax_age_1", @@ -65,7 +67,7 @@ function registerTFGFLPlanters(event) { 0.15, "betterend:amber_root_seeds", "betterend:amber_root_product", - "phosphorous", + $FarmlandBlockEntity.NutrientType.PHOSPHOROUS, [ "betterend:block/amber_root_0", "betterend:block/amber_root_1", @@ -83,7 +85,7 @@ function registerTFGFLPlanters(event) { 0.15, "betterend:blossom_berry_seeds", "betterend:blossom_berry_product", - "potassium", + $FarmlandBlockEntity.NutrientType.POTASSIUM, [ "betterend:block/blossom_berry_seed_0", "betterend:block/blossom_berry_seed_1", @@ -101,7 +103,7 @@ function registerTFGFLPlanters(event) { 0.15, "betterend:bolux_mushroom_seeds", "betterend:bolux_mushroom_product", - "phosphorous", + $FarmlandBlockEntity.NutrientType.PHOSPHOROUS, [ "betterend:block/bolux_mushroom_greenhouse_0", "betterend:block/bolux_mushroom_greenhouse_1", @@ -119,7 +121,7 @@ function registerTFGFLPlanters(event) { 0.15, "betterend:chorus_mushroom_seeds", "betterend:chorus_mushroom_product", - "phosphorous", + $FarmlandBlockEntity.NutrientType.PHOSPHOROUS, [ "betterend:block/chorus_mushroom_0", "betterend:block/chorus_mushroom_1", @@ -137,7 +139,7 @@ function registerTFGFLPlanters(event) { 0.15, "betterend:cave_pumpkin_plant_seeds", "betterend:cave_pumpkin", - "phosphorous", + $FarmlandBlockEntity.NutrientType.PHOSPHOROUS, [ "betterend:block/cave_pumpkin_greenhouse_0", "betterend:block/cave_pumpkin_greenhouse_1", @@ -155,7 +157,7 @@ function registerTFGFLPlanters(event) { 0.15, "betterend:shadow_berry_seeds", "betterend:shadow_berry_product", - "potassium", + $FarmlandBlockEntity.NutrientType.POTASSIUM, [ "betterend:block/shadow_berry_greenhouse_0", "betterend:block/shadow_berry_greenhouse_1", diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 849baf9e7..4186cccdc 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -1,73 +1,74 @@ const registerGTCEuRecipeTypes = (event) => { + const $EnergyIO = Java.loadClass("com.gregtechceu.gtceu.api.capability.recipe.IO") event.create('large_solar_panel') .category('generator') - .setEUIO('out') + .setEUIO($EnergyIO.OUT) .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) event.create('large_solar_panel_tier2') .category('generator') - .setEUIO('out') + .setEUIO($EnergyIO.OUT) .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) event.create('large_solar_panel_tier3') .category('generator') - .setEUIO('out') + .setEUIO($EnergyIO.OUT) .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) -/* - event.create('nuclear_fuel_factory') - .category('nuclear_fuel_factory') - .setEUIO('in') - .setMaxIOSize(6, 1, 1, 1) - .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) - .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.CUT) -*/ + /* + event.create('nuclear_fuel_factory') + .category('nuclear_fuel_factory') + .setEUIO($EnergyIO.IN) + .setMaxIOSize(6, 1, 1, 1) + .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) + .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.CUT) + */ event.create('heat_exchanger') .category('heat_exchanger') - .setEUIO('in') + .setEUIO($EnergyIO.IN) .setMaxIOSize(1, 0, 3, 3) .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.TURBINE) -/* Just keeping it in case we got mod issues - event.create('fission_reactor') - .category('fission_reactor') - .setEUIO('in') - .setMaxIOSize(1, 0, 1, 2) - .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) - .setProgressBar(GuiTextures.PROGRESS_BAR_FUSION, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.ARC) -*/ + /* Just keeping it in case we got mod issues + event.create('fission_reactor') + .category('fission_reactor') + .setEUIO($EnergyIO.IN) + .setMaxIOSize(1, 0, 1, 2) + .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) + .setProgressBar(GuiTextures.PROGRESS_BAR_FUSION, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.ARC) + */ event.create('ostrum_harvester') - .category('ostrum_harvester') - .setEUIO('in') - .setMaxIOSize(0, 1, 1, 0) + .category('ostrum_harvester') + .setEUIO($EnergyIO.IN) + .setMaxIOSize(0, 1, 1, 0) .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.TURBINE) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.TURBINE) event.create('moon_dust_harvester') - .category('moon_dust_harvester') - .setEUIO('in') - .setMaxIOSize(1, 1, 0, 0) + .category('moon_dust_harvester') + .setEUIO($EnergyIO.IN) + .setMaxIOSize(1, 1, 0, 0) .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.TURBINE) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.TURBINE) event.create('coal_liquefaction_tower') - .category('coal_liquefaction_tower') - .setEUIO('in') - .setMaxIOSize(2, 0, 3, 3) + .category('coal_liquefaction_tower') + .setEUIO($EnergyIO.IN) + .setMaxIOSize(2, 0, 3, 3) .setSlotOverlay(false, false, GuiTextures.HEATING_OVERLAY_1) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.COMBUSTION) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.COMBUSTION) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index fb53dba15..dc5a98a6b 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -1,6 +1,7 @@ "use strict"; function registerTFGMarsMaterials(event) { + const $BlastProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty") event.create('liquid_carbon_dioxide') .liquid(100) //Not realistic but I want it to be cryogenic @@ -89,7 +90,7 @@ function registerTFGMarsMaterials(event) { .iconSet(GTMaterialIconSet.getByName('cereal_box')) .ingot() .liquid() - .blastTemp(3700, 'mid', GTValues.VA[GTValues.EV]) + .blastTemp(3700, $BlastProperty.GasTier.MID, GTValues.VA[GTValues.EV]) .flags( GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.FORCE_GENERATE_BLOCK, @@ -103,7 +104,7 @@ function registerTFGMarsMaterials(event) { .ingot() .liquid() .components('2x ostrum', 'iodine') - .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) + .blastTemp(3700, $BlastProperty.GasTier.MID, GTValues.VA[GTValues.IV], (20*120)) .iconSet(GTMaterialIconSet.getByName('cereal_box')) .flags(GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_FOIL) .color(0xc696f2) diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 158fb7185..44285ba28 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -3,6 +3,8 @@ const registerTFGMaterials = (event) => { + const $BlastProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty") + //#region placeholder materials event.create('unknown') .color('0xFFFFFF') @@ -149,7 +151,7 @@ const registerTFGMaterials = (event) => { .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) .ingot() .liquid() - .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) + .blastTemp(3700, $BlastProperty.GasTier.MID, GTValues.VA[GTValues.IV], (20*120)) .rotorStats(250, 90, 2 ,620) .flags( GTMaterialFlags.DISABLE_DECOMPOSITION, @@ -237,7 +239,7 @@ const registerTFGMaterials = (event) => { .iconSet('dull') .color(0x42705D) .components('4x boron', '1x carbon') - .blastTemp(3041, "mid", GTValues.VA[GTValues.HV], 1500) + .blastTemp(3041, $BlastProperty.GasTier.MID, GTValues.VA[GTValues.HV], 1500) .flags(GTMaterialFlags.GENERATE_PLATE) // #endregion diff --git a/kubejs/startup_scripts/tfg/moon/materials.moon.js b/kubejs/startup_scripts/tfg/moon/materials.moon.js index 24722152d..366be5cc7 100644 --- a/kubejs/startup_scripts/tfg/moon/materials.moon.js +++ b/kubejs/startup_scripts/tfg/moon/materials.moon.js @@ -1,6 +1,7 @@ "use strict"; function registerTFGMoonMaterials(event) { + const $BlastProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty") // Solar Panel Chemicals @@ -85,7 +86,7 @@ function registerTFGMoonMaterials(event) { .addOreByproducts('olivine', 'rutile', 'rutile') .ingot() .liquid() - .blastTemp(2800, 'mid', GTValues.VA[GTValues.HV]) + .blastTemp(2800, $BlastProperty.GasTier.MID, GTValues.VA[GTValues.HV]) .flags( GTMaterialFlags.FORCE_GENERATE_BLOCK, GTMaterialFlags.GENERATE_PLATE, diff --git a/kubejs/startup_scripts/tfg/space_general/materials.rockets.js b/kubejs/startup_scripts/tfg/space_general/materials.rockets.js index dbbccfcd6..0b1fb255e 100644 --- a/kubejs/startup_scripts/tfg/space_general/materials.rockets.js +++ b/kubejs/startup_scripts/tfg/space_general/materials.rockets.js @@ -1,6 +1,7 @@ "use strict"; function registerTFGRocketMaterials(event) { + const $BlastProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty") // Space Rocket Materials @@ -10,7 +11,7 @@ function registerTFGRocketMaterials(event) { .color(0x333e47) .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) - .blastTemp(1760, 'low', 256, 900) + .blastTemp(1760, $BlastProperty.GasTier.MID, 256, 900) event.create('rocket_alloy_t2') .ingot() @@ -18,20 +19,20 @@ function registerTFGRocketMaterials(event) { .color(0x3c253d) .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.DISABLE_ALLOY_BLAST) - .blastTemp(3200, 'mid', 1024, 1100) + .blastTemp(3200, $BlastProperty.GasTier.MID, 1024, 1100) .liquid() - -/* event.create('rocket_alloy_t3') - .ingot() - .components('8x titanium', '9x tungsten_steel', '2x tantalum', '2x radon') - .color(0x6c678b) - //.secondaryColor(0xa59fc6) - .liquid() - .removeHazard() - .iconSet('metallic') - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) - .blastTemp(4200, 'high', 4096, 1300) - */ + + /* event.create('rocket_alloy_t3') + .ingot() + .components('8x titanium', '9x tungsten_steel', '2x tantalum', '2x radon') + .color(0x6c678b) + //.secondaryColor(0xa59fc6) + .liquid() + .removeHazard() + .iconSet('metallic') + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) + .blastTemp(4200, $BlastProperty.GasTier.MID, 4096, 1300) + */ // Insulation event.create('vitrified_asbestos') @@ -89,7 +90,7 @@ function registerTFGRocketMaterials(event) { .color(0xCCE3E3) .secondaryColor(0xCCE3E3) //#endregion - + //#region polyurethane event.create('tfg:aniline') .liquid() @@ -103,20 +104,20 @@ function registerTFGRocketMaterials(event) { event.create('tfg:methyl_phenylcarbamate') .liquid() .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) - .components('8x carbon','9x hydrogen','1x nitrogen', '2x oxygen') + .components('8x carbon', '9x hydrogen', '1x nitrogen', '2x oxygen') .color(0xB4EDB4) event.create('tfg:methylene_diphenyl_dicarbamate') .liquid() .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) - .components('17x carbon','18x hydrogen','2x nitrogen', '4x oxygen') + .components('17x carbon', '18x hydrogen', '2x nitrogen', '4x oxygen') .color(0x69C2C1) event.create('tfg:methylene_diphenyl_diisocyanate') .dust() .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) - .components('13x carbon','10x hydrogen','2x nitrogen', '2x oxygen') + .components('13x carbon', '10x hydrogen', '2x nitrogen', '2x oxygen') .color(0xFFFFBA) //#endregion - + //#region aerogel event.create('tfg:tmos') .liquid() diff --git a/kubejs/startup_scripts/tfg/worldgen/fauna.js b/kubejs/startup_scripts/tfg/worldgen/fauna.js index 98a64bcf4..3864ef44c 100644 --- a/kubejs/startup_scripts/tfg/worldgen/fauna.js +++ b/kubejs/startup_scripts/tfg/worldgen/fauna.js @@ -2,18 +2,20 @@ "use strict"; TFCEvents.registerFaunas(event => { - event.replace("tfg:glacian_ram", "on_ground", "ocean_floor"); - event.replace("tfg:sniffer", "on_ground", "ocean_floor"); - event.replace("tfg:wraptor", "on_ground", "ocean_floor"); - event.replace("species:goober", "on_ground", "ocean_floor"); - event.replace("species:springling", "on_ground", "ocean_floor"); - event.replace("wan_ancient_beasts:walker", "on_ground", "ocean_floor"); - event.replace("wan_ancient_beasts:eater", "on_ground", "ocean_floor"); - event.replace("wan_ancient_beasts:crusher", "on_ground", "ocean_floor"); - event.replace("wan_ancient_beasts:snatcher", "on_ground", "ocean_floor"); - event.replace("wan_ancient_beasts:charger", "on_ground", "ocean_floor"); - event.replace("wan_ancient_beasts:raider", "on_ground", "ocean_floor"); + const $SpawnPlacements = Java.loadClass("net.minecraft.world.entity.SpawnPlacements") - event.replace("wan_ancient_beasts:soarer", "no_restrictions", "world_surface"); - event.replace("wan_ancient_beasts:glider", "no_restrictions", "world_surface"); + event.replace("tfg:glacian_ram", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("tfg:sniffer", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("tfg:wraptor", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("species:goober", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("species:springling", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("wan_ancient_beasts:walker", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("wan_ancient_beasts:eater", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("wan_ancient_beasts:crusher", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("wan_ancient_beasts:snatcher", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("wan_ancient_beasts:charger", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + event.replace("wan_ancient_beasts:raider", $SpawnPlacements.Type.ON_GROUND, "ocean_floor"); + + event.replace("wan_ancient_beasts:soarer", $SpawnPlacements.Type.NO_RESTRICTIONS, "world_surface"); + event.replace("wan_ancient_beasts:glider", $SpawnPlacements.Type.NO_RESTRICTIONS, "world_surface"); }) \ No newline at end of file