more bug stuff!

This commit is contained in:
Pyritie 2026-01-02 18:42:58 +00:00
parent 8c7f63c7b0
commit 9e77ddfd61
26 changed files with 956 additions and 278 deletions

View file

@ -0,0 +1,43 @@
"use strict";
/**
*
* @param {Internal.RecipesEventJS} event
*/
function registerArthropocolypseRecipes(event) {
event.remove({ id: 'arthropocolypse:beetle_helmet' });
event.remove({ id: 'arthropocolypse:beetle_chestplate' });
event.remove({ id: 'arthropocolypse:beetle_leggings' });
event.remove({ id: 'arthropocolypse:beetle_boots' });
event.remove({ id: 'arthropocolypse:energy_bar' });
event.remove({ id: 'arthropocolypse:gilded_scale_elytra' });
event.remove({ id: 'arthropocolypse:mandible_shear' });
event.remove({ id: 'arthropocolypse:mandible_dagger' });
event.remove({ id: 'arthropocolypse:cooked_ice_crawler_meat' });
event.remove({ id: 'minecraft:cooked_ice_crawler_meat_from_smoking' });
event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_stairs' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_slabs' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_wall' });
event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks_stairs' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks_slabs' });
event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks_wall' });
event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block_stairs' });
event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block_slabs' });
event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block_wall' });
event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block_stairs' });
event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block_slabs' });
event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block_wall' });
//event.recipes.tfc.knapping('arthropocolypse:mandible_dagger', 'tfc:goat_horn', [
// ' X ',
// ' XX ',
// ' XX ',
// ' XX ',
// ' XX '
//]).ingredient('arthropocolypse:mandible_part').outsideSlotRequired(false).id('tfg:knapping/mandible_dagger')
}

View file

@ -0,0 +1,14 @@
"use strict";
/**
*
* @param {TagEvent.Item} event
*/
const registerArthropocolypseItemTags = (event) => {
global.ARTHROPOCOLYPSE_DISABLED_ITEMS.forEach(element => {
event.removeAllTagsFrom(element);
event.add("c:hidden_from_recipe_viewers", element)
});
event.add('tfc:any_knapping', 'arthropocolypse:mandible_part');
}

View file

@ -11,6 +11,7 @@ ServerEvents.tags('item', event => {
registerAFCItemTags(event)
registerAlekiroofsItemTags(event)
registerAlekishipsItemTags(event)
registerArthropocolypseItemTags(event)
registerAsticorCartsItemTags(event)
registerBeneathItemTags(event)
registerChalkItemTags(event);
@ -207,6 +208,7 @@ ServerEvents.recipes(event => {
registerAlekishipsRecipes(event)
registerAE2Recipes(event)
registerAFCRecipes(event)
registerArthropocolypseRecipes(event)
registerAsticorCartsRecipes(event)
registerAE2InsertExportCardRecipes(event)
registerAE2NetworkAnalyzerRecipes(event)

View file

@ -29,15 +29,15 @@ function registerTFCGurmanRecipes(event) {
TFC.isp.of('tfc_gurman:pepperoni_pizza').firmaLifeCopyDynamicFood().asCanonClass(),
[])
event.recipes.gtceu.food_oven('havai_pizza')
.itemInputs('tfc_gurman:raw_havai_pizza')
.itemOutputs('tfc_gurman:havai_pizza')
event.recipes.gtceu.food_oven('hawaiian_pizza')
.itemInputs('tfc_gurman:raw_hawaiian_pizza')
.itemOutputs('tfc_gurman:hawaiian_pizza')
.duration(200)
.EUt(GTValues.VA[GTValues.LV])
$ISPRecipeLogic.RegisterRecipeData('food_oven/havai_pizza',
[Ingredient.of('tfc_gurman:raw_havai_pizza')],
TFC.isp.of('tfc_gurman:havai_pizza').firmaLifeCopyDynamicFood().asCanonClass(),
$ISPRecipeLogic.RegisterRecipeData('food_oven/hawaiian_pizza',
[Ingredient.of('tfc_gurman:raw_hawaiian_pizza')],
TFC.isp.of('tfc_gurman:hawaiian_pizza').firmaLifeCopyDynamicFood().asCanonClass(),
[])
event.recipes.gtceu.food_oven('four_cheeses_pizza')

View file

@ -56,6 +56,7 @@ function registerTFGVenusBlockTags(event) {
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/basalt')
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/basalt')
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/basalt')
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/magma/basalt')
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/rhyolite')
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/andesite')
event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/andesite')
@ -112,6 +113,12 @@ function registerTFGVenusBlockTags(event) {
event.add("tfc:monster_spawns_on", "minecraft:basalt");
event.add("tfc:monster_spawns_on", "minecraft:smooth_basalt");
event.add("minecraft:strider_warm_blocks", "create:scorchia");
event.add("minecraft:strider_warm_blocks", "minecraft:basalt");
event.add("minecraft:strider_warm_blocks", "minecraft:smooth_basalt");
event.add("minecraft:strider_warm_blocks", 'tfc:rock/raw/basalt');
event.add("minecraft:strider_warm_blocks", 'tfc:rock/magma/basalt');
event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/blue')
event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/green')
event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/brown')
@ -134,18 +141,37 @@ function registerTFGVenusEntityTypeTags(event) {
'minecraft:enderman',
'minecraft:magma_cube',
'minecraft:blaze',
'minecraft:strider',
"endermanoverhaul:desert_enderman",
"endermanoverhaul:savanna_enderman",
"endermanoverhaul:nether_wastes_enderman",
"ad_astra:sulfur_creeper",
'species:cliff_hanger',
'species:trooper',
'primitivecreatures:golem_2'
'primitive_creatures:golem_2',
'arthropocolypse:scarab',
'arthropocolypse:prairie_grasshopper',
'arthropocolypse:field_cricket',
'arthropocolypse:ice_crawler',
'arthropocolypse:behemoth_desert_spider',
'arthropocolypse:behemoth_desert_scorpion',
'arthropocolypse:worker_ant',
'arthropocolypse:soldier_ant',
'arthropocolypse:stag_beetle',
'arthropocolypse:stag_beetle_larva',
'arthropocolypse:wharf_roach',
'arthropocolypse:platerodrilus',
'arthropocolypse:mealworm_beetle',
'arthropocolypse:mealworm',
'arthropocolypse:millipede_head',
'arthropocolypse:millipede_body',
'arthropocolypse:millipede_tail'
]
ENTITIES.forEach(entity => {
event.add('ad_astra:can_survive_extreme_heat', entity)
event.add('ad_astra:lives_without_oxygen', entity)
event.add('ad_astra:can_survive_in_acid_rain', entity)
event.add('gtceu:heat_immune', entity)
})
@ -154,7 +180,17 @@ function registerTFGVenusEntityTypeTags(event) {
event.add('tfc:deals_slashing_damage', 'endermanoverhaul:nether_wastes_enderman')
event.add('tfc:deals_slashing_damage', 'species:cliff_hanger')
event.add('tfc:deals_crushing_damage', 'minecraft:magma_cube')
event.add('tfc:deals_crushing_damage', 'primitivecreatures:golem_2')
event.add('tfc:deals_crushing_damage', 'primitive_creatures:golem_2')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:scarab')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:ice_crawler')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:behemoth_desert_spider')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:behemoth_desert_scorpion')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:soldier_ant')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:stag_beetle')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:wharf_roach')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:platerodrilus')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:mealworm_beetle')
event.add('tfc:deals_piercing_damage', 'arthropocolypse:millipede_head')
}
function registerTFGVenusPlacedFeatures(event) {

View file

@ -23,12 +23,30 @@ const NEW_MOB_MAX_HP = {
"species:cruncher": 1200,
// venus mobs
"endermanoverhaul:savanna_enderman": 65,
"endermanoverhaul:desert_enderman": 70,
"endermanoverhaul:savanna_enderman": 85,
"endermanoverhaul:desert_enderman": 90,
"ad_astra:sulfur_creeper": 60,
"species:cliff_hanger": 75,
"species:trooper": 20,
"minecraft:blaze": 50,
"species:cliff_hanger": 95,
"species:trooper": 30,
"minecraft:blaze": 80,
"minecraft:strider": 50,
'arthropocolypse:scarab': 10,
'arthropocolypse:prairie_grasshopper': 15,
'arthropocolypse:field_cricket': 20,
'arthropocolypse:ice_crawler': 70,
'arthropocolypse:behemoth_desert_spider': 1300,
'arthropocolypse:behemoth_desert_scorpion': 200,
'arthropocolypse:worker_ant': 30,
'arthropocolypse:soldier_ant': 60,
'arthropocolypse:stag_beetle': 90,
'arthropocolypse:stag_beetle_larva': 20,
'arthropocolypse:wharf_roach': 20,
'arthropocolypse:platerodrilus': 95,
'arthropocolypse:mealworm_beetle': 50,
'arthropocolypse:mealworm': 15,
'arthropocolypse:millipede_head': 110,
'arthropocolypse:millipede_body': 110,
'arthropocolypse:millipede_tail': 110,
// europa mobs
"endermanoverhaul:ice_spikes_enderman": 85,
@ -52,6 +70,46 @@ const NEW_MOB_ARMOR = {
"species:cliff_hanger": 2,
};
const NEEDS_FIREPROOFING = [
"primitive_creatures:golem_2",
"endermanoverhaul:savanna_enderman",
"endermanoverhaul:desert_enderman",
'arthropocolypse:scarab',
'arthropocolypse:prairie_grasshopper',
'arthropocolypse:field_cricket',
'arthropocolypse:ice_crawler',
'arthropocolypse:behemoth_desert_spider',
'arthropocolypse:behemoth_desert_scorpion',
'arthropocolypse:worker_ant',
'arthropocolypse:soldier_ant',
'arthropocolypse:stag_beetle',
'arthropocolypse:stag_beetle_larva',
'arthropocolypse:wharf_roach',
'arthropocolypse:platerodrilus',
'arthropocolypse:mealworm_beetle',
'arthropocolypse:mealworm',
'arthropocolypse:millipede_head',
'arthropocolypse:millipede_body',
'arthropocolypse:millipede_tail'
];
const VENUS_DAMAGE_BUFFING = {
"primitive_creatures:golem_2": 10,
"endermanoverhaul:savanna_enderman": 10,
"endermanoverhaul:desert_enderman": 10,
'arthropocolypse:scarab': 4,
'arthropocolypse:ice_crawler': 12,
'arthropocolypse:behemoth_desert_spider': 30,
'arthropocolypse:behemoth_desert_scorpion': 20,
'arthropocolypse:worker_ant': 10,
'arthropocolypse:soldier_ant': 15,
'arthropocolypse:stag_beetle': 8,
'arthropocolypse:wharf_roach': 8,
'arthropocolypse:platerodrilus': 14,
'arthropocolypse:mealworm_beetle': 8,
'arthropocolypse:millipede_head': 20,
};
// Easier to just keep all entities in here for balancing instead of spreading them around
@ -65,50 +123,60 @@ EntityEvents.spawned((event) => {
switch (dimension) {
// use default for beneath
case "ad_astra:moon": newHP = 45;
case "ad_astra:mars": newHP = 55;
case "ad_astra:venus": newHP = 65;
case "ad_astra:mercury": newHP = 65;
case "ad_astra:glacio": newHP = 75;
case "ad_astra:mars": newHP = 65;
case "ad_astra:venus": newHP = 75;
case "ad_astra:mercury": newHP = 75;
case "ad_astra:glacio": newHP = 85;
}
}
else if (type === "endermanoverhaul:nether_wastes_enderman") {
switch (dimension) {
// use default for beneath
case "ad_astra:venus": newHP = 70;
case "ad_astra:venus": newHP = 80;
}
}
else if (type === "minecraft:magma_cube") {
switch (dimension) {
// use default for beneath
case "ad_astra:venus": newHP = entity.maxHealth * 6;
case "ad_astra:venus": newHP = entity.maxHealth * 7;
}
}
else if (type === "primitivecreatures:golem_2") {
else if (type === "primitive_creatures:golem_2") {
switch (dimension) {
// use default for beneath
case "ad_astra:venus": newHP = 80;
case "ad_astra:venus": newHP = 90;
}
}
if (newHP === 0)
return;
// Add fire immunity to some things
if (NEEDS_FIREPROOFING.includes(type)) {
entity.potionEffects.add("minecraft:fire_resistance", -1, 0, true, false);
}
let baseHealth = entity.maxHealth;
let missingHealth = newHP - baseHealth;
if (newHP !== 0) {
let baseHealth = entity.maxHealth;
let missingHealth = newHP - baseHealth;
entity.modifyAttribute("minecraft:generic.max_health", "tfg_health_buff_id", missingHealth, "addition");
entity.modifyAttribute("minecraft:generic.max_health", "tfg_health_buff_id", missingHealth, "addition");
if (missingHealth > 0) {
entity.health += missingHealth;
if (missingHealth > 0) {
entity.health += missingHealth;
}
}
let newArmor = NEW_MOB_ARMOR[type] ?? 0;
if (newArmor === 0)
return;
if (newArmor !== 0) {
let baseArmor = entity.armor;
let missingArmor = newArmor - baseArmor;
entity.modifyAttribute("minecraft:generic.armor", "tfg_armor_buff_id", missingArmor, "addition");
}
let baseArmor = entity.armor;
let missingArmor = newArmor - baseArmor;
entity.modifyAttribute("minecraft:generic.armor", "tfg_armor_buff_id", missingArmor, "addition");
let newAttack = VENUS_DAMAGE_BUFFING[type] ?? 0
if (dimension === "ad_astra:venus" && newAttack !== 0) {
let baseAttack = entity.attack_damage;
let missingAttack = newAttack - baseAttack;
entity.modifyAttribute("minecraft:generic.attack_damage", "tfg_attack_buff_id", missingAttack, "addition");
}
})