ThePython10110
/
ExchangeClone
mirror of https://github.com/ThePython10110/ExchangeClone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

v3.1

This commit is contained in:
ThePython 2023-07-11 14:34:58 -07:00
parent a10f9a764f
commit 07fb169e5f
3 changed files with 168 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changelog.txt
View File

@ -83,4 +83,10 @@
Copper blocks are now worth 4 times as much as copper ingots instead of 9 (MineClone).
The Energy Collector now drops its contents when broken (MineClone)
Fixed Exchange Orb energy value (forgot to change it after changing the recipe)
Changed Constructor, Deconstructor, and Collector recipes and energy values to make them cheaper.
Changed Constructor, Deconstructor, and Collector recipes and energy values to make them cheaper.
3.1
Changes:
Added new energy values from Why (and Why's new Minetest Game energy values)
Bugfixes:
Fixed crash based on PESA inventory movement
Added mcl_blackstone to the mod whitelist

277
energy.lua
View File

@ -317,6 +317,32 @@ exchangeclone.mtg_energy_values = {
pane_flat = 0.5,
trapdoor_steel_bar = 384,
},
["sound_machine"] = {
sound_machine = 2608,
portable_sound_machine = 2608,
},
["fake_liquids"] = {
solid_water_source = 4,
solid_useless_bean_liquid_source = 0,
solid_glue_source = 36,
solid_river_water_source = 4,
solid_lava_source = 131,
bucket_fake_lava = 4865,
bucket_fake_water = 4992,
solid_fake_lava_source = 4100,
solid_fake_water_source = 4227,
},
["sticky_things"] = {
bucket_glue = 801,
glue_source = 0,
glue_flowing = 0,
},
["ghost_blocks"] = {
ghostifier = 8200,
},
["small_why_things"] = {
craftable_barrier = 72,
},
}
@ -326,8 +352,6 @@ exchangeclone.mtg_energy_values = {
--[[Some energy values taken from https://technicpack.fandom.com/wiki/Alchemical_Math
I had to change some since they weren't as "equivalent" as they were supposed to be.
I also didn't type out the ones with a value of 1, since that's the default.]]
@ -1158,6 +1182,9 @@ exchangeclone.mcl_energy_values = {
sausage = 64,
cooked_sausage = 64,
burnt_sausage = 64,
meatball = 64,
cooked_meatball = 64,
burnt_meatball = 64,
burnt_porkchop = 64,
burnt_beef = 64,
burnt_chicken = 48,
@ -1166,6 +1193,7 @@ exchangeclone.mcl_energy_values = {
burnt_fish = 40,
burnt_salmon = 48,
raw_block_sausage = 576,
raw_block_meatball = 576,
raw_block_porkchop = 576,
raw_block_beef = 576,
raw_block_chicken = 432,
@ -1174,6 +1202,7 @@ exchangeclone.mcl_energy_values = {
raw_block_rabbit = 360,
raw_block_fish = 360,
cooked_block_sausage = 576,
cooked_block_meatball = 576,
cooked_block_porkchop = 576,
cooked_block_beef = 576,
cooked_block_chicken = 432,
@ -1182,6 +1211,7 @@ exchangeclone.mcl_energy_values = {
cooked_block_rabbit = 360,
cooked_block_fish = 360,
burnt_block_sausage = 576,
burnt_block_meatball = 576,
burnt_block_porkchop = 576,
burnt_block_beef = 576,
burnt_block_chicken = 432,
@ -1196,6 +1226,7 @@ exchangeclone.mcl_energy_values = {
},
["fake_liquids"] = {
solid_water_source = 4,
solid_milk_source = 67,
solid_useless_bean_liquid_source = 0,
solid_glue_source = 12,
solid_river_water_source = 4,
@ -1262,6 +1293,7 @@ exchangeclone.mtg_group_values = {
{"wool", 48},
{"dye", 8},
{"flower", 32},
{"useless", 0},
}
local slabs_and_stairs = {}
@ -1315,126 +1347,127 @@ exchangeclone.mcl_potion_data = {
}
exchangeclone.whitelisted_mods = {
["exchangeclone"] = true,
["beds"] = true,
["binoculars"] = true,
["boats"] = true,
["bones"] = true,
["bucket"] = true,
["butterflies"] = true,
["carts"] = true,
["default"] = true,
["doors"] = true,
["dye"] = true,
["farming"] = true,
["fire"] = true,
["fireflies"] = true,
["flowers"] = true,
["keys"] = true,
["mapping_kit"] = true,
["moreswords"] = true,
["stairs"] = true,
["tnt"] = true,
["vessels"] = true,
["walls"] = true,
["wool"] = true,
["xpanes"] = true,
["doc_identifier"] = true,
["fake_liquids"] = true,
["ghost_blocks"] = true,
["lava_sponge"] = true,
["mcl_amethyst"] = true,
["mcl_anvils"] = true,
["mcl_armor"] = true,
["mcl_armor_stand"] = true,
["mcl_bamboo"] = true,
["mcl_banners"] = true,
["mcl_barrels"] = true,
["mcl_beacons"] = true,
["mcl_beds"] = true,
["mcl_books"] = true,
["mcl_bows"] = true,
["mcl_cauldrons"] = true,
["mcl_chests"] = true,
["mcl_clock"] = true,
["mcl_cocoas"] = true,
["mcl_colorblocks"] = true,
["mcl_colors"] = true,
["mcl_comparators"] = true,
["mcl_compass"] = true,
["mcl_composters"] = true,
["mcl_copper"] = true,
["mcl_core"] = true,
["mcl_crafting_table"] = true,
["mcl_crimson"] = true,
["mcl_deepslate"] = true,
["mcl_dispensers"] = true,
["mcl_doors"] = true,
["mcl_droppers"] = true,
["mcl_dye"] = true,
["mcl_enchanting"] = true,
["mcl_end"] = true,
["mcl_experience"] = true,
["mcl_farming"] = true,
["mcl_fences"] = true,
["mcl_fire"] = true,
["mcl_fireworks"] = true,
["mcl_fishing"] = true,
["mcl_fletching_table"] = true,
["mcl_flowerpots"] = true,
["mcl_flowers"] = true,
["mcl_furnaces"] = true,
["mcl_grindstone"] = true,
["mcl_hamburger"] = true,
["mcl_heads"] = true,
["mcl_honey"] = true,
["mcl_hoppers"] = true,
["mcl_itemframes"] = true,
["mcl_jukebox"] = true,
["mcl_lanterns"] = true,
["mcl_lectern"] = true,
["mcl_lightning_rods"] = true,
["mcl_loom"] = true,
["mcl_mangrove"] = true,
["mcl_maps"] = true,
["mcl_minecarts"] = true,
["mcl_mobitems"] = true,
["mcl_mud"] = true,
["mcl_mushrooms"] = true,
["mcl_nether"] = true,
["mcl_observers"] = true,
["mcl_ocean"] = true,
["mcl_paintings"] = true,
["mcl_potions"] = true,
["mcl_raw_ores"] = true,
["mcl_sculk"] = true,
["mcl_shields"] = true,
["mcl_signs"] = true,
["mcl_smithing_table"] = true,
["mcl_smoker"] = true,
["mcl_sponges"] = true,
["mcl_spyglass"] = true,
["mcl_stairs"] = true,
["mcl_stonecutter"] = true,
["mcl_sus_stew"] = true,
["mcl_target"] = true,
["mcl_tnt"] = true,
["mcl_tools"] = true,
["mcl_throwing"] = true,
["mcl_torches"] = true,
["mcl_totems"] = true,
["mcl_villages"] = true,
["mcl_walls"] = true,
["mcl_wool"] = true,
["mclx_core"] = true,
["mclx_fences"] = true,
["mclx_stairs"] = true,
["meat_blocks"] = true,
["screwdriver"] = true,
["slime_things"] = true,
["small_why_things"] = true,
["sound_machine"] = true,
["sticky_things"] = true,
exchangeclone = true,
beds = true,
binoculars = true,
boats = true,
bones = true,
bucket = true,
butterflies = true,
carts = true,
default = true,
doors = true,
dye = true,
farming = true,
fire = true,
fireflies = true,
flowers = true,
keys = true,
mapping_kit = true,
moreswords = true,
stairs = true,
tnt = true,
vessels = true,
walls = true,
wool = true,
xpanes = true,
doc_identifier = true,
fake_liquids = true,
ghost_blocks = true,
lava_sponge = true,
mcl_amethyst = true,
mcl_anvils = true,
mcl_armor = true,
mcl_armor_stand = true,
mcl_bamboo = true,
mcl_banners = true,
mcl_barrels = true,
mcl_beacons = true,
mcl_beds = true,
mcl_blackstone = true,
mcl_books = true,
mcl_bows = true,
mcl_cauldrons = true,
mcl_chests = true,
mcl_clock = true,
mcl_cocoas = true,
mcl_colorblocks = true,
mcl_colors = true,
mcl_comparators = true,
mcl_compass = true,
mcl_composters = true,
mcl_copper = true,
mcl_core = true,
mcl_crafting_table = true,
mcl_crimson = true,
mcl_deepslate = true,
mcl_dispensers = true,
mcl_doors = true,
mcl_droppers = true,
mcl_dye = true,
mcl_enchanting = true,
mcl_end = true,
mcl_experience = true,
mcl_farming = true,
mcl_fences = true,
mcl_fire = true,
mcl_fireworks = true,
mcl_fishing = true,
mcl_fletching_table = true,
mcl_flowerpots = true,
mcl_flowers = true,
mcl_furnaces = true,
mcl_grindstone = true,
mcl_hamburger = true,
mcl_heads = true,
mcl_honey = true,
mcl_hoppers = true,
mcl_itemframes = true,
mcl_jukebox = true,
mcl_lanterns = true,
mcl_lectern = true,
mcl_lightning_rods = true,
mcl_loom = true,
mcl_mangrove = true,
mcl_maps = true,
mcl_minecarts = true,
mcl_mobitems = true,
mcl_mud = true,
mcl_mushrooms = true,
mcl_nether = true,
mcl_observers = true,
mcl_ocean = true,
mcl_paintings = true,
mcl_potions = true,
mcl_raw_ores = true,
mcl_sculk = true,
mcl_shields = true,
mcl_signs = true,
mcl_smithing_table = true,
mcl_smoker = true,
mcl_sponges = true,
mcl_spyglass = true,
mcl_stairs = true,
mcl_stonecutter = true,
mcl_sus_stew = true,
mcl_target = true,
mcl_tnt = true,
mcl_tools = true,
mcl_throwing = true,
mcl_torches = true,
mcl_totems = true,
mcl_villages = true,
mcl_walls = true,
mcl_wool = true,
mclx_core = true,
mclx_fences = true,
mclx_stairs = true,
meat_blocks = true,
screwdriver = true,
slime_things = true,
small_why_things = true,
sound_machine = true,
sticky_things = true,
}

10
pesa.lua
View File

@ -53,11 +53,13 @@ minetest.register_allow_player_inventory_action(function(player, action, inv, in
or action == "take" and info.listname == "exchangeclone_pesa"
) then
if player:get_wielded_item():get_name() == "exchangeclone:pesa" then
local stack = player:get_inventory():get_stack(info.from_list, info.from_index)
if action == "take" then
return stack:get_count()
local stack
if info.listname or (info.from_list and info.from_list == "exchangeclone_pesa") then
stack = player:get_inventory():get_stack("exchangeclone_pesa", info.from_index)
else
stack = player:get_inventory():get_stack("main", info.from_index)
end
if stack:get_name() == "exchangeclone:exchange_orb" then
if stack:get_name() == "exchangeclone:exchange_orb" or action == "take" then
return stack:get_count()
else
return 0