Skip to content

Commit

Permalink
build: 🚀 Updated to 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Stoupy51 committed Jan 6, 2025
1 parent 1bb47f2 commit 499f99b
Show file tree
Hide file tree
Showing 173 changed files with 1,518 additions and 782 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,13 @@ Join our active [Discord community](https://discord.gg/anxzu6rA9F) to:
- 📚 [Used libraries authors](https://github.com/Stoupy51/SimplEnergy#-librairiesmodules-used-conventions-guideline-tips-followed)
- 🎨 VieuxGreluchon for Resource Pack
- 🔧 AirDox_ for cables visual

## ⭐ Star History

<a href="https://star-history.com/#Stoupy51/SimplEnergy&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Stoupy51/SimplEnergy&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Stoupy51/SimplEnergy&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Stoupy51/SimplEnergy&type=Date" />
</picture>
</a>
Binary file modified build/SimplEnergy_datapack.zip
Binary file not shown.
Binary file modified build/SimplEnergy_datapack_with_libs.zip
Binary file not shown.
Binary file modified build/SimplEnergy_resource_pack.zip
Binary file not shown.
Binary file modified build/SimplEnergy_resource_pack_with_libs.zip
Binary file not shown.

This file was deleted.

4 changes: 2 additions & 2 deletions build/datapack/data/simplenergy/function/_give_all.mcfunction

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,66 @@

scoreboard players add #tick_entities simplenergy.data 0
scoreboard players add #second_entities simplenergy.data 0
scoreboard players add #total_custom_blocks simplenergy.data 0
scoreboard players add #total_vanilla_raw_iron_block simplenergy.data 0
scoreboard players add #total_vanilla_polished_deepslate simplenergy.data 0
scoreboard players add #total_vanilla_player_head simplenergy.data 0
scoreboard players add #total_vanilla_iron_block simplenergy.data 0
scoreboard players add #total_vanilla_gold_block simplenergy.data 0
scoreboard players add #total_vanilla_furnace simplenergy.data 0
scoreboard players add #total_vanilla_daylight_detector simplenergy.data 0
scoreboard players add #total_vanilla_copper_block simplenergy.data 0
scoreboard players add #total_vanilla_cauldron simplenergy.data 0
scoreboard players add #total_vanilla_brewing_stand simplenergy.data 0
scoreboard players add #total_vanilla_barrel simplenergy.data 0
scoreboard players add #total_elite_cable simplenergy.data 0
scoreboard players add #total_advanced_cable simplenergy.data 0
scoreboard players add #total_simple_cable simplenergy.data 0
scoreboard players add #total_pulverizer simplenergy.data 0
scoreboard players add #total_electric_brewing_stand simplenergy.data 0
scoreboard players add #total_electric_smelter simplenergy.data 0
scoreboard players add #total_electric_furnace simplenergy.data 0
scoreboard players add #total_solar_panel simplenergy.data 0
scoreboard players add #total_furnace_generator simplenergy.data 0
scoreboard players add #total_cauldron_generator simplenergy.data 0
scoreboard players add #total_creative_battery simplenergy.data 0
scoreboard players add #total_elite_battery simplenergy.data 0
scoreboard players add #total_advanced_battery simplenergy.data 0
scoreboard players add #total_simple_battery simplenergy.data 0
scoreboard players add #total_raw_simplunium_block simplenergy.data 0
scoreboard players add #total_deepslate_simplunium_ore simplenergy.data 0
scoreboard players add #total_simplunium_ore simplenergy.data 0
scoreboard players add #total_simplunium_block simplenergy.data 0
tellraw @s [{"translate":"simplenergy.total_simplunium_block","color":"gold"},{"score":{"name":"#total_simplunium_block","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_simplunium_ore","color":"gold"},{"score":{"name":"#total_simplunium_ore","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_deepslate_simplunium_ore","color":"gold"},{"score":{"name":"#total_deepslate_simplunium_ore","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_raw_simplunium_block","color":"gold"},{"score":{"name":"#total_raw_simplunium_block","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_simple_battery","color":"gold"},{"score":{"name":"#total_simple_battery","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_advanced_battery","color":"gold"},{"score":{"name":"#total_advanced_battery","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_elite_battery","color":"gold"},{"score":{"name":"#total_elite_battery","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_creative_battery","color":"gold"},{"score":{"name":"#total_creative_battery","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_cauldron_generator","color":"gold"},{"score":{"name":"#total_cauldron_generator","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_furnace_generator","color":"gold"},{"score":{"name":"#total_furnace_generator","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_solar_panel","color":"gold"},{"score":{"name":"#total_solar_panel","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_electric_furnace","color":"gold"},{"score":{"name":"#total_electric_furnace","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_electric_smelter","color":"gold"},{"score":{"name":"#total_electric_smelter","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_electric_brewing_stand","color":"gold"},{"score":{"name":"#total_electric_brewing_stand","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_pulverizer","color":"gold"},{"score":{"name":"#total_pulverizer","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_simple_cable","color":"gold"},{"score":{"name":"#total_simple_cable","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_advanced_cable","color":"gold"},{"score":{"name":"#total_advanced_cable","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.total_elite_cable","color":"gold"},{"score":{"name":"#total_elite_cable","objective":"simplenergy.data"},"color":"yellow"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_barrel","color":"gray"},{"score":{"name":"#total_vanilla_barrel","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_brewing_stand","color":"gray"},{"score":{"name":"#total_vanilla_brewing_stand","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_cauldron","color":"gray"},{"score":{"name":"#total_vanilla_cauldron","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_copper_block","color":"gray"},{"score":{"name":"#total_vanilla_copper_block","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_daylight_detector","color":"gray"},{"score":{"name":"#total_vanilla_daylight_detector","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_furnace","color":"gray"},{"score":{"name":"#total_vanilla_furnace","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_gold_block","color":"gray"},{"score":{"name":"#total_vanilla_gold_block","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_iron_block","color":"gray"},{"score":{"name":"#total_vanilla_iron_block","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_player_head","color":"gray"},{"score":{"name":"#total_vanilla_player_head","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_polished_deepslate","color":"gray"},{"score":{"name":"#total_vanilla_polished_deepslate","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.vanilla_minecraft_raw_iron_block","color":"gray"},{"score":{"name":"#total_vanilla_raw_iron_block","objective":"simplenergy.data"},"color":"white"}]
tellraw @s [{"translate":"simplenergy.total_custom_blocks","color":"dark_aqua"},{"score":{"name":"#total_custom_blocks","objective":"simplenergy.data"},"color":"aqua"}]
tellraw @s [{"translate":"simplenergy.second_tag_function","color":"green"},{"score":{"name":"#second_entities","objective":"simplenergy.data"},"color":"dark_green"}]
tellraw @s [{"translate":"simplenergy.tick_tag_function","color":"green"},{"score":{"name":"#tick_entities","objective":"simplenergy.data"},"color":"dark_green"}]

Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,16 @@ execute store success score #success simplenergy.data if items entity @s contain
execute if score #success simplenergy.data matches 1 run recipe give @s simplenergy:simple_cable_2
execute if score #success simplenergy.data matches 1 run recipe give @s simplenergy:simple_cable_4

## Add result items
execute if items entity @s container.* *[custom_data~{"simplenergy": {"multimeter":true} }] run recipe give @s simplenergy:multimeter
execute if items entity @s container.* *[custom_data~{"simplenergy": {"slot_unlocker":true} }] run recipe give @s simplenergy:slot_unlocker
execute if items entity @s container.* *[custom_data~{"simplenergy": {"simple_battery":true} }] run recipe give @s simplenergy:simple_battery
execute if items entity @s container.* *[custom_data~{"simplenergy": {"cauldron_generator":true} }] run recipe give @s simplenergy:cauldron_generator
execute if items entity @s container.* *[custom_data~{"simplenergy": {"furnace_generator":true} }] run recipe give @s simplenergy:furnace_generator
execute if items entity @s container.* *[custom_data~{"simplenergy": {"solar_panel":true} }] run recipe give @s simplenergy:solar_panel
execute if items entity @s container.* *[custom_data~{"simplenergy": {"electric_furnace":true} }] run recipe give @s simplenergy:electric_furnace
execute if items entity @s container.* *[custom_data~{"simplenergy": {"simple_cable":true} }] run recipe give @s simplenergy:simple_cable
execute if items entity @s container.* *[custom_data~{"simplenergy": {"simple_cable":true} }] run recipe give @s simplenergy:simple_cable_2
execute if items entity @s container.* *[custom_data~{"simplenergy": {"simple_cable":true} }] run recipe give @s simplenergy:simple_cable_3
execute if items entity @s container.* *[custom_data~{"simplenergy": {"simple_cable":true} }] run recipe give @s simplenergy:simple_cable_4

Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@ execute if entity @s[tag=simplenergy.advanced_cable] run item replace entity @s
execute if entity @s[tag=simplenergy.elite_cable] run item replace entity @s container.0 with cobblestone[item_model="simplenergy:elite_cable"]

# Get the right model
execute store result entity @s item.components."minecraft:custom_model_data" int 1 run scoreboard players get @s energy.data
data modify storage simplenergy:main model_data set value {"floats":[0.0f]}
execute store result storage simplenergy:main model_data.floats[0] float 1 run scoreboard players get @s energy.data
data modify entity @s item.components."minecraft:custom_model_data" set from storage simplenergy:main model_data
data remove storage simplenergy:main model_data

Loading

0 comments on commit 499f99b

Please sign in to comment.