Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@LTHCTheMaster
LTHCTheMaster committed Jul 24, 2022
1 parent 0cdf5b1 commit 329498c
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 19 deletions.
0 .../advancements/system/first_join_v1.5.json → ...dvancements/system/first_join_v1.6.1.json
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions Datapack/data/lthc.mage/functions/admin/uninstall.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ schedule clear lthc.mage:entities/boss/manage_summon_boss
schedule clear lthc.mage:core/loading/post_load

# Try disable the pack if the name didn't changed
datapack disable "file/magical_elementalization_v1.6.zip"
datapack disable "file/magical_elementalization_v1.6"
datapack disable "file/magical_elementalization_v1.6.1.zip"
datapack disable "file/magical_elementalization_v1.6.1"
datapack disable "file/magical_elementalization.zip"
datapack disable "file/magical_elementalization"
datapack disable "file/Magical-Elementalization"
Expand Down
2 changes: 1 addition & 1 deletion Datapack/data/lthc.mage/functions/core/loading/first_run/main.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Set the version of the datapack
scoreboard players set #lthc.mage.version lthc.mage.data 010600
scoreboard players set #lthc.mage.version lthc.mage.data 010601

# Create Scores
function lthc.mage:core/loading/score
Expand Down
4 changes: 1 addition & 3 deletions Datapack/data/lthc.mage/functions/core/loading/first_run/update.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Set the version of the datapack
scoreboard players set #lthc.mage.version lthc.mage.data 010600

scoreboard objectives remove lthc.mage.mental_state
scoreboard players set #lthc.mage.version lthc.mage.data 010601

# Update Scores
function lthc.mage:core/loading/score
Expand Down
2 changes: 1 addition & 1 deletion Datapack/data/lthc.mage/functions/core/loading/reload.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scoreboard objectives add lthc.mage.data dummy

# Check if it is the datapack first run or an update of the datapack
execute unless score #lthc.mage.first_run lthc.mage.data matches 1 run function lthc.mage:core/loading/first_run/main
execute if score #lthc.mage.first_run lthc.mage.data matches 1 unless score #lthc.mage.version lthc.mage.data matches 010600 run function lthc.mage:core/loading/first_run/update
execute if score #lthc.mage.first_run lthc.mage.data matches 1 unless score #lthc.mage.version lthc.mage.data matches 010601 run function lthc.mage:core/loading/first_run/update

# Summon a marker at the worldspawn for something
execute as @e[type=marker,tag=lthc.mage] run function lthc.mage:try_unload
Expand Down
2 changes: 1 addition & 1 deletion Datapack/data/lthc.mage/functions/entities/magical_traders/common_magical_trader.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
summon villager ~ ~ ~ {Silent:1b,Invulnerable:0b,CustomNameVisible:1b,PersistenceRequired:1b,NoAI:1b,CanPickUpLoot:0b,Tags:["global.ignore","lthc.mage.magical_trader","global.forceload","lthc.mage.entities","smithed.entity","smithed.strict"],Health:800,AbsorptionAmount:3200,DeathLootTable:"lthc.mage:entities/magical_trader",CustomName:'{"translate":"Magical Trader","color":"#DDEEFF","bold":true,"italic":false}',VillagerData:{level:5,profession:"minecraft:cleric",type:"minecraft:jungle"},Offers:{Recipes:[ {rewardExp:0b,maxUses:1,uses:0,xp:0,buy:{id:"minecraft:stick",Count:32b},buyB:{id:"minecraft:glass",Count:1b},sell:{id:"minecraft:warped_fungus_on_a_stick",Count:1b,tag:{lthc.mage.custom_items:1b,display:{Name:'{"translate":"Mage Wand","color":"#DDEEFF","italic":false}'},Unbreakable:1b,CustomModelData:170000,ctc:{traits:{"magic/wands":1b,"magic/functional/item":1b,item:1b},id:'mage_wand',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:acacia_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Acacia Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170000,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'acacia_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:birch_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Birch Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170001,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'birch_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:crimson_stem",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Crimson Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170002,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'crimson_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:dark_oak_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Dark Oak Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170003,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'dark_oak_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:jungle_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Jungle Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170004,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'jungle_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:mangrove_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Mangrove Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170008,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'mangrove_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:oak_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Oak Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170005,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'oak_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:spruce_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Spruce Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170006,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'spruce_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:warped_stem",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Warped Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170007,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'warped_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:18,uses:0,xp:0,buy:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "thermo_essence", from: "lthc.mage"},CustomModelData: 170008,display: {Name:'{"translate": "Thermo Essence", "color": "#DDEEFF", "italic": false}'}}},buyB:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "aero_essence", from: "lthc.mage"},CustomModelData: 170000,display: {Name:'{"translate": "Aero Essence", "color": "#DDEEFF", "italic": false}'}}},sell:{id:"minecraft:command_block",Count:1b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b, gas:1b}, id: "gas_essence", from: "lthc.mage"},CustomModelData: 170005,display: {Name:'{"translate": "Gas Essence", "color": "#DDEEFF", "italic": false}'}}}}, {rewardExp:0b,maxUses:18,uses:0,xp:0,buy:{id:"minecraft:command_block",Count:10b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "aero_essence", from: "lthc.mage"},CustomModelData: 170000,display: {Name:'{"translate": "Aero Essence", "color": "#DDEEFF", "italic": false}'}}},sell:{id:"minecraft:command_block",Count:1b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b, celestial:1b}, id: "celestial_essence", from: "lthc.mage"},CustomModelData: 170001,display: {Name:'{"translate": "Celestial Essence", "color": "#DDEEFF", "italic": false}'}}}}, {rewardExp:0b,maxUses:18,uses:0,xp:0,buy:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "hydro_essence", from: "lthc.mage"},CustomModelData: 170006,display: {Name:'{"translate": "Hydro Essence", "color": "#DDEEFF", "italic": false}'}}},buyB:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "phyto_essence", from: "lthc.mage"},CustomModelData: 170007,display: {Name:'{"translate": "Phyto Essence", "color": "#DDEEFF", "italic": false}'}}},sell:{id:"minecraft:command_block",Count:1b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b, color:1b}, id: "color_essence", from: "lthc.mage"},CustomModelData: 170002,display: {Name:'{"translate": "Color Essence", "color": "#DDEEFF", "italic": false}'}}}} ]}}
summon villager ~ ~ ~ {Silent:1b,Invulnerable:0b,CustomNameVisible:1b,PersistenceRequired:1b,NoAI:1b,CanPickUpLoot:0b,Tags:["global.ignore","lthc.mage.magical_trader","global.forceload","lthc.mage.entities","smithed.entity","smithed.strict"],Health:800,AbsorptionAmount:3200,Attributes:[{Name:"generic.max_health",Base:800},{Name:"generic.armor",Base:5}],DeathLootTable:"lthc.mage:entities/magical_trader",CustomName:'{"translate":"Magical Trader","color":"#DDEEFF","bold":true,"italic":false}',VillagerData:{level:5,profession:"minecraft:cleric",type:"minecraft:jungle"},Offers:{Recipes:[ {rewardExp:0b,maxUses:1,uses:0,xp:0,buy:{id:"minecraft:stick",Count:32b},buyB:{id:"minecraft:glass",Count:1b},sell:{id:"minecraft:warped_fungus_on_a_stick",Count:1b,tag:{lthc.mage.custom_items:1b,display:{Name:'{"translate":"Mage Wand","color":"#DDEEFF","italic":false}'},Unbreakable:1b,CustomModelData:170000,ctc:{traits:{"magic/wands":1b,"magic/functional/item":1b,item:1b},id:'mage_wand',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:acacia_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Acacia Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170000,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'acacia_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:birch_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Birch Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170001,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'birch_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:crimson_stem",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Crimson Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170002,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'crimson_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:dark_oak_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Dark Oak Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170003,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'dark_oak_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:jungle_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Jungle Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170004,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'jungle_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:mangrove_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Mangrove Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170008,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'mangrove_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:oak_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Oak Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170005,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'oak_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:spruce_log",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Spruce Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170006,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'spruce_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:3,uses:0,xp:0,buy:{id:"minecraft:warped_stem",Count:12b},buyB:{id:"minecraft:bucket",Count:1b},sell:{id:"minecraft:barrel",Count:1b,tag:{BlockEntityTag:{Lock:"LTHCMage_L"},lthc.mage.custom_items:1b,display:{Name:'{"translate":"Warped Collector Pylon","color":"#DDEEFF","italic":false}'},CustomModelData:170007,ctc:{traits:{"magic/collector/pylon":1b,"magic/functional/block":1b,block:1b},id:'warped_collector_pylon',from:'lthc.mage'}}}}, {rewardExp:0b,maxUses:18,uses:0,xp:0,buy:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "thermo_essence", from: "lthc.mage"},CustomModelData: 170008,display: {Name:'{"translate": "Thermo Essence", "color": "#DDEEFF", "italic": false}'}}},buyB:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "aero_essence", from: "lthc.mage"},CustomModelData: 170000,display: {Name:'{"translate": "Aero Essence", "color": "#DDEEFF", "italic": false}'}}},sell:{id:"minecraft:command_block",Count:1b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b, gas:1b}, id: "gas_essence", from: "lthc.mage"},CustomModelData: 170005,display: {Name:'{"translate": "Gas Essence", "color": "#DDEEFF", "italic": false}'}}}}, {rewardExp:0b,maxUses:18,uses:0,xp:0,buy:{id:"minecraft:command_block",Count:10b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "aero_essence", from: "lthc.mage"},CustomModelData: 170000,display: {Name:'{"translate": "Aero Essence", "color": "#DDEEFF", "italic": false}'}}},sell:{id:"minecraft:command_block",Count:1b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b, celestial:1b}, id: "celestial_essence", from: "lthc.mage"},CustomModelData: 170001,display: {Name:'{"translate": "Celestial Essence", "color": "#DDEEFF", "italic": false}'}}}}, {rewardExp:0b,maxUses:18,uses:0,xp:0,buy:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "hydro_essence", from: "lthc.mage"},CustomModelData: 170006,display: {Name:'{"translate": "Hydro Essence", "color": "#DDEEFF", "italic": false}'}}},buyB:{id:"minecraft:command_block",Count:5b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b}, id: "phyto_essence", from: "lthc.mage"},CustomModelData: 170007,display: {Name:'{"translate": "Phyto Essence", "color": "#DDEEFF", "italic": false}'}}},sell:{id:"minecraft:command_block",Count:1b,tag:{lthc.mage.custom_items:1b,ctc: {traits: {"magic/essences":1b, item:1b, color:1b}, id: "color_essence", from: "lthc.mage"},CustomModelData: 170002,display: {Name:'{"translate": "Color Essence", "color": "#DDEEFF", "italic": false}'}}}} ]}}
forceload add ~ ~ ~ ~

0 comments on commit 329498c

Please sign in to comment.