end the 1.6 version

Author: LTHCTheMaster

Datapack/data/lthc.mage/functions/entities/magical_trader.mcfunction

@@ -4,6 +4,6 @@ execute as @e[type=villager,tag=lthc.mage.magical_trader] run function lthc.mage
 kill @e[type=villager,tag=lthc.mage.magical_trader]
 
 # Summon new Magical Trader
-execute if predicate lthc.mage:luck/37 run function lthc.mage:entities/summon_magical_trader
+execute if predicate lthc.mage:luck/37 run function lthc.mage:entities/magical_traders/choose
 
 scoreboard players set #lthc.mage.tmt lthc.mage.data 0

Datapack/data/lthc.mage/functions/entities/magical_traders/choose.mcfunction

@@ -0,0 +1,4 @@
+scoreboard players set #choosen lthc.mage.data 0
+execute if predicate lthc.mage:luck/8 run scoreboard players set #choosen lthc.mage.data 1
+execute if score #choosen lthc.mage.data matches 1 run function lthc.mage:entities/magical_traders/psychologist_magical_trader
+execute if score #choosen lthc.mage.data matches 0 run function lthc.mage:entities/magical_traders/common_magical_trader

Datapack/data/lthc.mage/functions/entities/summon_magical_trader.mcfunction renamed to Datapack/data/lthc.mage/functions/entities/magical_traders/common_magical_trader.mcfunction

@@ -0,0 +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/pmagical_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:1b,maxUses:7,uses:0,xp:0,buy:{id:"minecraft:apple",Count:4b},buyB:{id:"minecraft:milk_bucket",Count:1b},sell:{id:"minecraft:apple",Count:1b,tag:{lthc.mage.custom_items:1b,display:{Name:'{"translate":"Pills","color":"#DDEEFF","italic":false}'},CustomModelData:170000,ctc: {traits: {"food/pills":1b, item:1b}, id: "pills", from: "lthc.mage"}}}}]}}
+forceload add ~ ~ ~ ~

Datapack/data/lthc.mage/functions/entities/magical_traders/psychologist_magical_trader.mcfunction

@@ -0,0 +1,57 @@
+{
+    "type": "entity",
+    "pools": [
+        {
+            "rolls": {
+                "type": "binomial",
+                "n": {
+                    "type": "uniform",
+                    "min": 7,
+                    "max": 11
+                },
+                "p": 0.13
+            },
+            "entries": [
+                {
+                    "type": "loot_table",
+                    "name": "lthc.mage:item/mental_state/pills",
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "type": "uniform",
+                                "min": 2,
+                                "max": 7
+                            }
+                        },
+                        {
+                            "function": "set_count",
+                            "add": true,
+                            "conditions": [
+                                {
+                                    "condition": "random_chance_with_looting",
+                                    "chance": 0.12,
+                                    "looting_multiplier": 2
+                                }
+                            ],
+                            "count": {
+                                "type": "uniform",
+                                "min": 2,
+                                "max": 6
+                            }
+                        }
+                    ],
+                    "weight": 2
+                },
+                {
+                    "type": "loot_table",
+                    "name": "lthc.mage:engine/multifarm_mk1_hydro"
+                },
+                {
+                    "type": "loot_table",
+                    "name": "lthc.mage:loot_calculate/mangrove_guardian_loot"
+                }
+            ]
+        }
+    ]
+}

Datapack/data/lthc.mage/loot_tables/entities/pmagical_trader.json

@@ -228,3 +228,22 @@ Removes:
 Fixes:
 
 - Wrong lore on spells
+
+### 1.6 Magical Elementalization - Magical Trader Rework
+
+News:
+
+- No News :( but good changes
+
+Changes:
+
+- Killable Magical Trader
+- More Special Magical Trader
+
+Removes:
+
+- No Removes :)
+
+Fixes:
+
+- Wrong lore on spells