Updated to version 5.3.4

Stardust-Labs-MC · Dec 7, 2023 · 67e8823 · 67e8823
1 parent 8d55003
commit 67e8823
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 199 deletions.
diff --git a/1-20-2-overlay/data/incendium/functions/item/trailblazer/arrow/init.mcfunction b/1-20-2-overlay/data/incendium/functions/item/trailblazer/arrow/init.mcfunction
diff --git a/1-20-2-overlay/data/incendium/loot_tables/phantom/hopper.json b/1-20-2-overlay/data/incendium/loot_tables/phantom/hopper.json
diff --git a/data/incendium/functions/entity/toxic_slime/init.mcfunction b/data/incendium/functions/entity/toxic_slime/init.mcfunction
@@ -1,6 +1,6 @@
 # from: entity/mobs/init
 # @s: toxic slime
 
-summon slime ~ ~ ~ {Tags:["in.toxic_slime"],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{Count:1b,id:"minecraft:golden_boots",tag:{Enchantments:[{id:"minecraft:feather_falling",lvl:255},{id:"minecraft:unbreaking",lvl:255}]}},{},{},{}]}
+summon slime ~ ~ ~ {Tags:["in.toxic_slime"]}
 execute as @e[type=slime,tag=in.toxic_slime,tag=!in.checked,distance=..1,limit=1,sort=nearest] run function incendium:entity/toxic_slime/slime_init
 tp @s ~ -10 ~
diff --git a/data/incendium/functions/entity/toxic_slime/slime_init.mcfunction b/data/incendium/functions/entity/toxic_slime/slime_init.mcfunction
@@ -8,6 +8,7 @@ attribute @s generic.movement_speed base set 1.1
 attribute @s generic.max_health base set 1
 
 effect give @s fire_resistance 999999 0 true
+effect give @s slow_falling 999999 0 true
 effect give @s jump_boost 999999 3 true
 effect give @s speed 999999 3 true
 effect give @s resistance 999999 3 true

diff --git a/data/incendium/functions/incendium.mcfunction b/data/incendium/functions/incendium.mcfunction
diff --git a/data/incendium/functions/item/greatsword_of_sacrifice/on_hit.mcfunction b/data/incendium/functions/item/greatsword_of_sacrifice/on_hit.mcfunction
@@ -1,7 +1,7 @@
 # from: player/event/on_hit_or_kill
 # @s: player hitting
 
-damage @s 3.0 thorns by @s from @s
+damage @s 7.0 thorns by @s from @s
 
 particle soul ~ ~1 ~ 0 0 0 0.1 100 force
 playsound minecraft:entity.husk.converted_to_zombie player @a[distance=..16] ~ ~ ~ 2 1.5 0
diff --git a/data/incendium/functions/item/necrotic_shield/on_block.mcfunction b/data/incendium/functions/item/necrotic_shield/on_block.mcfunction
@@ -1,7 +1,7 @@
 # from: player/on_block
 # @s: player being hit
 
-summon area_effect_cloud ~ ~0.25 ~ {id:"minecraft:area_effect_cloud",Particle:"large_smoke",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:10,Color:0,Effects:[{Id:20,Amplifier:2b,Duration:100,ShowParticles:1b}],Tags:["in.necrotic_wither"]}
+summon area_effect_cloud ~ ~0.25 ~ {id:"minecraft:area_effect_cloud",Particle:"large_smoke",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:10,Color:0,Effects:[{Id:20,Amplifier:2b,Duration:100,ShowParticles:1b}],effects:[{id:"minecraft:wither",amplifier:2b,duration:100,show_particles:1b}],Tags:["in.necrotic_wither"]}
 
 execute at @e[type=#incendium:mobs,tag=!in.immune,distance=1..7,limit=8,sort=nearest,predicate=incendium:random/30] run summon evoker_fangs ~ ~ ~ {Warmup:1,Glowing:1b,Tags:["in.necrotic_fangs"]}
 execute as @e[type=evoker_fangs,distance=..10] at @s run tp @s ~ ~ ~ facing entity @p[tag=in.self] eyes

diff --git a/data/incendium/functions/item/radiation_shield/on_block.mcfunction b/data/incendium/functions/item/radiation_shield/on_block.mcfunction
@@ -1,7 +1,7 @@
 # from: player/on_block
 # @s: player being hit
 
-summon area_effect_cloud ~ ~0.5 ~ {id:"minecraft:area_effect_cloud",Particle:"dust 0 1 0 2",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:8,Effects:[{Id:19,Amplifier:1b,Duration:90},{Id:24,Amplifier:0b,Duration:120}],Tags:["in.radiation"]}
+summon area_effect_cloud ~ ~0.5 ~ {id:"minecraft:area_effect_cloud",Particle:"dust 0 1 0 2",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:8,Effects:[{Id:19,Amplifier:1b,Duration:90},{Id:24,Amplifier:0b,Duration:120}],effects:[{id:"minecraft:poison",amplifier:1b,duration:90},{id:"minecraft:poison",amplifier:0b,duration:120}],Tags:["in.radiation"]}
 
 scoreboard players set @s in.cd_shield 120
 

diff --git a/data/incendium/functions/item/trailblazer/arrow/init.mcfunction b/data/incendium/functions/item/trailblazer/arrow/init.mcfunction
@@ -34,7 +34,6 @@ execute store result storage incendium:temp arrow.damage double 0.01 run scorebo
 data modify storage incendium:temp arrow.PierceLevel set value 5b
 data modify storage incendium:temp arrow.NoGravity set value 1b
 data modify storage incendium:temp arrow.Fire set value 1000s
-# data modify storage incendium:temp arrow.CustomPotionEffects append value {id:13b, Duration: 3, Amplifier:127, Ambient:1b, ShowParticles:0b, ShowIcon:0b}
 data modify entity @s {} merge from storage incendium:temp arrow
 
 playsound minecraft:entity.blaze.shoot master @a ~ ~ ~ 2 0.1

diff --git a/data/incendium/functions/sanctum/guardian/init.mcfunction b/data/incendium/functions/sanctum/guardian/init.mcfunction
@@ -5,7 +5,7 @@ loot replace entity @s weapon.mainhand loot incendium:artifact/patron/holy_wrath
 
 data modify entity @s CustomName set value '{"translate":"incendium.mob.sanctum.guardian.name","fallback":"Sanctum Guardian", "color": "#DAA520"}'
 data modify entity @s HandDropChances set value [40.0f,40.0f]
-data modify entity @s ArmorItems set value [{id:"minecraft:netherite_helmet", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}, {id:"minecraft:iron_chestplate", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}, {id:"minecraft:iron_leggings", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}, {id:"minecraft:golden_boots", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}]
+data modify entity @s ArmorItems set value [{id:"minecraft:golden_boots", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}, {id:"minecraft:iron_leggings", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}, {id:"minecraft:iron_chestplate", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}, {id:"minecraft:netherite_helmet", Count:1b, tag:{Enchantments:[{id:"minecraft:blast_resistance",lvl:15s}]}}]
 data modify entity @s PersistenceRequired set value 1b
 
 tag @s add in.ticking_entity

diff --git a/data/incendium/loot_tables/castle/base/rare_potion.json b/data/incendium/loot_tables/castle/base/rare_potion.json
@@ -18,7 +18,7 @@
             },
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:10,Amplifier:1b,Duration:1200},{Id:11,Amplifier:4b,Duration:600},{Id:22,Amplifier:3b,Duration:4800}],CustomPotionColor:14679821}"
+              "tag": "{CustomPotionEffects:[{Id:10,Amplifier:1b,Duration:1200},{Id:11,Amplifier:4b,Duration:600},{Id:22,Amplifier:3b,Duration:4800}],custom_potion_effects:[{id:\"minecraft:regeneration\",amplifier:1b,duration:1200},{id:\"minecraft:resistance\",amplifier:4b,duration:600},{id:\"minecraft:absorption\",amplifier:3b,duration:4800}],CustomPotionColor:14679821}"
             }
           ]
         },
@@ -37,7 +37,7 @@
             },
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:3,Amplifier:2b,Duration:18000}],CustomPotionColor:16735265}"
+              "tag": "{CustomPotionEffects:[{Id:3,Amplifier:2b,Duration:18000}],custom_potion_effects:[{id:\"minecraft:haste\",amplifier:2b,duration:18000}],CustomPotionColor:16735265}"
             }
           ]
         },
@@ -56,7 +56,7 @@
             },
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionEffects:[{Id:2,Amplifier:0b,Duration:4000},{Id:5,Amplifier:3b,Duration:1500},{Id:9,Amplifier:0b,Duration:200},{Id:11,Amplifier:1b,Duration:1000}],CustomPotionColor:12162815} "
+              "tag": "{CustomPotionEffects:[{Id:2,Amplifier:0b,Duration:4000},{Id:5,Amplifier:3b,Duration:1500},{Id:9,Amplifier:0b,Duration:200},{Id:11,Amplifier:1b,Duration:1000}],custom_potion_effects:[{id:\"minecraft:slowness\",amplifier:0b,duration:4000},{id:\"minecraft:strength\",amplifier:3b,duration:1500},{id:\"minecraft:nausea\",amplifier:0b,duration:200},{id:\"minecraft:resistance\",amplifier:1b,duration:1000}],CustomPotionColor:12162815} "
             }
           ]
         }

diff --git a/data/incendium/loot_tables/ghastling.json b/data/incendium/loot_tables/ghastling.json
@@ -9,7 +9,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{incendium:{item:'ghastling_egg'},Enchantments:[{}],EntityTag:{id:\"minecraft:allay\",Tags:[\"in.unborn_ghast\"],PersistenceRequired:1b,NoAI:1b,Silent:1,ArmorDropChances:[0.085F,0.085F,0.085F,0.085F],ArmorItems:[{},{},{},{}],HandItems:[{id:\"minecraft:air\"}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647,ShowParticles:0b}]}}"
+              "tag": "{incendium:{item:'ghastling_egg'},Enchantments:[{}],EntityTag:{id:\"minecraft:allay\",Tags:[\"in.unborn_ghast\"],PersistenceRequired:1b,NoAI:1b,Silent:1,ArmorDropChances:[0.085F,0.085F,0.085F,0.085F],ArmorItems:[{},{},{},{}],HandItems:[{id:\"minecraft:air\"}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647,ShowParticles:0b}],active_effects:[{id:\"minecraft:invisibility\",amplifier:0,duration:2147483647,show_particles:0b}]}}"
             },
             {
               "function": "minecraft:set_name",

diff --git a/data/incendium/loot_tables/sanctum/potions.json b/data/incendium/loot_tables/sanctum/potions.json
@@ -40,7 +40,7 @@
             },
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionColor:1517120,HideFlags:32,Potion:\"minecraft:water\",CustomPotionEffects:[{Id:7,Amplifier:1},{Id:7,Amplifier:28},{Id:33,Amplifier:1,Duration:2147483647},{Id:14,Amplifier:1,Duration:2147483647},{Id:2,Amplifier:9,Duration:2147483647},{Id:4,Amplifier:9,Duration:2147483647},{Id:9,Duration:2147483647},{Id:15,Duration:2147483647},{Id:17,Amplifier:19,Duration:2147483647},{Id:18,Amplifier:9,Duration:2147483647},{Id:19,Amplifier:2,Duration:2147483647},{Id:20,Amplifier:4,Duration:2147483647},{Id:24,Duration:2147483647},{Id:25,Amplifier:49,Duration:2147483647},{Id:27,Amplifier:99,Duration:2147483647},{Id:31,Amplifier:5,Duration:1200}],display:{Name:'[{\"text\":\"Death Potion\",\"italic\":false,\"color\":\"dark_red\"}]'}}\n\n"
+              "tag": "{CustomPotionColor:1517120,HideFlags:32,Potion:\"minecraft:water\",CustomPotionEffects:[{Id:7,Amplifier:1},{Id:7,Amplifier:28},{Id:33,Amplifier:1,Duration:2147483647},{Id:14,Amplifier:1,Duration:2147483647},{Id:2,Amplifier:9,Duration:2147483647},{Id:4,Amplifier:9,Duration:2147483647},{Id:9,Duration:2147483647},{Id:15,Duration:2147483647},{Id:17,Amplifier:19,Duration:2147483647},{Id:18,Amplifier:9,Duration:2147483647},{Id:19,Amplifier:2,Duration:2147483647},{Id:20,Amplifier:4,Duration:2147483647},{Id:24,Duration:2147483647},{Id:25,Amplifier:49,Duration:2147483647},{Id:27,Amplifier:99,Duration:2147483647},{Id:31,Amplifier:5,Duration:1200}],custom_potion_effects:[{id:\"minecraft:instant_damage\",amplifier:1},{id:\"minecraft:darkness\",amplifier:1,duration:2147483647},{id:\"minecraft:invisibility\",amplifier:1,duration:2147483647},{id:\"minecraft:slowness\",amplifier:9,duration:2147483647},{id:\"minecraft:mining_fatigue\",amplifier:9,duration:2147483647},{id:\"minecraft:nausea\",duration:2147483647},{id:\"minecraft:blindness\",duration:2147483647},{id:\"minecraft:hunger\",amplifier:19,duration:2147483647},{id:\"minecraft:weakness\",amplifier:9,duration:2147483647},{id:\"minecraft:poison\",amplifier:2,duration:2147483647},{id:\"minecraft:wither\",amplifier:4,duration:2147483647},{id:\"minecraft:glowing\",duration:2147483647},{id:\"minecraft:levitation\",amplifier:49,duration:2147483647},{id:\"minecraft:unluck\",amplifier:99,duration:2147483647},{id:\"minecraft:bad_omen\",amplifier:5,duration:1200}],display:{Name:'[{\"text\":\"Death Potion\",\"italic\":false,\"color\":\"dark_red\"}]'}}\n\n"
             }
           ]
         },
@@ -51,7 +51,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{CustomPotionColor:16514882,HideFlags:32,Potion:\"minecraft:water\",CustomPotionEffects:[{Id:24,Duration:100000000}],display:{Lore:['[{\"text\":\"Glowing (∞)\",\"italic\":false,\"color\":\"red\"}]'],Name:'[{\"text\":\"Splash Potion of Eternal Glowing\",\"italic\":false}]'}}"
+              "tag": "{CustomPotionColor:16514882,HideFlags:32,Potion:\"minecraft:water\",CustomPotionEffects:[{Id:24,Duration:100000000}],custom_potion_effects:[{id:\"minecraft:glowing\",duration:100000000}],display:{Lore:['[{\"text\":\"Glowing (∞)\",\"italic\":false,\"color\":\"red\"}]'],Name:'[{\"text\":\"Splash Potion of Eternal Glowing\",\"italic\":false}]'}}"
             }
           ]
         },
@@ -62,7 +62,7 @@
           "functions": [
             {
               "function": "minecraft:set_nbt",
-              "tag": "{Potion:\"minecraft:water\",CustomPotionColor:424462,CustomPotionEffects:[{Id:31,Duration:1200}],display:{Name:'[{\"text\":\"Potion of Bad Omen\",\"italic\":false}]'}}"
+              "tag": "{Potion:\"minecraft:water\",CustomPotionColor:424462,CustomPotionEffects:[{Id:31,Duration:1200}],custom_potion_effects:[{id:\"minecraft:bad_omen\",duration:1200}],display:{Name:'[{\"text\":\"Potion of Bad Omen\",\"italic\":false}]'}}"
             }
           ]
         },

diff --git a/data/incendium/structures/sanctum/bottom.nbt b/data/incendium/structures/sanctum/bottom.nbt
diff --git a/data/incendium/structures/sanctum/top.nbt b/data/incendium/structures/sanctum/top.nbt
diff --git a/data/incendium/worldgen/structure/sanctum.json b/data/incendium/worldgen/structure/sanctum.json
@@ -3,14 +3,7 @@
   "spawn_overrides": {
     "monster": {
       "bounding_box": "piece",
-      "spawns": [
-        {
-          "type": "minecraft:skeleton",
-          "weight": 2,
-          "minCount": 1,
-          "maxCount": 1
-        }
-      ]
+      "spawns": []
     }
   },
   "type": "minecraft:jigsaw",

diff --git a/data/incendium/worldgen/structure_set/lesser_structures.json b/data/incendium/worldgen/structure_set/lesser_structures.json
@@ -30,7 +30,7 @@
     "salt": 399125,
     "exclusion_zone": {
       "other_set": "incendium:greater_structures",
-      "chunk_count": 8
+      "chunk_count": 10
     },
     "spacing": 20,
     "separation": 12

diff --git a/pack.mcmeta b/pack.mcmeta
@@ -3,7 +3,7 @@
         "pack_format": 15,
         "supported_formats": [
             15,
-            18
+            26
         ],
         "description": [
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
             "pack_format": 15,
             "supported_formats": [
 ,
             ],
             "description": [
                 {
@@ Expand Down @@