diff --git a/src/main/resources/assets/taintedmagic/sounds.json b/src/main/resources/assets/taintedmagic/sounds.json index 46c500f..5bdaff9 100644 --- a/src/main/resources/assets/taintedmagic/sounds.json +++ b/src/main/resources/assets/taintedmagic/sounds.json @@ -1,5 +1,4 @@ { "shockwave": {"category": "master","sounds": [{"name": "shockwave","stream": false}]}, - "shard": {"category": "master","sounds": [{"name": "shard","stream": false}]}, - "burst": {"category": "master","sounds": [{"name": "burst","stream": false}]} + "shard": {"category": "master","sounds": [{"name": "shard","stream": false}]} } diff --git a/src/main/resources/assets/taintedmagic/sounds/burst.ogg b/src/main/resources/assets/taintedmagic/sounds/burst.ogg deleted file mode 100644 index 86aef35..0000000 Binary files a/src/main/resources/assets/taintedmagic/sounds/burst.ogg and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png index 420462d..f00350e 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_opaque.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png index c07be27..6d05b0f 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLeaves_transparent.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_knot.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_knot.png new file mode 100644 index 0000000..573f575 Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_knot.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_sideold.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_sideold.png deleted file mode 100644 index e55bd9d..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodLog_sideold.png and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png index 77fdd2d..cfa6acc 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png and b/src/main/resources/assets/taintedmagic/textures/blocks/BlockWarpwoodSapling.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png index ccb3a06..27d66d0 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial0.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial1.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial1.png index 114e7a2..15067b8 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial1.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial1.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png index 0a4cf6a..2b4cafd 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta index 3d7625c..48040b8 100644 --- a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta +++ b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial11.png.mcmeta @@ -1,6 +1,5 @@ { "animation": { - "frametime": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png deleted file mode 100644 index 505b0cc..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial12.png and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png index 23662bb..9a9846e 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial2.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png index 74b5646..abf0879 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial3.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial4.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial4.png index 032ad9d..7aa54c2 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial4.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial4.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png index 5d9bc78..d30d8de 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png.mcmeta index 3d7625c..48040b8 100644 --- a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png.mcmeta +++ b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial5.png.mcmeta @@ -1,6 +1,5 @@ { "animation": { - "frametime": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png index e42aeef..ee9f1eb 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial6.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png index e7792ed..abba8b3 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial7.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png index 3c96a9f..6ab29e0 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial8.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta index f6e326d..48040b8 100644 --- a/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta +++ b/src/main/resources/assets/taintedmagic/textures/items/ItemMaterial9.png.mcmeta @@ -1,4 +1,5 @@ { - "animation": { + "animation": + { } } diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressChestplate.png b/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressChestplate.png index b2c5daa..817b1b8 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressChestplate.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressChestplate.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressHelmet.png b/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressHelmet.png index 320cc8c..0874934 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressHelmet.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressHelmet.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressLeggings.png b/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressLeggings.png index 95c6c99..22c9dc0 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressLeggings.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemShadowFortressLeggings.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemVoidwalkerSash.png b/src/main/resources/assets/taintedmagic/textures/items/ItemVoidwalkerSash.png index 483e943..cdaac69 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemVoidwalkerSash.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemVoidwalkerSash.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png index c7bb71c..c01225a 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap1.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap2.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap2.png index 2ca6221..92379c9 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap2.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap2.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap3.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap3.png index affad8f..da13003 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap3.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemWandCap3.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWandRod1.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWandRod1.png index 4cac3a5..f0fd289 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/items/ItemWandRod1.png and b/src/main/resources/assets/taintedmagic/textures/items/ItemWandRod1.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemWarpFertilizer.png b/src/main/resources/assets/taintedmagic/textures/items/ItemWarpFertilizer.png new file mode 100644 index 0000000..0dccd3b Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemWarpFertilizer.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/misc/r_creation_1.png b/src/main/resources/assets/taintedmagic/textures/misc/r_creation_alt.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/misc/r_creation_1.png rename to src/main/resources/assets/taintedmagic/textures/misc/r_creation_alt.png diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_2.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_2.png deleted file mode 100644 index 7ae1c8f..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_2.png and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_3.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_3.png deleted file mode 100644 index ffa6399..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_3.png and /dev/null differ diff --git a/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_4.png b/src/main/resources/assets/taintedmagic/textures/misc/tab_tm_alt.png similarity index 100% rename from src/main/resources/assets/taintedmagic/textures/misc/tab_tm_4.png rename to src/main/resources/assets/taintedmagic/textures/misc/tab_tm_alt.png diff --git a/src/main/resources/assets/taintedmagic/textures/models/ModelShadowFortressArmor.png b/src/main/resources/assets/taintedmagic/textures/models/ModelShadowFortressArmor.png index 3c5c9c2..40e244a 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/models/ModelShadowFortressArmor.png and b/src/main/resources/assets/taintedmagic/textures/models/ModelShadowFortressArmor.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CLOTH.png b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CLOTH.png index 44621fc..557c70b 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CLOTH.png and b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CLOTH.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png index f6a49ee..4e51495 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png and b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png differ diff --git a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_SHADOWMETAL.png b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_SHADOWMETAL.png index 853094e..3f58447 100644 Binary files a/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_SHADOWMETAL.png and b/src/main/resources/assets/taintedmagic/textures/models/ModelWAND_CAP_SHADOWMETAL.png differ