🚧 Pulverizer: 90%

assets/compress_ogg.py

@@ -20,6 +20,9 @@ def compress_file(args):
 		os.remove(src)
 		os.rename(dst, src)
 		print(f"Compressed file '{src}' from {previous_size} to {file_size} bytes")
+	else:
+		os.remove(dst)
+		print(f"New file '{src}' is bigger than the original ({previous_size} > {file_size})")
 
 if __name__ == "__main__":
 	py_path = os.path.dirname(os.path.abspath(__file__))

build/datapack/data/simplenergy/advancement/visible/cauldron_generator.json

@@ -7,7 +7,7 @@
 			}
 		},
 		"title": {
-			"translate":"simplenergy.the_simpler_generator",
+			"translate":"simplenergy.the_simplest_generator",
 			"color": "gray"
 		},
 		"description": {

build/datapack/data/simplenergy/function/custom_blocks/pulverizer/get_pulverizer_recipe.mcfunction

@@ -0,0 +1,15 @@
+
+#> simplenergy:custom_blocks/pulverizer/get_pulverizer_recipe
+#
+# @within	simplenergy:custom_blocks/pulverizer/gui_active_slot
+#
+
+# Get the recipe
+function #simplenergy:calls/pulverizer_recipes
+
+# Place in storage the given output (if any)
+execute if score #found simplenergy.data matches 1 run data modify storage simplenergy:main pulverizer.output set from entity @s item
+
+# Kill temporary entity
+kill @s
+

build/datapack/data/simplenergy/function/custom_blocks/pulverizer/gui_active_slot.mcfunction

@@ -0,0 +1,49 @@
+
+#> simplenergy:custom_blocks/pulverizer/gui_active_slot
+#
+# @within	simplenergy:custom_blocks/pulverizer/work {"index":0,"slot":9,"result":18}
+#			simplenergy:custom_blocks/pulverizer/work {"index":1,"slot":10,"result":19}
+#			simplenergy:custom_blocks/pulverizer/work {"index":2,"slot":11,"result":20}
+#			simplenergy:custom_blocks/pulverizer/work {"index":3,"slot":12,"result":21}
+#			simplenergy:custom_blocks/pulverizer/work {"index":4,"slot":13,"result":22}
+#			simplenergy:custom_blocks/pulverizer/work {"index":5,"slot":14,"result":23}
+#			simplenergy:custom_blocks/pulverizer/work {"index":6,"slot":15,"result":24}
+#			simplenergy:custom_blocks/pulverizer/work {"index":7,"slot":16,"result":25}
+#
+
+# Get progression
+scoreboard players set #progression simplenergy.data 0
+$execute store result score #progression simplenergy.data run data get storage simplenergy:temp slots[$(index)].progression
+
+# Isolate ingredient and try to get result
+scoreboard players set #found simplenergy.data 0
+data modify storage simplenergy:main pulverizer.input set value {}
+data modify storage simplenergy:main pulverizer.output set value {}
+$data modify storage simplenergy:main pulverizer.input set from storage simplenergy:temp Items[{Slot:$(index)b}]
+$execute unless data storage simplenergy:main pulverizer.input run return run function simplenergy:custom_blocks/pulverizer/reset_progress {"index":$(index),"slot":$(slot)}
+execute summon item_display run function simplenergy:custom_blocks/pulverizer/get_pulverizer_recipe
+
+# If no recipe found, stop
+$execute if score #found simplenergy.data matches 0 run return run function simplenergy:custom_blocks/pulverizer/reset_progress {"index":$(index),"slot":$(slot)}
+
+# Else, if output do not match current output slot, stop
+scoreboard players set #output_occupied simplenergy.data 0
+$execute if data storage simplenergy:temp slots[$(result)] run scoreboard players set #output_occupied simplenergy.data 1
+execute if score #output_occupied simplenergy.data matches 1 run scoreboard players set #is_not_same_output simplenergy.data 0
+$execute if score #output_occupied simplenergy.data matches 1 run data modify storage simplenergy:temp copy set from storage simplenergy:temp slots[$(result)]
+execute if score #output_occupied simplenergy.data matches 1 store success score #is_not_same_output simplenergy.data run data modify storage simplenergy:temp copy.id set from storage simplenergy:main pulverizer.output.id
+execute if score #output_occupied simplenergy.data matches 1 if score #is_not_same_output simplenergy.data matches 0 store success score #is_not_same_output simplenergy.data run data modify storage simplenergy:temp copy.components set from storage simplenergy:main pulverizer.output.components
+execute if score #output_occupied simplenergy.data matches 1 if score #is_not_same_output simplenergy.data matches 1 run return fail
+
+# Progress the slot
+scoreboard players add #progression simplenergy.data 1
+$execute if score #progression simplenergy.data matches ..199 store result storage simplenergy:temp slots[$(index)].progression int 1 run scoreboard players get #progression simplenergy.data
+
+# Add the item to the result slot
+execute if score #output_occupied simplenergy.data matches 1 store result score #count simplenergy.data run data get storage simplenergy:temp copy.count
+execute if score #output_occupied simplenergy.data matches 1 store result score #to_add simplenergy.data run data get storage simplenergy:main pulverizer.output.count
+execute if score #output_occupied simplenergy.data matches 1 run scoreboard players operation #count simplenergy.data += #to_add simplenergy.data
+$execute if score #output_occupied simplenergy.data matches 1 store result block ~ ~ ~ Items[{Slot:$(result)b}].count int 1 run scoreboard players get #count simplenergy.data
+$execute if score #output_occupied simplenergy.data matches 0 run data modify storage simplenergy:main pulverizer.output.Slot set value $(result)b
+$execute if score #output_occupied simplenergy.data matches 0 run data modify block ~ ~ ~ Items[{Slot:$(result)b}] set from storage simplenergy:main pulverizer.output
+

build/datapack/data/simplenergy/function/custom_blocks/pulverizer/gui_progression.mcfunction

@@ -2,6 +2,7 @@
 #> simplenergy:custom_blocks/pulverizer/gui_progression
 #
 # @within	simplenergy:custom_blocks/pulverizer/gui_passive_slot {"index":$(index),"slot":$(slot)}
+#			simplenergy:custom_blocks/pulverizer/reset_progress {"index":$(index),"slot":$(slot)}
 #
 
 $execute if score #progression simplenergy.data matches ..0 run item replace block ~ ~ ~ container.$(slot) with cobblestone[custom_model_data=2012978,hide_tooltip={},custom_data={"common_signals":{"temp":true}}]

build/datapack/data/simplenergy/function/custom_blocks/pulverizer/reset_progress.mcfunction

@@ -0,0 +1,11 @@
+
+#> simplenergy:custom_blocks/pulverizer/reset_progress
+#
+# @within	simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":$(index),"slot":$(slot)}
+#
+
+scoreboard players set #progression simplenergy.data 0
+$data modify storage simplenergy:temp slots[$(index)].progression set value 0
+$function simplenergy:custom_blocks/pulverizer/gui_progression {"index":$(index),"slot":$(slot)}
+return fail
+

build/datapack/data/simplenergy/function/custom_blocks/pulverizer/tick.mcfunction

@@ -10,7 +10,7 @@ data modify storage simplenergy:temp slots set from entity @s item.components."m
 data modify storage simplenergy:temp Items set from block ~ ~ ~ Items
 
 # Launch work function if enough power
-scoreboard players set #cooking simplenergy.data 0
+scoreboard players set #working simplenergy.data 0
 execute if score @s energy.storage matches 120.. run function simplenergy:custom_blocks/pulverizer/work
 
 # Update gui depending on energy storage
@@ -25,11 +25,9 @@ execute if score @s energy.storage matches 6400.. run item replace block ~ ~ ~ c
 function simplenergy:custom_blocks/pulverizer/gui_for_each_slot
 
 # Update block visual depends on cook time, and playsound every second
-execute if score #cooking simplenergy.data matches 0 run data modify entity @s[tag=simplenergy.update_visual] item.components."minecraft:custom_model_data" set value 2012043
-tag @s remove simplenergy.update_visual
-execute if score #cooking simplenergy.data matches 0 run tag @s add simplenergy.update_visual
-execute if score #cooking simplenergy.data matches 1 run data modify entity @s item.components."minecraft:custom_model_data" set value 2012044
-execute if score #cooking simplenergy.data matches 1 if score #second simplenergy.data matches 0 run playsound simplenergy:pulverizer block @a[distance=..12] ~ ~ ~ 0.25
+execute if score #working simplenergy.data matches 0 run data modify entity @s item.components."minecraft:custom_model_data" set value 2012043
+execute if score #working simplenergy.data matches 1 run data modify entity @s item.components."minecraft:custom_model_data" set value 2012044
+execute if score #working simplenergy.data matches 1 if score #second simplenergy.data matches 0 run playsound simplenergy:pulverizer block @a[distance=..12] ~ ~ ~ 0.25
 
 # Save slots to entity
 data modify entity @s item.components."minecraft:custom_data".simplenergy.pulverizer_slots set from storage simplenergy:temp slots

build/datapack/data/simplenergy/function/custom_blocks/pulverizer/work.mcfunction

@@ -0,0 +1,19 @@
+
+#> simplenergy:custom_blocks/pulverizer/work
+#
+# @within	simplenergy:custom_blocks/pulverizer/tick
+#
+
+# Monitor if any slot is working
+execute unless data storage simplenergy:temp slots[0].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":0,"slot":9,"result":18}
+execute unless data storage simplenergy:temp slots[1].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":1,"slot":10,"result":19}
+execute unless data storage simplenergy:temp slots[2].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":2,"slot":11,"result":20}
+execute unless data storage simplenergy:temp slots[3].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":3,"slot":12,"result":21}
+execute unless data storage simplenergy:temp slots[4].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":4,"slot":13,"result":22}
+execute unless data storage simplenergy:temp slots[5].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":5,"slot":14,"result":23}
+execute unless data storage simplenergy:temp slots[6].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":6,"slot":15,"result":24}
+execute unless data storage simplenergy:temp slots[7].blocked run function simplenergy:custom_blocks/pulverizer/gui_active_slot {"index":7,"slot":16,"result":25}
+
+# Consume energy if any slot is working
+execute if score #working simplenergy.data matches 1.. run scoreboard players remove @s energy.storage 6
+

build/datapack/data/simplenergy/function/custom_blocks/solar_panel/place_secondary.mcfunction

@@ -21,7 +21,7 @@ data modify entity @s brightness set value {block:15,sky:15}
 
 # Energy part
 tag @s add energy.send
-scoreboard players set @s energy.max_storage 600
+scoreboard players set @s energy.max_storage 120
 scoreboard players operation @s energy.transfer_rate = @s energy.max_storage
 scoreboard players add @s energy.storage 0
 scoreboard players add @s energy.change_rate 0

build/datapack/data/simplenergy/function/utils/wrench/rotate.mcfunction

@@ -17,7 +17,7 @@ scoreboard players operation #rotation simplenergy.data %= #360 simplenergy.data
 execute store result entity @s Rotation[0] float 1 run scoreboard players get #rotation simplenergy.data
 
 # Rotate base block
-function #simplenergy:wrench_rotate
+function #simplenergy:calls/wrench_rotate
 
 # Memory clean up and particle effect
 data remove storage simplenergy:main Block

build/datapack/data/simplenergy/function/utils/wrench/rotate/furnace.mcfunction

@@ -1,7 +1,7 @@
 
 #> simplenergy:utils/wrench/rotate/furnace
 #
-# @within	#simplenergy:wrench_rotate
+# @within	#simplenergy:calls/wrench_rotate
 #
 
 # Check for furnace rotation

build/datapack/data/simplenergy/loot_table/i/solar_panel.json

@@ -11,7 +11,7 @@
 							"function": "minecraft:set_components",
 							"components": {
 								"minecraft:custom_data": {
-									"energy": {"generation": 4,"max_storage": 600},
+									"energy": {"generation": 4,"max_storage": 120},
 									"simplenergy": {"solar_panel": true},
 									"smithed": {"ignore": {"functionality": true,"crafting": true}}
 								},

build/datapack/data/simplenergy/recipe/solar_panel.json

@@ -24,7 +24,7 @@
 			"minecraft:custom_data": {
 				"energy": {
 					"generation": 4,
-					"max_storage": 600
+					"max_storage": 120
 				},
 				"simplenergy": {
 					"solar_panel": true

build/datapack/data/simplenergy/tags/function/calls/pulverizer_recipes.json

@@ -0,0 +1,6 @@
+{
+	"values": [
+		"simplenergy:calls/pulverizer_recipes"
+	]
+}
+

build/resource_pack/assets/minecraft/lang/en_us.json

@@ -79,12 +79,14 @@
 	"simplenergy.equipment": "Equipment",
 	"simplenergy.miscellaneous": "Miscellaneous",
 	"simplenergy.energy": "Energy",
+	"simplenergy.\u8029\u8029\u8029": "$\u8029$\u8029$\u8029\n",
 	"simplenergy.x9_simplunium_ingot": "\n- x9 Simplunium Ingot",
 	"simplenergy.x1_simplunium_block": "\n- x1 Simplunium Block",
 	"simplenergy.x5_redstone_block_x1_advanced_battery_x3_simplunium_block": "\n- x5 Redstone Block\n- x1 Advanced Battery\n- x3 Simplunium Block",
 	"simplenergy.x5_simplunium_ingot_x1_electric_furnace_x3_simplunium_block": "\n- x5 Simplunium Ingot\n- x1 Electric Furnace\n- x3 Simplunium Block",
 	"simplenergy.x1_simplunium_ore": "\n- x1 Simplunium Ore",
 	"simplenergy.x1_deepslate_simplunium_ore": "\n- x1 Deepslate Simplunium Ore",
+	"simplenergy.\u802d\u802d\u802d": "$\u802d$\u802d$\u802d\n",
 	"simplenergy.x9_raw_simplunium": "\n- x9 Raw Simplunium",
 	"simplenergy.x9_simplunium_nugget": "\n- x9 Simplunium Nugget",
 	"simplenergy.x1_raw_simplunium": "\n- x1 Raw Simplunium",
@@ -124,14 +126,25 @@
 	"simplenergy.x1_titanium_dust": "\n- x1 Titanium Dust",
 	"simplenergy.x2_iron_ingot_x4_copper_ingot": "\n- x2 Iron Ingot\n- x4 Copper Ingot",
 	"simplenergy.x2_quartz_x1_breeze_rod_x4_gold_nugget_x1_raw_gold_block_x1_iro": "\n- x2 Quartz\n- x1 Breeze Rod\n- x4 Gold Nugget\n- x1 Raw Gold Block\n- x1 Iron Block",
+	"simplenergy.\u80db\u80db\u80db": "$\u80db$\u80db$\u80db\n",
+	"simplenergy.\u8108\u8108\u8108": "$\u8108$\u8108$\u8108\n",
 	"simplenergy.x5_copper_block_x1_redstone_x3_iron_ingot": "\n- x5 Copper Block\n- x1 Redstone\n- x3 Iron Ingot",
+	"simplenergy.\u80c9\u80c9\u80c9": "$\u80c9$\u80c9$\u80c9\n",
+	"simplenergy.\u807f\u807f\u807f": "$\u807f$\u807f$\u807f\n",
+	"simplenergy.\u8021\u8021\u8021": "$\u8021$\u8021$\u8021\n",
 	"simplenergy.x7_iron_ingot_x1_redstone": "\n- x7 Iron Ingot\n- x1 Redstone",
+	"simplenergy.\u818d\u818d\u818d": "$\u818d$\u818d$\u818d\n",
+	"simplenergy.\u81c0\u81c0\u81c0": "$\u81c0$\u81c0$\u81c0\n",
 	"simplenergy.x3_iron_block_x2_redstone_x1_furnace_x3_stone": "\n- x3 Iron Block\n- x2 Redstone\n- x1 Furnace\n- x3 Stone",
+	"simplenergy.\u8112\u8112\u8112": "$\u8112$\u8112$\u8112\n",
 	"simplenergy.x5_lapis_lazuli_x1_daylight_detector_x3_iron_block": "\n- x5 Lapis Lazuli\n- x1 Daylight Detector\n- x3 Iron Block",
 	"simplenergy.x5_lapis_lazuli_x1_furnace_x3_iron_block": "\n- x5 Lapis Lazuli\n- x1 Furnace\n- x3 Iron Block",
+	"simplenergy.\u80d5\u80d5\u80d5": "$\u80d5$\u80d5$\u80d5\n",
+	"simplenergy.\u80d8\u80d8\u80d8": "$\u80d8$\u80d8$\u80d8\n",
 	"simplenergy.x6_iron_ingot_x2_copper_ingot_x1_coal": "\n- x6 Iron Ingot\n- x2 Copper Ingot\n- x1 Coal",
 	"simplenergy.x6_iron_ingot_x2_copper_ingot_x1_charcoal": "\n- x6 Iron Ingot\n- x2 Copper Ingot\n- x1 Charcoal",
 	"simplenergy.x8_simple_cable_x1_lapis_lazuli": "\n- x8 Simple Cable\n- x1 Lapis Lazuli",
+	"simplenergy.\u8071\u8071\u8071": "$\u8071$\u8071$\u8071\n",
 	"simplenergy.x1_advanced_cable_x4_redstone_block": "\n- x1 Advanced Cable\n- x4 Redstone Block",
 	"simplenergy.raw_tin": "Raw Tin",
 	"simplenergy.tin_ore": "Tin Ore",
@@ -146,7 +159,7 @@
 	"simplenergy.upgrade_a_simple_battery": "Upgrade a Simple Battery",
 	"simplenergy.better_cable_faster_transfer": "Better Cable, Faster Transfer",
 	"simplenergy.upgrade_a_simple_cable": "Upgrade a Simple Cable",
-	"simplenergy.the_simpler_generator": "The Simpler Generator",
+	"simplenergy.the_simplest_generator": "The Simplest Generator",
 	"simplenergy.craft_your_first_cauldron_generator": "Craft your first Cauldron Generator",
 	"simplenergy.faster_brewing": "Faster Brewing",
 	"simplenergy.obtain_an_electric_brewing_stand": "Obtain an Electric Brewing Stand",

build/resource_pack/assets/minecraft/models/item/leather_boots.json

@@ -1,5 +1,5 @@
 {
-	"parent": "item/handheld",
+	"parent": "item/generated",
 	"textures": {
 		"layer0": "item/leather_boots",
 		"layer1": "item/leather_boots_overlay"

build/resource_pack/assets/minecraft/models/item/leather_chestplate.json

@@ -1,5 +1,5 @@
 {
-	"parent": "item/handheld",
+	"parent": "item/generated",
 	"textures": {
 		"layer0": "item/leather_chestplate",
 		"layer1": "item/leather_chestplate_overlay"

build/resource_pack/assets/minecraft/models/item/leather_helmet.json

@@ -1,5 +1,5 @@
 {
-	"parent": "item/handheld",
+	"parent": "item/generated",
 	"textures": {
 		"layer0": "item/leather_helmet",
 		"layer1": "item/leather_helmet_overlay"

build/resource_pack/assets/minecraft/models/item/leather_leggings.json

@@ -1,5 +1,5 @@
 {
-	"parent": "item/handheld",
+	"parent": "item/generated",
 	"textures": {
 		"layer0": "item/leather_leggings",
 		"layer1": "item/leather_leggings_overlay"

build/resource_pack/assets/minecraft/models/item/warped_fungus_on_a_stick.json

@@ -1,5 +1,5 @@
 {
-	"parent": "item/handheld",
+	"parent": "item/generated",
 	"textures": {
 		"layer0": "item/warped_fungus_on_a_stick"
 	},

database_debug.json

@@ -268,7 +268,7 @@
 	"solar_panel": {
 		"id": "minecraft:furnace",
 		"category": "energy",
-		"custom_data": {"energy": {"generation": 4,"max_storage": 600},"simplenergy": {"solar_panel": true},"smithed": {"ignore": {"functionality": true,"crafting": true}}},
+		"custom_data": {"energy": {"generation": 4,"max_storage": 120},"simplenergy": {"solar_panel": true},"smithed": {"ignore": {"functionality": true,"crafting": true}}},
 		"result_of_crafting": [{"type": "crafting_shaped","result_count": 1,"category": "misc","shape": ["LLL","LDL","III"],"ingredients": {"L": {"item": "minecraft:lapis_lazuli"},"D": {"item": "minecraft:daylight_detector"},"I": {"item": "minecraft:iron_block"}}}],
 		"lore": ["{\"text\":\"[Energy Generation: 4 kW]\",\"italic\":false,\"color\":\"gray\"}","{\"text\":\"[Energy Buffer: 600 kJ]\",\"italic\":false,\"color\":\"gray\"}","{'text': 'SimplEnergy', 'italic': true, 'color': 'blue'}"],
 		"override_model": {"parent": "block/daylight_detector","textures": {"side": "simplenergy:block/solar_panel_side","top": "simplenergy:block/solar_panel_top"}},

user/database/additions.py

@@ -18,7 +18,7 @@ def main(database: dict[str, dict]) -> dict[str, dict]:
 		"creative_battery": {"id": CUSTOM_BLOCK_VANILLA, "custom_data": {"energy": {"storage":2000000000, "max_storage": 2147483647}}, "lore": ['{"text":"[Energy Storage: 2147 GJ]","italic":false,"color":"gray"}']},
 
 		"cauldron_generator": {
-			"id": CUSTOM_BLOCK_VANILLA, CATEGORY: "energy", "custom_data": {"energy": {"generation":5, "max_storage": 500}},		RESULT_OF_CRAFTING:[{"type":"crafting_shaped","result_count":1,"category":"misc","shape":["I I","IRI","III"],"ingredients":{"I":ingr_repr("minecraft:iron_ingot"),"R":ingr_repr("minecraft:redstone")}}],																		"lore": ['{"text":"[Energy Generation: 5 kW]","italic":false,"color":"gray"}','{"text":"[Energy Buffer: 500 kJ]","italic":false,"color":"gray"}'],
+			"id": CUSTOM_BLOCK_VANILLA, CATEGORY: "energy", "custom_data": {"energy": {"generation":5, "max_storage": 500}},						RESULT_OF_CRAFTING:[{"type":"crafting_shaped","result_count":1,"category":"misc","shape":["I I","IRI","III"],"ingredients":{"I":ingr_repr("minecraft:iron_ingot"),"R":ingr_repr("minecraft:redstone")}}],																		"lore": ['{"text":"[Energy Generation: 5 kW]","italic":false,"color":"gray"}','{"text":"[Energy Buffer: 500 kJ]","italic":false,"color":"gray"}'],
 			OVERRIDE_MODEL: {"parent":"block/cauldron", "textures": {"side": f"{NAMESPACE}:block/cauldron_generator_side", "top": f"{NAMESPACE}:block/cauldron_generator_top", "bottom": f"{NAMESPACE}:block/cauldron_generator_bottom"},
 			"display":{
 				"gui":{"rotation":[30,225,0],"translation":[0,0,0],"scale":[0.625,0.625,0.625]},
@@ -30,7 +30,7 @@ def main(database: dict[str, dict]) -> dict[str, dict]:
 		}}},
 		"furnace_generator": {"id": CUSTOM_BLOCK_VANILLA, CATEGORY: "energy", "custom_data": {"energy": {"generation":10, "max_storage": 800}},		RESULT_OF_CRAFTING:[{"type":"crafting_shaped","result_count":1,"category":"misc","shape":["III","RFR","SSS"],"ingredients":{"I":ingr_repr("minecraft:iron_block"),"R":ingr_repr("minecraft:redstone"),"F":ingr_repr("minecraft:furnace"),"S":ingr_repr("minecraft:stone")}}],	"lore": ['{"text":"[Energy Generation: 10 kW]","italic":false,"color":"gray"}','{"text":"[Energy Buffer: 800 kJ]","italic":false,"color":"gray"}']},
 		"solar_panel": {
-			"id": CUSTOM_BLOCK_VANILLA, CATEGORY: "energy", "custom_data": {"energy": {"generation":4, "max_storage": 600}},		RESULT_OF_CRAFTING:[{"type":"crafting_shaped","result_count":1,"category":"misc","shape":["LLL","LDL","III"],"ingredients":{"L":ingr_repr("minecraft:lapis_lazuli"),"D":ingr_repr("minecraft:daylight_detector"),"I":ingr_repr("minecraft:iron_block")}}],										"lore": ['{"text":"[Energy Generation: 4 kW]","italic":false,"color":"gray"}','{"text":"[Energy Buffer: 600 kJ]","italic":false,"color":"gray"}'],
+			"id": CUSTOM_BLOCK_VANILLA, CATEGORY: "energy", "custom_data": {"energy": {"generation":4, "max_storage": 120}},						RESULT_OF_CRAFTING:[{"type":"crafting_shaped","result_count":1,"category":"misc","shape":["LLL","LDL","III"],"ingredients":{"L":ingr_repr("minecraft:lapis_lazuli"),"D":ingr_repr("minecraft:daylight_detector"),"I":ingr_repr("minecraft:iron_block")}}],										"lore": ['{"text":"[Energy Generation: 4 kW]","italic":false,"color":"gray"}','{"text":"[Energy Buffer: 600 kJ]","italic":false,"color":"gray"}'],
 			OVERRIDE_MODEL: {"parent":"block/daylight_detector", "textures": {"side": f"{NAMESPACE}:block/solar_panel_side", "top": f"{NAMESPACE}:block/solar_panel_top"}},
 		},