Energy values now match ProjectE better

This commit is contained in:
ThePython 2023-11-21 13:26:27 -08:00
parent 7aae74608f
commit ad73cdefe7
3 changed files with 82 additions and 161 deletions

View File

@ -18,115 +18,93 @@ if exchangeclone.mcl then
["lava_sponge:lava_sponge_wet"] = 1160, ["lava_sponge:lava_sponge_wet"] = 1160,
["mcl_amethyst:amethyst_cluster"] = 512, ["mcl_amethyst:amethyst_shard"] = 32,
["mcl_amethyst:amethyst_shard"] = 256, ["mcl_amethyst:calcite"] = 32,
["mcl_amethyst:calcite"] = 128,
["mcl_amethyst:large_amethyst_bud"] = 426,
["mcl_amethyst:medium_amethyst_bud"] = 341,
["mcl_amethyst:small_amethyst_bud"] = 256,
["mcl_anvils:anvil_damage_1"] = 5632, ["mcl_anvils:anvil_damage_1"] = 5079,
["mcl_anvils:anvil_damage_2"] = 3328, ["mcl_anvils:anvil_damage_2"] = 2222,
["mcl_armor:boots_chain"] = 768, ["mcl_armor:helmet_chain"] = 1287,
["mcl_armor:boots_netherite"] = 106496, ["mcl_armor:chestplate_chain"] = 2056,
["mcl_armor:chestplate_chain"] = 1792, ["mcl_armor:leggings_chain"] = 1799,
["mcl_armor:chestplate_netherite"] = 139264, ["mcl_armor:boots_chain"] = 1029,
["mcl_armor:elytra"] = 297216,
["mcl_armor:helmet_chain"] = 1024,
["mcl_armor:helmet_netherite"] = 114688,
["mcl_armor:leggings_chain"] = 1536,
["mcl_armor:leggings_netherite"] = 131072,
["mcl_bamboo:bamboo"] = 2, ["mcl_bamboo:bamboo"] = 32,
["mcl_bamboo:bamboo_block_stripped"] = 16,
["mcl_banners:pattern_globe"] = 360, ["mcl_banners:pattern_globe"] = 49152,
["mcl_banners:pattern_piglin"] = 300, ["mcl_banners:pattern_snout"] = 512,
["mcl_beehives:beehive"] = 144, ["mcl_beehives:bee_nest"] = 144,
["mcl_bells:bell"] = 8192, ["mcl_bells:bell"] = 14336,
["mcl_blackstone:basalt"] = 1, ["mcl_blackstone:basalt"] = 4,
["mcl_blackstone:blackstone"] = 1, ["mcl_blackstone:blackstone"] = 4,
["mcl_blackstone:blackstone_gilded"] = 2048,
["mcl_blackstone:nether_gold"] = 2048,
["mcl_blackstone:soul_soil"] = 49, ["mcl_blackstone:soul_soil"] = 49,
["mcl_books:book"] = 150,
["mcl_books:written_book"] = 206,
["mcl_bows:crossbow_loaded"] = 298, ["mcl_bows:crossbow_loaded"] = 298,
["mcl_buckets:bucket_axolotl"] = 1024, ["mcl_buckets:bucket_cod"] = 832,
["mcl_buckets:bucket_cod"] = 896, ["mcl_buckets:bucket_lava"] = 832,
["mcl_buckets:bucket_lava"] = 896, ["mcl_buckets:bucket_river_water"] = 732,
["mcl_buckets:bucket_river_water"] = 768, ["mcl_buckets:bucket_salmon"] = 832,
["mcl_buckets:bucket_salmon"] = 896, ["mcl_buckets:bucket_tropical_fish"] = 832,
["mcl_buckets:bucket_tropical_fish"] = 896,
["mcl_buckets:bucket_water"] = 768, ["mcl_buckets:bucket_water"] = 768,
["mcl_campfires:campfire"] = 140, ["mcl_cocoas:cocoa_beans"] = 64,
["mcl_campfires:soul_campfire"] = 157,
["mcl_cocoas:cocoa_beans"] = 128, ["mcl_copper:copper_ingot"] = 128,
["mcl_copper:copper_ingot"] = 85, ["mcl_core:andesite"] = 16,
["mcl_core:andesite"] = 1,
["mcl_core:apple"] = 128, ["mcl_core:apple"] = 128,
["mcl_core:apple_gold_enchanted"] = 147584, ["mcl_core:apple_gold_enchanted"] = 147584,
["mcl_core:cactus"] = 8, ["mcl_core:cactus"] = 8,
["mcl_core:charcoal_lump"] = 32, ["mcl_core:charcoal_lump"] = 32,
["mcl_core:clay_lump"] = 4, ["mcl_core:clay_lump"] = 16,
["mcl_core:coal_lump"] = 128, ["mcl_core:coal_lump"] = 128,
["mcl_core:cobble"] = 1, ["mcl_core:cobble"] = 1,
["mcl_core:cobweb"] = 12, ["mcl_core:cobweb"] = 12,
["mcl_core:crying_obsidian"] = 1000, ["mcl_core:crying_obsidian"] = 768,
["mcl_core:dead_bush"] = 8, ["mcl_core:dead_bush"] = 1, -- don't know which one of these is right
["mcl_core:deadbush"] = 8, ["mcl_core:deadbush"] = 1,
["mcl_core:diamond"] = 8192, ["mcl_core:diamond"] = 8192,
["mcl_core:diorite"] = 1, ["mcl_core:diorite"] = 16,
["mcl_core:dirt"] = 1, ["mcl_core:dirt"] = 1,
["mcl_core:emerald"] = 4096, ["mcl_core:emerald"] = 4096,
["mcl_core:flint"] = 4, ["mcl_core:flint"] = 4,
["mcl_core:gold_ingot"] = 2048, ["mcl_core:gold_ingot"] = 2048,
["mcl_core:granite"] = 1, ["mcl_core:granite"] = 16,
["mcl_core:grass"] = 1, ["mcl_core:grass"] = 1,
["mcl_core:gravel"] = 1, ["mcl_core:gravel"] = 1,
["mcl_core:ice"] = 1, ["mcl_core:ice"] = 1,
["mcl_core:iron_ingot"] = 256, ["mcl_core:iron_ingot"] = 256,
["mcl_core:lapis"] = 864, ["mcl_core:lapis"] = 864,
["mcl_core:mycelium"] = 1, ["mcl_core:mycelium"] = 2,
["mcl_core:obsidian"] = 64, ["mcl_core:obsidian"] = 64,
["mcl_core:redsand"] = 1, ["mcl_core:redsand"] = 1,
["mcl_core:reeds"] = 32, ["mcl_core:reeds"] = 32,
["mcl_core:sand"] = 1, ["mcl_core:sand"] = 1,
["mcl_core:vine"] = 8, ["mcl_core:vine"] = 8,
["mcl_crimson:shroomlight"] = 64, ["mcl_crimson:shroomlight"] = 416,
["mcl_crimson:twisting_vines"] = 8, ["mcl_crimson:twisting_vines"] = 8,
["mcl_crimson:warped_wart_block"] = 216, ["mcl_crimson:warped_wart_block"] = 216,
["mcl_crimson:weeping_vines"] = 8, ["mcl_crimson:weeping_vines"] = 8,
["mcl_deepslate:deepslate_cobbled"] = 1, ["mcl_deepslate:deepslate_cobbled"] = 2,
["mcl_deepslate:tuff"] = 1, ["mcl_deepslate:tuff"] = 4,
["mcl_end:chorus_flower"] = 32, ["mcl_end:chorus_flower"] = 96,
["mcl_end:chorus_fruit"] = 16, ["mcl_end:chorus_fruit"] = 192,
["mcl_end:dragon_egg"] = 139264, ["mcl_end:dragon_egg"] = 262144,
["mcl_end:end_stone"] = 1, ["mcl_end:end_stone"] = 1,
["mcl_experience:bottle"] = 2048, ["mcl_farming:beetroot_item"] = 64,
["mcl_farming:beetroot_item"] = 24,
["mcl_farming:beetroot_seeds"] = 16, ["mcl_farming:beetroot_seeds"] = 16,
["mcl_farming:carrot_item"] = 24, ["mcl_farming:carrot_item"] = 64,
["mcl_farming:hoe_netherite"] = 90108, ["mcl_farming:melon_item"] = 16,
["mcl_farming:melon_item"] = 36, ["mcl_farming:potato_item"] = 64,
["mcl_farming:potato_item"] = 24, ["mcl_farming:potato_item_poison"] = 64,
["mcl_farming:potato_item_poison"] = 24,
["mcl_farming:pumpkin"] = 144, ["mcl_farming:pumpkin"] = 144,
["mcl_farming:pumpkin_face"] = 144, ["mcl_farming:pumpkin_face"] = 144,
["mcl_farming:sweet_berry"] = 16, ["mcl_farming:sweet_berry"] = 16,
@ -134,9 +112,9 @@ if exchangeclone.mcl then
["mcl_farming:wheat_seeds"] = 16, ["mcl_farming:wheat_seeds"] = 16,
["mcl_fishing:clownfish_raw"] = 64, ["mcl_fishing:clownfish_raw"] = 64,
["mcl_fishing:fish_raw"] = 40, ["mcl_fishing:fish_raw"] = 64,
["mcl_fishing:pufferfish_raw"] = 64, ["mcl_fishing:pufferfish_raw"] = 64,
["mcl_fishing:salmon_raw"] = 48, ["mcl_fishing:salmon_raw"] = 64,
["mcl_flowers:waterlily"] = 16, ["mcl_flowers:waterlily"] = 16,
["mcl_flowers:wither_rose"] = 128, ["mcl_flowers:wither_rose"] = 128,
@ -144,134 +122,82 @@ if exchangeclone.mcl then
["mcl_heads:creeper"] = 256, ["mcl_heads:creeper"] = 256,
["mcl_heads:skeleton"] = 256, ["mcl_heads:skeleton"] = 256,
["mcl_heads:steve"] = 256, ["mcl_heads:steve"] = 256,
["mcl_heads:wither_skeleton"] = 50000,
["mcl_heads:zombie"] = 256, ["mcl_heads:zombie"] = 256,
["mcl_honey:honey_bottle"] = 33, ["mcl_honey:honey_bottle"] = 48,
["mcl_honey:honeycomb"] = 32, ["mcl_honey:honeycomb"] = 16,
["mcl_lush_caves:cave_vines"] = 8, ["mcl_lush_caves:cave_vines"] = 16,
["mcl_lush_caves:cave_vines_lit"] = 0, ["mcl_lush_caves:glow_berry"] = 16,
["mcl_lush_caves:glow_berry"] = 36, ["mcl_lush_caves:spore_blossom"] = 64,
["mcl_lush_caves:spore_blossom"] = 32,
["mcl_mangrove:mangrove_roots"] = 1, ["mcl_mangrove:mangrove_roots"] = 4,
["mcl_maps:filled_map"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_18D471DFF_female_crea"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_18D471DFF_female_surv"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_18D471DFF_male_crea"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_18D471DFF_male_surv"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1B47A57FF_female_crea"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1B47A57FF_female_surv"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1B47A57FF_male_crea"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1B47A57FF_male_surv"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1EEB592FF_female_crea"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1EEB592FF_female_surv"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1EEB592FF_male_crea"] = 1120,
["mcl_maps:filled_map_mcl_skins_base_1EEB592FF_male_surv"] = 1120,
["mcl_mobitems:beef"] = 64, ["mcl_mobitems:beef"] = 64,
["mcl_mobitems:blaze_rod"] = 1536, ["mcl_mobitems:blaze_rod"] = 1536,
["mcl_mobitems:bone"] = 144, ["mcl_mobitems:bone"] = 144,
["mcl_mobitems:chicken"] = 48, ["mcl_mobitems:chicken"] = 64,
["mcl_mobitems:diamond_horse_armor"] = 73728, ["mcl_mobitems:diamond_horse_armor"] = 65536,
["mcl_mobitems:feather"] = 48, ["mcl_mobitems:feather"] = 48,
["mcl_mobitems:ghast_tear"] = 4096, ["mcl_mobitems:ghast_tear"] = 4096,
["mcl_mobitems:glow_ink_sac"] = 256, ["mcl_mobitems:glow_ink_sac"] = 400,
["mcl_mobitems:gold_horse_armor"] = 18432, ["mcl_mobitems:gold_horse_armor"] = 16384,
["mcl_mobitems:gunpowder"] = 192, ["mcl_mobitems:gunpowder"] = 192,
["mcl_mobitems:heart_of_the_sea"] = 50000, ["mcl_mobitems:heart_of_the_sea"] = 32768,
["mcl_mobitems:ink_sac"] = 8, ["mcl_mobitems:ink_sac"] = 16,
["mcl_mobitems:iron_horse_armor"] = 2304, ["mcl_mobitems:iron_horse_armor"] = 2048,
["mcl_mobitems:leather"] = 64, ["mcl_mobitems:leather"] = 64,
["mcl_mobitems:magma_cream"] = 768, ["mcl_mobitems:magma_cream"] = 800,
["mcl_mobitems:milk_bucket"] = 832, ["mcl_mobitems:milk_bucket"] = 784,
["mcl_mobitems:mutton"] = 48, ["mcl_mobitems:mutton"] = 64,
["mcl_mobitems:nametag"] = 128, ["mcl_mobitems:nametag"] = 192,
["mcl_mobitems:nautilus_shell"] = 10000, ["mcl_mobitems:nautilus_shell"] = 1024,
["mcl_mobitems:nether_star"] = 73728, ["mcl_mobitems:nether_star"] = 139264,
["mcl_mobitems:porkchop"] = 64, ["mcl_mobitems:porkchop"] = 64,
["mcl_mobitems:rabbit"] = 40, ["mcl_mobitems:rabbit"] = 64,
["mcl_mobitems:rabbit_foot"] = 64, ["mcl_mobitems:rabbit_foot"] = 128,
["mcl_mobitems:rabbit_hide"] = 16, ["mcl_mobitems:rabbit_hide"] = 16,
["mcl_mobitems:rotten_flesh"] = 24, ["mcl_mobitems:rotten_flesh"] = 32,
["mcl_mobitems:saddle"] = 192, ["mcl_mobitems:saddle"] = 192,
["mcl_mobitems:shulker_shell"] = 2048, ["mcl_mobitems:shulker_shell"] = 2048,
["mcl_mobitems:slimeball"] = 24, ["mcl_mobitems:slimeball"] = 32,
["mcl_mobitems:spider_eye"] = 128, ["mcl_mobitems:spider_eye"] = 128,
["mcl_mobitems:string"] = 12, ["mcl_mobitems:string"] = 12,
["mcl_mobs:nametag"] = 128, ["mcl_mobs:nametag"] = 192,
["mcl_mud:mud"] = 1, ["mcl_mud:mud"] = 1,
["mcl_nether:ancient_debris"] = 16384, ["mcl_nether:ancient_debris"] = 12288,
["mcl_nether:glowstone_dust"] = 384, ["mcl_nether:glowstone_dust"] = 384,
["mcl_nether:nether_wart_item"] = 24, ["mcl_nether:nether_wart_item"] = 24,
["mcl_nether:netherrack"] = 1, ["mcl_nether:netherrack"] = 1,
["mcl_nether:quartz"] = 128, ["mcl_nether:quartz"] = 256,
["mcl_nether:soul_sand"] = 49, ["mcl_nether:soul_sand"] = 49,
["mcl_ocean:brain_coral"] = 8, ["mcl_ocean:kelp"] = 1,
["mcl_ocean:brain_coral_block"] = 8, ["mcl_ocean:prismarine_crystals"] = 512,
["mcl_ocean:brain_coral_fan"] = 8, ["mcl_ocean:prismarine_shard"] = 256,
["mcl_ocean:bubble_coral"] = 8, ["mcl_ocean:sea_pickle_1_dead_brain_coral_block"] = 16,
["mcl_ocean:bubble_coral_block"] = 8,
["mcl_ocean:bubble_coral_fan"] = 8,
["mcl_ocean:dead_brain_coral"] = 8,
["mcl_ocean:dead_brain_coral_block"] = 8,
["mcl_ocean:dead_brain_coral_fan"] = 8,
["mcl_ocean:dead_bubble_coral"] = 8,
["mcl_ocean:dead_bubble_coral_block"] = 8,
["mcl_ocean:dead_bubble_coral_fan"] = 8,
["mcl_ocean:dead_fire_coral"] = 8,
["mcl_ocean:dead_fire_coral_block"] = 8,
["mcl_ocean:dead_fire_coral_fan"] = 8,
["mcl_ocean:dead_horn_coral"] = 8,
["mcl_ocean:dead_horn_coral_block"] = 8,
["mcl_ocean:dead_horn_coral_fan"] = 8,
["mcl_ocean:dead_tube_coral"] = 8,
["mcl_ocean:dead_tube_coral_block"] = 8,
["mcl_ocean:dead_tube_coral_fan"] = 8,
["mcl_ocean:fire_coral"] = 8,
["mcl_ocean:fire_coral_block"] = 8,
["mcl_ocean:fire_coral_fan"] = 8,
["mcl_ocean:horn_coral"] = 8,
["mcl_ocean:horn_coral_block"] = 8,
["mcl_ocean:horn_coral_fan"] = 8,
["mcl_ocean:kelp"] = 32,
["mcl_ocean:prismarine_crystals"] = 2054,
["mcl_ocean:prismarine_shard"] = 2,
["mcl_ocean:sea_pickle_1_dead_brain_coral_block"] = 8,
["mcl_ocean:seagrass"] = 1, ["mcl_ocean:seagrass"] = 1,
["mcl_ocean:tube_coral"] = 8,
["mcl_ocean:tube_coral_block"] = 8,
["mcl_ocean:tube_coral_fan"] = 8,
["mcl_potions:dragon_breath"] = 8.5, ["mcl_potions:dragon_breath"] = 8.5,
["mcl_potions:fermented_spider_eye"] = 192, ["mcl_potions:fermented_spider_eye"] = 175,
["mcl_potions:glass_bottle"] = 1, ["mcl_potions:glass_bottle"] = 1,
["mcl_potions:speckled_melon"] = 1852, ["mcl_potions:speckled_melon"] = 1832,
["mcl_pottery_sherds:pot"] = 16, ["mcl_pottery_sherds:pot"] = 16,
["mcl_sponges:sponge"] = 1024, ["mcl_sponges:sponge"] = 128,
["mcl_sponges:sponge_wet"] = 1024,
["mcl_sponges:sponge_wet_river_water"] = 1024,
["mcl_throwing:egg"] = 32, ["mcl_throwing:egg"] = 32,
["mcl_throwing:ender_pearl"] = 1024, ["mcl_throwing:ender_pearl"] = 1024,
["mcl_throwing:snowball"] = 0.25, ["mcl_throwing:snowball"] = 1,
["mcl_tools:axe_netherite"] = 98312,
["mcl_tools:pick_netherite"] = 98312,
["mcl_tools:shovel_netherite"] = 81928,
["mcl_tools:sword_netherite"] = 90120,
["mcl_totems:totem"] = 106496,
["meat_blocks:meatball"] = 64, ["meat_blocks:meatball"] = 64,
["mesecons:redstone"] = 64, ["mesecons:redstone"] = 64,
["useful_green_potatoes:useful_green_potato"] = 256, ["useful_green_potatoes:useful_green_potato"] = 256,
}) do }) do
exchangeclone.energy_values[itemstring] = exchangeclone.energy_values[itemstring] or energy_value exchangeclone.energy_values[itemstring] = exchangeclone.energy_values[itemstring] or energy_value
@ -300,7 +226,7 @@ else
for itemstring, energy_value in pairs({ for itemstring, energy_value in pairs({
["bones:bones"] = 4, ["bones:bones"] = 4,
["bucket:bucket_lava"] = 896, ["bucket:bucket_lava"] = 832,
["bucket:bucket_river_water"] = 768, ["bucket:bucket_river_water"] = 768,
["bucket:bucket_water"] = 768, ["bucket:bucket_water"] = 768,
@ -351,11 +277,9 @@ else
["default:pine_bush_sapling"] = 32, ["default:pine_bush_sapling"] = 32,
["default:pine_bush_stem"] = 8, ["default:pine_bush_stem"] = 8,
["default:sand"] = 1, ["default:sand"] = 1,
["default:sand_with_kelp"] = 32, ["default:sand_with_kelp"] = 1,
["default:silver_sand"] = 1, ["default:silver_sand"] = 1,
["default:snow"] = 0.5, ["default:snow"] = 1,
["default:snowblock"] = 5,
["default:stick"] = 4,
["default:tin_ingot"] = 384, ["default:tin_ingot"] = 384,
["farming:cotton"] = 12, ["farming:cotton"] = 12,

View File

@ -670,8 +670,6 @@ if exchangeclone.pipeworks then
return result return result
end, end,
can_insert = function(pos, node, stack, direction) can_insert = function(pos, node, stack, direction)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
if allow_metadata_inventory_put(pos, get_list(direction), 1, stack) > 0 then if allow_metadata_inventory_put(pos, get_list(direction), 1, stack) > 0 then
return true return true
end end

View File

@ -217,7 +217,6 @@ if exchangeclone.pipeworks then
return result return result
end, end,
can_insert = function(pos, node, stack, direction) can_insert = function(pos, node, stack, direction)
local meta = minetest.get_meta(pos)
if allow_metadata_inventory_put(pos, get_list(direction), 1, stack) > 0 then if allow_metadata_inventory_put(pos, get_list(direction), 1, stack) > 0 then
return true return true
end end