diff --git a/gm4_soul_glass/README.md b/gm4_soul_glass/README.md index 9c9f43fa71..e8b91e89fa 100644 --- a/gm4_soul_glass/README.md +++ b/gm4_soul_glass/README.md @@ -3,7 +3,7 @@ Beacons need a bit more corruption. This data pack reverses their effects ### Features -- Crafted by smelting Soul Sand in a Blast Furnace +- Crafted by smelting Soul Sand in a Furnace - Applies an inverted effect when placed on-top of a Beacon - Beacon power can be disabled by either moving the glass block or turning off the beacon - For example: Speed becomes Slowness, Haste becomes Mining Fatigue diff --git a/gm4_soul_glass/assets/translations.csv b/gm4_soul_glass/assets/translations.csv index 06975c1c1c..e834275237 100644 --- a/gm4_soul_glass/assets/translations.csv +++ b/gm4_soul_glass/assets/translations.csv @@ -3,6 +3,6 @@ item.gm4.soul_glass,Soul Glass advancement.gm4.soul_glass.title,Corruption at its Finest advancement.gm4.soul_glass.description,Corrupt the effects of a beacon text.gm4.guidebook.module_desc.soul_glass,"Reverse the effects of beacons with corrupting glass! But be careful, a poison Beacon may sound great at first, but is incredibly painful in pratice." -text.gm4.guidebook.soul_glass.description,"Soul Sand can be smelted in a blast furnace to get Soul Glass.\n\nWhen placed directly over a beacon, soul glass will corrupt the effects." +text.gm4.guidebook.soul_glass.description,"Soul Sand can be smelted in a furnace to get Soul Glass.\n\nWhen placed directly over a beacon, soul glass will corrupt the effects." text.gm4.guidebook.soul_glass.usage,If soul glass is moved from its original location it will lose its properties.\n\nThe exception is moving it with a sticky piston up to one block away. text.gm4.guidebook.soul_glass.corrupted_effects,Corrupted Effects: diff --git a/gm4_soul_glass/beet.yaml b/gm4_soul_glass/beet.yaml index 7ad4cc368a..e0ea1dc2e7 100644 --- a/gm4_soul_glass/beet.yaml +++ b/gm4_soul_glass/beet.yaml @@ -1,6 +1,6 @@ id: gm4_soul_glass name: Soul Glass -version: 1.5.X +version: 1.6.X data_pack: load: . diff --git a/gm4_soul_glass/data/gm4_soul_glass/function/main.mcfunction b/gm4_soul_glass/data/gm4_soul_glass/function/main.mcfunction index 7dea155787..a352af9888 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/function/main.mcfunction +++ b/gm4_soul_glass/data/gm4_soul_glass/function/main.mcfunction @@ -1,7 +1,7 @@ -# Kill old blast furnace markers, remove this later -kill @e[type=marker,tag=gm4_sg_furnace] +schedule function gm4_soul_glass:main 16t # process soul glass execute as @e[type=marker,tag=gm4_soul_glass] at @s run function gm4_soul_glass:process -schedule function gm4_soul_glass:main 16t +# Kill old blast furnace markers, remove this later +kill @e[type=marker,tag=gm4_sg_furnace] diff --git a/gm4_soul_glass/data/gm4_soul_glass/guidebook/soul_glass.json b/gm4_soul_glass/data/gm4_soul_glass/guidebook/soul_glass.json index fd21ff31a4..4fdbebef4a 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/guidebook/soul_glass.json +++ b/gm4_soul_glass/data/gm4_soul_glass/guidebook/soul_glass.json @@ -53,7 +53,7 @@ }, { "translate": "text.gm4.guidebook.soul_glass.description", - "fallback": "Soul Sand can be smelted in a blast furnace to get Soul Glass.\n\nWhen placed directly over a beacon, soul glass will corrupt the effects." + "fallback": "Soul Sand can be smelted in a furnace to get Soul Glass.\n\nWhen placed directly over a beacon, soul glass will corrupt the effects." } ] ] diff --git a/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json b/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json index 85837046c8..7f152d11be 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json +++ b/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json @@ -1,5 +1,5 @@ { - "type": "minecraft:blasting", + "type": "minecraft:smelting", "ingredient": "minecraft:soul_sand", "result": { "id": "minecraft:brown_stained_glass", diff --git a/gm4_soul_glass/data/gm4_soul_glass/test/smelt_soul_glass.mcfunction b/gm4_soul_glass/data/gm4_soul_glass/test/smelt_soul_glass.mcfunction index eaed60cba7..7cfbad5c90 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/test/smelt_soul_glass.mcfunction +++ b/gm4_soul_glass/data/gm4_soul_glass/test/smelt_soul_glass.mcfunction @@ -2,10 +2,10 @@ # @dummy ~1.5 ~1 ~0.5 # @timeout 900 -item replace entity @s weapon.mainhand with blast_furnace +item replace entity @s weapon.mainhand with furnace execute at @s run tp @s ~ ~ ~ facing ~ ~-1 ~1 dummy @s use block ~1 ~ ~1 up -assert block ~1 ~1 ~1 blast_furnace +assert block ~1 ~1 ~1 furnace item replace block ~1 ~1 ~1 container.0 with soul_sand item replace block ~1 ~1 ~1 container.1 with coal