diff --git a/.github/README.md b/.github/README.md index e697968..be7d0ff 100644 --- a/.github/README.md +++ b/.github/README.md @@ -57,7 +57,7 @@ Adding to a Maven Project: de.articdive articdata - 1.19-6e644906 + 1.19-d451cb01 ``` @@ -69,7 +69,7 @@ repositories { mavenCentral() } dependencies { - implementation("de.articdive:articdata:1.19-6e644906") + implementation("de.articdive:articdata:1.19-d451cb01") } ``` diff --git a/1_19_potion_effects.json b/1_19_potion_effects.json index 9a1e2f1..6c664ec 100644 --- a/1_19_potion_effects.json +++ b/1_19_potion_effects.json @@ -71,7 +71,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.attack_speed", + "attribute": "minecraft:generic.attack_speed", "uuid": "af8b6e3f-3328-4c0a-aa36-5ba2bb9dbef3", "value": 0.10000000149011612, "operation": "MULTIPLY_TOTAL" @@ -86,7 +86,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.max_health", + "attribute": "minecraft:generic.max_health", "uuid": "5d6f0ba2-1186-46ac-b896-c61c5cee99cc", "value": 4.0, "operation": "ADDITION" @@ -157,7 +157,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.luck", + "attribute": "minecraft:generic.luck", "uuid": "03c3c89d-7037-4b42-869f-b146bcb64d2e", "value": 1.0, "operation": "ADDITION" @@ -172,7 +172,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.attack_speed", + "attribute": "minecraft:generic.attack_speed", "uuid": "55fced67-e92a-486e-9800-b47f202c4386", "value": -0.10000000149011612, "operation": "MULTIPLY_TOTAL" @@ -243,7 +243,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.movement_speed", + "attribute": "minecraft:generic.movement_speed", "uuid": "7107de5e-7ce8-4030-940e-514c1f160890", "value": -0.15000000596046448, "operation": "MULTIPLY_TOTAL" @@ -258,7 +258,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.movement_speed", + "attribute": "minecraft:generic.movement_speed", "uuid": "91aeaa56-376b-4498-935b-2f7f68070635", "value": 0.20000000298023224, "operation": "MULTIPLY_TOTAL" @@ -273,7 +273,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.attack_damage", + "attribute": "minecraft:generic.attack_damage", "uuid": "648d7064-6a60-4f59-8abe-c2c23a6dd7a9", "value": 0.0, "operation": "ADDITION" @@ -288,7 +288,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.luck", + "attribute": "minecraft:generic.luck", "uuid": "cc5af142-2bd2-4215-b636-2605aed11727", "value": -1.0, "operation": "ADDITION" @@ -311,7 +311,7 @@ "instantaneous": false, "modifiers": [ { - "attribute": "attribute.name.generic.attack_damage", + "attribute": "minecraft:generic.attack_damage", "uuid": "22653b89-116e-49dc-9b6b-9971489b5be5", "value": 0.0, "operation": "ADDITION" diff --git a/1_19_potions.json b/1_19_potions.json index 7e35550..90bf7c6 100644 --- a/1_19_potions.json +++ b/1_19_potions.json @@ -1,174 +1,583 @@ { "minecraft:awkward": { "id": 4, - "mojangName": "AWKWARD" + "mojangName": "AWKWARD", + "potion_effects": [] }, "minecraft:empty": { "id": 0, - "mojangName": "EMPTY" + "mojangName": "EMPTY", + "potion_effects": [] }, "minecraft:fire_resistance": { "id": 12, - "mojangName": "FIRE_RESISTANCE" + "mojangName": "FIRE_RESISTANCE", + "potion_effects": [ + { + "id": "minecraft:fire_resistance", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:harming": { "id": 27, - "mojangName": "HARMING" + "mojangName": "HARMING", + "potion_effects": [ + { + "id": "minecraft:instant_damage", + "duration": 1, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:healing": { "id": 25, - "mojangName": "HEALING" + "mojangName": "HEALING", + "potion_effects": [ + { + "id": "minecraft:instant_health", + "duration": 1, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:invisibility": { "id": 7, - "mojangName": "INVISIBILITY" + "mojangName": "INVISIBILITY", + "potion_effects": [ + { + "id": "minecraft:invisibility", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:leaping": { "id": 9, - "mojangName": "LEAPING" + "mojangName": "LEAPING", + "potion_effects": [ + { + "id": "minecraft:jump_boost", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_fire_resistance": { "id": 13, - "mojangName": "LONG_FIRE_RESISTANCE" + "mojangName": "LONG_FIRE_RESISTANCE", + "potion_effects": [ + { + "id": "minecraft:fire_resistance", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_invisibility": { "id": 8, - "mojangName": "LONG_INVISIBILITY" + "mojangName": "LONG_INVISIBILITY", + "potion_effects": [ + { + "id": "minecraft:invisibility", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_leaping": { "id": 10, - "mojangName": "LONG_LEAPING" + "mojangName": "LONG_LEAPING", + "potion_effects": [ + { + "id": "minecraft:jump_boost", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_night_vision": { "id": 6, - "mojangName": "LONG_NIGHT_VISION" + "mojangName": "LONG_NIGHT_VISION", + "potion_effects": [ + { + "id": "minecraft:night_vision", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_poison": { "id": 30, - "mojangName": "LONG_POISON" + "mojangName": "LONG_POISON", + "potion_effects": [ + { + "id": "minecraft:poison", + "duration": 1800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_regeneration": { "id": 33, - "mojangName": "LONG_REGENERATION" + "mojangName": "LONG_REGENERATION", + "potion_effects": [ + { + "id": "minecraft:regeneration", + "duration": 1800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_slow_falling": { "id": 42, - "mojangName": "LONG_SLOW_FALLING" + "mojangName": "LONG_SLOW_FALLING", + "potion_effects": [ + { + "id": "minecraft:slow_falling", + "duration": 4800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_slowness": { "id": 18, - "mojangName": "LONG_SLOWNESS" + "mojangName": "LONG_SLOWNESS", + "potion_effects": [ + { + "id": "minecraft:slowness", + "duration": 4800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_strength": { "id": 36, - "mojangName": "LONG_STRENGTH" + "mojangName": "LONG_STRENGTH", + "potion_effects": [ + { + "id": "minecraft:strength", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_swiftness": { "id": 15, - "mojangName": "LONG_SWIFTNESS" + "mojangName": "LONG_SWIFTNESS", + "potion_effects": [ + { + "id": "minecraft:speed", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_turtle_master": { "id": 21, - "mojangName": "LONG_TURTLE_MASTER" + "mojangName": "LONG_TURTLE_MASTER", + "potion_effects": [ + { + "id": "minecraft:slowness", + "duration": 800, + "amplifier": 3, + "visible": true, + "ambient": false, + "showIcon": true + }, + { + "id": "minecraft:resistance", + "duration": 800, + "amplifier": 2, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_water_breathing": { "id": 24, - "mojangName": "LONG_WATER_BREATHING" + "mojangName": "LONG_WATER_BREATHING", + "potion_effects": [ + { + "id": "minecraft:water_breathing", + "duration": 9600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:long_weakness": { "id": 39, - "mojangName": "LONG_WEAKNESS" + "mojangName": "LONG_WEAKNESS", + "potion_effects": [ + { + "id": "minecraft:weakness", + "duration": 4800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:luck": { "id": 40, - "mojangName": "LUCK" + "mojangName": "LUCK", + "potion_effects": [ + { + "id": "minecraft:luck", + "duration": 6000, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:mundane": { "id": 2, - "mojangName": "MUNDANE" + "mojangName": "MUNDANE", + "potion_effects": [] }, "minecraft:night_vision": { "id": 5, - "mojangName": "NIGHT_VISION" + "mojangName": "NIGHT_VISION", + "potion_effects": [ + { + "id": "minecraft:night_vision", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:poison": { "id": 29, - "mojangName": "POISON" + "mojangName": "POISON", + "potion_effects": [ + { + "id": "minecraft:poison", + "duration": 900, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:regeneration": { "id": 32, - "mojangName": "REGENERATION" + "mojangName": "REGENERATION", + "potion_effects": [ + { + "id": "minecraft:regeneration", + "duration": 900, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:slow_falling": { "id": 41, - "mojangName": "SLOW_FALLING" + "mojangName": "SLOW_FALLING", + "potion_effects": [ + { + "id": "minecraft:slow_falling", + "duration": 1800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:slowness": { "id": 17, - "mojangName": "SLOWNESS" + "mojangName": "SLOWNESS", + "potion_effects": [ + { + "id": "minecraft:slowness", + "duration": 1800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strength": { "id": 35, - "mojangName": "STRENGTH" + "mojangName": "STRENGTH", + "potion_effects": [ + { + "id": "minecraft:strength", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_harming": { "id": 28, - "mojangName": "STRONG_HARMING" + "mojangName": "STRONG_HARMING", + "potion_effects": [ + { + "id": "minecraft:instant_damage", + "duration": 1, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_healing": { "id": 26, - "mojangName": "STRONG_HEALING" + "mojangName": "STRONG_HEALING", + "potion_effects": [ + { + "id": "minecraft:instant_health", + "duration": 1, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_leaping": { "id": 11, - "mojangName": "STRONG_LEAPING" + "mojangName": "STRONG_LEAPING", + "potion_effects": [ + { + "id": "minecraft:jump_boost", + "duration": 1800, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_poison": { "id": 31, - "mojangName": "STRONG_POISON" + "mojangName": "STRONG_POISON", + "potion_effects": [ + { + "id": "minecraft:poison", + "duration": 432, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_regeneration": { "id": 34, - "mojangName": "STRONG_REGENERATION" + "mojangName": "STRONG_REGENERATION", + "potion_effects": [ + { + "id": "minecraft:regeneration", + "duration": 450, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_slowness": { "id": 19, - "mojangName": "STRONG_SLOWNESS" + "mojangName": "STRONG_SLOWNESS", + "potion_effects": [ + { + "id": "minecraft:slowness", + "duration": 400, + "amplifier": 3, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_strength": { "id": 37, - "mojangName": "STRONG_STRENGTH" + "mojangName": "STRONG_STRENGTH", + "potion_effects": [ + { + "id": "minecraft:strength", + "duration": 1800, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_swiftness": { "id": 16, - "mojangName": "STRONG_SWIFTNESS" + "mojangName": "STRONG_SWIFTNESS", + "potion_effects": [ + { + "id": "minecraft:speed", + "duration": 1800, + "amplifier": 1, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:strong_turtle_master": { "id": 22, - "mojangName": "STRONG_TURTLE_MASTER" + "mojangName": "STRONG_TURTLE_MASTER", + "potion_effects": [ + { + "id": "minecraft:slowness", + "duration": 400, + "amplifier": 5, + "visible": true, + "ambient": false, + "showIcon": true + }, + { + "id": "minecraft:resistance", + "duration": 400, + "amplifier": 3, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:swiftness": { "id": 14, - "mojangName": "SWIFTNESS" + "mojangName": "SWIFTNESS", + "potion_effects": [ + { + "id": "minecraft:speed", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:thick": { "id": 3, - "mojangName": "THICK" + "mojangName": "THICK", + "potion_effects": [] }, "minecraft:turtle_master": { "id": 20, - "mojangName": "TURTLE_MASTER" + "mojangName": "TURTLE_MASTER", + "potion_effects": [ + { + "id": "minecraft:slowness", + "duration": 400, + "amplifier": 3, + "visible": true, + "ambient": false, + "showIcon": true + }, + { + "id": "minecraft:resistance", + "duration": 400, + "amplifier": 2, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:water": { "id": 1, - "mojangName": "WATER" + "mojangName": "WATER", + "potion_effects": [] }, "minecraft:water_breathing": { "id": 23, - "mojangName": "WATER_BREATHING" + "mojangName": "WATER_BREATHING", + "potion_effects": [ + { + "id": "minecraft:water_breathing", + "duration": 3600, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] }, "minecraft:weakness": { "id": 38, - "mojangName": "WEAKNESS" + "mojangName": "WEAKNESS", + "potion_effects": [ + { + "id": "minecraft:weakness", + "duration": 1800, + "amplifier": 0, + "visible": true, + "ambient": false, + "showIcon": true + } + ] } } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 6241540..9900c1b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { tasks { register("packageVersion") { archiveBaseName.set("articdata") - archiveVersion.set("1.19-6e644906") + archiveVersion.set("1.19-d451cb01") destinationDirectory.set(layout.buildDirectory.dir("dist")) from(project.rootProject.rootDir) @@ -20,7 +20,7 @@ publishing { create("maven") { groupId = "de.articdive" artifactId = "articdata" - version = "1.19-6e644906" + version = "1.19-d451cb01" pom { name.set("ArticData")