diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java index 3306fcb5b..485416ac7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -6,7 +6,8 @@ import de.ellpeck.actuallyadditions.common.items.useables.AllInOneTool; import de.ellpeck.actuallyadditions.common.items.useables.ManualItem; import de.ellpeck.actuallyadditions.common.materials.ArmorMaterials; import de.ellpeck.actuallyadditions.common.materials.ToolMaterials; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemTier; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -53,8 +54,152 @@ public final class ActuallyItems { public static final RegistryObject EMERADIC_CRYSTAL = ITEMS.register("emeradic_crystal", basicItem()); public static final RegistryObject ENORI_CRYSTAL = ITEMS.register("enori_crystal", basicItem()); - // Shards - + public static final RegistryObject RED_CRYSTAL_SHARD = ITEMS.register("red_crystal_shard", basicItem()); + public static final RegistryObject BLUE_CRYSTAL_SHARD = ITEMS.register("blue_crystal_shard", basicItem()); + public static final RegistryObject LIGHT_BLUE_CRYSTAL_SHARD = ITEMS.register("light_blue_crystal_shard", basicItem()); + public static final RegistryObject BLACK_CRYSTAL_SHARD = ITEMS.register("black_crystal_shard", basicItem()); + public static final RegistryObject GREEN_CRYSTAL_SHARD = ITEMS.register("green_crystal_shard", basicItem()); + public static final RegistryObject WHITE_CRYSTAL_SHARD = ITEMS.register("white_crystal_shard", basicItem()); + public static final RegistryObject ENGINEERS_GOGGLES = ITEMS.register("engineers_goggles", basicItem()); + public static final RegistryObject ENGINEERS_GOGGLES_INFRARED = ITEMS.register("engineers_goggles_infrared", basicItem()); + public static final RegistryObject LASER_RELAY_MODIFIER_RANGE = ITEMS.register("laser_relay_modifier_range", basicItem()); + public static final RegistryObject LASER_RELAY_MODIFIER_INVISIBILITY = ITEMS.register("laser_relay_modifier_invisibility", basicItem()); + public static final RegistryObject HANDHELD_FILLER = ITEMS.register("handheld_filler", basicItem()); + public static final RegistryObject TRAVELERS_SACK = ITEMS.register("travelers_sack", basicItem()); + public static final RegistryObject VOID_SACK = ITEMS.register("void_sack", basicItem()); + public static final RegistryObject WORM = ITEMS.register("worm", basicItem()); + public static final RegistryObject PLAYER_PROBE = ITEMS.register("player_probe", basicItem()); + public static final RegistryObject ITEM_FILTER = ITEMS.register("item_filter", basicItem()); + public static final RegistryObject BOWL_OF_WATER = ITEMS.register("bowl_of_water", basicItem()); + public static final RegistryObject PAPER_CONE = ITEMS.register("paper_cone", basicItem()); + public static final RegistryObject DOUGH = ITEMS.register("dough", basicItem()); + public static final RegistryObject RING = ITEMS.register("ring", basicItem()); + public static final RegistryObject BASIC_COIL = ITEMS.register("basic_coil", basicItem()); + public static final RegistryObject ADVANCED_COIL = ITEMS.register("advanced_coil", basicItem()); + public static final RegistryObject RICE_DOUGH = ITEMS.register("rice_dough", basicItem()); + public static final RegistryObject TINY_COAL = ITEMS.register("tiny_coal", basicItem()); + public static final RegistryObject TINY_CHARCOAL = ITEMS.register("tiny_charcoal", basicItem()); + public static final RegistryObject RICE_SLIMEBALL = ITEMS.register("rice_slimeball", basicItem()); + public static final RegistryObject CANOLA = ITEMS.register("canola", basicItem()); + public static final RegistryObject EMPTY_CUP = ITEMS.register("empty_cup", basicItem()); + public static final RegistryObject BATS_WING = ITEMS.register("bats_wing", basicItem()); + public static final RegistryObject DRILL_CORE = ITEMS.register("drill_core", basicItem()); + public static final RegistryObject LENS = ITEMS.register("lens", basicItem()); + public static final RegistryObject ENDER_STAR = ITEMS.register("ender_star", basicItem()); + public static final RegistryObject CRYSTALLIZED_CANOLA_SEED = ITEMS.register("crystallized_canola_seed", basicItem()); + public static final RegistryObject EMPOWERED_CANOLA_SEED = ITEMS.register("empowered_canola_seed", basicItem()); + public static final RegistryObject LENS_OF_COLOR = ITEMS.register("lens_of_color", basicItem()); + public static final RegistryObject LENS_OF_DETONATION = ITEMS.register("lens_of_detonation", basicItem()); + public static final RegistryObject LENS_OF_CERTAIN_DEATH = ITEMS.register("lens_of_certain_death", basicItem()); + public static final RegistryObject LENS_OF_THE_KILLER = ITEMS.register("lens_of_the_killer", basicItem()); + public static final RegistryObject LENS_OF_DISENCHANTING = ITEMS.register("lens_of_disenchanting", basicItem()); + public static final RegistryObject LENS_OF_THE_MINER = ITEMS.register("lens_of_the_miner", basicItem()); + public static final RegistryObject LASER_WRENCH = ITEMS.register("laser_wrench", basicItem()); + public static final RegistryObject TELEPORT_STAFF = ITEMS.register("teleport_staff", basicItem()); + public static final RegistryObject WINGS_OF_THE_BATS = ITEMS.register("wings_of_the_bats", basicItem()); + public static final RegistryObject SINGLE_BATTERY = ITEMS.register("single_battery", basicItem()); + public static final RegistryObject DOUBLE_BATTERY = ITEMS.register("double_battery", basicItem()); + public static final RegistryObject TRIPLE_BATTERY = ITEMS.register("triple_battery", basicItem()); + public static final RegistryObject QUADRUPLE_BATTERY = ITEMS.register("quadruple_battery", basicItem()); + public static final RegistryObject QUINTUPLE_BATTERY = ITEMS.register("quintuple_battery", basicItem()); + public static final RegistryObject DRILL_BLACK = ITEMS.register("drill_black", basicItem()); + public static final RegistryObject DRILL_BLUE = ITEMS.register("drill_blue", basicItem()); + public static final RegistryObject DRILL_BROWN = ITEMS.register("drill_brown", basicItem()); + public static final RegistryObject DRILL_CYAN = ITEMS.register("drill_cyan", basicItem()); + public static final RegistryObject DRILL_GRAY = ITEMS.register("drill_gray", basicItem()); + public static final RegistryObject DRILL_GREEN = ITEMS.register("drill_green", basicItem()); + public static final RegistryObject DRILL_LIGHT_BLUE = ITEMS.register("drill_light_blue", basicItem()); + public static final RegistryObject DRILL_LIGHT_GRAY = ITEMS.register("drill_light_gray", basicItem()); + public static final RegistryObject DRILL_LIME = ITEMS.register("drill_lime", basicItem()); + public static final RegistryObject DRILL_MAGENTA = ITEMS.register("drill_magenta", basicItem()); + public static final RegistryObject DRILL_ORANGE = ITEMS.register("drill_orange", basicItem()); + public static final RegistryObject DRILL_PINK = ITEMS.register("drill_pink", basicItem()); + public static final RegistryObject DRILL_PURPLE = ITEMS.register("drill_purple", basicItem()); + public static final RegistryObject DRILL_RED = ITEMS.register("drill_red", basicItem()); + public static final RegistryObject DRILL_WHITE = ITEMS.register("drill_white", basicItem()); + public static final RegistryObject DRILL_YELLOW = ITEMS.register("drill_yellow", basicItem()); + public static final RegistryObject DRILL_SPEED_AUGMENT_I = ITEMS.register("drill_speed_augment_i", basicItem()); + public static final RegistryObject DRILL_SPEED_AUGMENT_II = ITEMS.register("drill_speed_augment_ii", basicItem()); + public static final RegistryObject DRILL_SPEED_AUGMENT_III = ITEMS.register("drill_speed_augment_iii", basicItem()); + public static final RegistryObject DRILL_SILK_TOUCH_AUGMENT = ITEMS.register("drill_silk_touch_augment", basicItem()); + public static final RegistryObject DRILL_FORTUNE_AUGMENT_I = ITEMS.register("drill_fortune_augment_i", basicItem()); + public static final RegistryObject DRILL_FORTUNE_AUGMENT_II = ITEMS.register("drill_fortune_augment_ii", basicItem()); + public static final RegistryObject DRILL_MINING_AUGMENT_I = ITEMS.register("drill_mining_augment_i", basicItem()); + public static final RegistryObject DRILL_MINING_AUGMENT_II = ITEMS.register("drill_mining_augment_ii", basicItem()); + public static final RegistryObject DRILL_BLOCK_PLACING_AUGMENT = ITEMS.register("drill_block_placing_augment", basicItem()); + public static final RegistryObject FERTILIZER = ITEMS.register("fertilizer", basicItem()); + public static final RegistryObject CUP_WITH_COFFEE = ITEMS.register("cup_with_coffee", basicItem()); + public static final RegistryObject PHANTOM_CONNECTOR = ITEMS.register("phantom_connector", basicItem()); + public static final RegistryObject RESONANT_RICE = ITEMS.register("resonant_rice", basicItem()); + public static final RegistryObject FOOD_CHEESE = ITEMS.register("food_cheese", basicItem()); + public static final RegistryObject FOOD_PUMPKIN_STEW = ITEMS.register("food_pumpkin_stew", basicItem()); + public static final RegistryObject FOOD_CARROT_JUICE = ITEMS.register("food_carrot_juice", basicItem()); + public static final RegistryObject FOOD_FISH_N_CHIPS = ITEMS.register("food_fish_n_chips", basicItem()); + public static final RegistryObject FOOD_FRENCH_FRIES = ITEMS.register("food_french_fries", basicItem()); + public static final RegistryObject FOOD_FRENCH_FRY = ITEMS.register("food_french_fry", basicItem()); + public static final RegistryObject FOOD_SPAGHETTI = ITEMS.register("food_spaghetti", basicItem()); + public static final RegistryObject FOOD_NOODLE = ITEMS.register("food_noodle", basicItem()); + public static final RegistryObject FOOD_CHOCOLATE_CAKE = ITEMS.register("food_chocolate_cake", basicItem()); + public static final RegistryObject FOOD_CHOCOLATE = ITEMS.register("food_chocolate", basicItem()); + public static final RegistryObject FOOD_TOAST = ITEMS.register("food_toast", basicItem()); + public static final RegistryObject FOOD_SUBMARINE_SANDWICH = ITEMS.register("food_submarine_sandwich", basicItem()); + public static final RegistryObject FOOD_BIG_COOKIE = ITEMS.register("food_big_cookie", basicItem()); + public static final RegistryObject FOOD_HAMBURGER = ITEMS.register("food_hamburger", basicItem()); + public static final RegistryObject FOOD_PIZZA = ITEMS.register("food_pizza", basicItem()); + public static final RegistryObject FOOD_BAGUETTE = ITEMS.register("food_baguette", basicItem()); + public static final RegistryObject FOOD_RICE = ITEMS.register("food_rice", basicItem()); + public static final RegistryObject FOOD_RICE_BREAD = ITEMS.register("food_rice_bread", basicItem()); + public static final RegistryObject FOOD_DOUGHNUT = ITEMS.register("food_doughnut", basicItem()); + public static final RegistryObject FOOD_TOAST_O_CHOCOLATE = ITEMS.register("food_toast_o_chocolate", basicItem()); + public static final RegistryObject FOOD_BACON = ITEMS.register("food_bacon", basicItem()); + public static final RegistryObject CU_BA_RA_JAM = ITEMS.register("cu_ba_ra_jam", basicItem()); + public static final RegistryObject GRA_KI_BA_JAM = ITEMS.register("gra_ki_ba_jam", basicItem()); + public static final RegistryObject PL_AP_LE_JAM = ITEMS.register("pl_ap_le_jam", basicItem()); + public static final RegistryObject CH_AP_CI_JAM = ITEMS.register("ch_ap_ci_jam", basicItem()); + public static final RegistryObject HO_ME_KI_JAM = ITEMS.register("ho_me_ki_jam", basicItem()); + public static final RegistryObject PI_CO_JAM = ITEMS.register("pi_co_jam", basicItem()); + public static final RegistryObject HO_ME_CO_JAM = ITEMS.register("ho_me_co_jam", basicItem()); + public static final RegistryObject KNIFE = ITEMS.register("knife", basicItem()); + public static final RegistryObject CRAFTING_TABLE_ON_A_STICK = ITEMS.register("crafting_table_on_a_stick", basicItem()); + public static final RegistryObject CRUSHED_IRON = ITEMS.register("crushed_iron", basicItem()); + public static final RegistryObject CRUSHED_GOLD = ITEMS.register("crushed_gold", basicItem()); + public static final RegistryObject CRUSHED_DIAMOND = ITEMS.register("crushed_diamond", basicItem()); + public static final RegistryObject CRUSHED_EMERALD = ITEMS.register("crushed_emerald", basicItem()); + public static final RegistryObject CRUSHED_LAPIS = ITEMS.register("crushed_lapis", basicItem()); + public static final RegistryObject CRUSHED_QUARTZ = ITEMS.register("crushed_quartz", basicItem()); + public static final RegistryObject CRUSHED_COAL = ITEMS.register("crushed_coal", basicItem()); + public static final RegistryObject CRUSHED_BLACK_QUARTZ = ITEMS.register("crushed_black_quartz", basicItem()); + public static final RegistryObject SOLIDIFIED_EXPERIENCE = ITEMS.register("solidified_experience", basicItem()); + public static final RegistryObject LEAF_BLOWER = ITEMS.register("leaf_blower", basicItem()); + public static final RegistryObject ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", basicItem()); + public static final RegistryObject RING_OF_GROWTH = ITEMS.register("ring_of_growth", basicItem()); + public static final RegistryObject RING_OF_MAGNETIZING = ITEMS.register("ring_of_magnetizing", basicItem()); + public static final RegistryObject RING_OF_SPEED = ITEMS.register("ring_of_speed", basicItem()); + public static final RegistryObject RING_OF_HASTE = ITEMS.register("ring_of_haste", basicItem()); + public static final RegistryObject RING_OF_STRENGTH = ITEMS.register("ring_of_strength", basicItem()); + public static final RegistryObject RING_OF_JUMP_BOOST = ITEMS.register("ring_of_jump_boost", basicItem()); + public static final RegistryObject RING_OF_REGENERATION = ITEMS.register("ring_of_regeneration", basicItem()); + public static final RegistryObject RING_OF_RESISTANCE = ITEMS.register("ring_of_resistance", basicItem()); + public static final RegistryObject RING_OF_FIRE_RESISTANCE = ITEMS.register("ring_of_fire_resistance", basicItem()); + public static final RegistryObject RING_OF_WATER_BREATHING = ITEMS.register("ring_of_water_breathing", basicItem()); + public static final RegistryObject RING_OF_INVISIBILITY = ITEMS.register("ring_of_invisibility", basicItem()); + public static final RegistryObject RING_OF_NIGHT_VISION = ITEMS.register("ring_of_night_vision", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_SPEED = ITEMS.register("advanced_ring_of_speed", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_HASTE = ITEMS.register("advanced_ring_of_haste", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_STRENGTH = ITEMS.register("advanced_ring_of_strength", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_JUMP_BOOST = ITEMS.register("advanced_ring_of_jump_boost", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_REGENERATION = ITEMS.register("advanced_ring_of_regeneration", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_RESISTANCE = ITEMS.register("advanced_ring_of_resistance", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_FIRE_RESISTANCE = ITEMS.register("advanced_ring_of_fire_resistance", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_WATER_BREATHING = ITEMS.register("advanced_ring_of_water_breathing", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_INVISIBILITY = ITEMS.register("advanced_ring_of_invisibility", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_NIGHT_VISION = ITEMS.register("advanced_ring_of_night_vision", basicItem()); + public static final RegistryObject FUR_BALL = ITEMS.register("fur_ball", basicItem()); + public static final RegistryObject COFFEE_BEANS = ITEMS.register("coffee_beans", basicItem()); + public static final RegistryObject RICE_SEEDS = ITEMS.register("rice_seeds", basicItem()); + public static final RegistryObject CANOLA_SEEDS = ITEMS.register("canola_seeds", basicItem()); + public static final RegistryObject FLAX_SEEDS = ITEMS.register("flax_seeds", basicItem()); + public static final RegistryObject COFFEE_SEEDS = ITEMS.register("coffee_seeds", basicItem()); public static final RegistryObject BOOKLET = ITEMS.register("booklet", ManualItem::new); diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_coil_advanced.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_coil.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_coil_advanced.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_coil.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_leaf_blower_advanced.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_leaf_blower.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_leaf_blower_advanced.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_leaf_blower.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_potion_ring.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_fire_resistance.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_potion_ring.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_fire_resistance.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_spawner_changer.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_haste.png similarity index 70% rename from src/main/resources/assets/actuallyadditions/textures/item/item_spawner_changer.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_haste.png index 6cf4f46b9..85dcdcaec 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_spawner_changer.png and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_haste.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_water_removal_ring.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_invisibility.png similarity index 69% rename from src/main/resources/assets/actuallyadditions/textures/item/item_water_removal_ring.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_invisibility.png index 34f1722dc..85dcdcaec 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_water_removal_ring.png and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_invisibility.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_black_dye.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_jump_boost.png similarity index 68% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_black_dye.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_jump_boost.png index c4b5d1f99..85dcdcaec 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_black_dye.png and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_jump_boost.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_chest_to_crate_upgrade.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_night_vision.png similarity index 68% rename from src/main/resources/assets/actuallyadditions/textures/item/item_chest_to_crate_upgrade.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_night_vision.png index 982e416b2..85dcdcaec 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_chest_to_crate_upgrade.png and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_night_vision.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_regeneration.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_regeneration.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_regeneration.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_resistance.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_resistance.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_resistance.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_potion_ring_advanced.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_speed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_potion_ring_advanced.png rename to src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_speed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_strength.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_strength.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_strength.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_water_breathing.png b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_water_breathing.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/advanced_ring_of_water_breathing.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_bat_wing.png b/src/main/resources/assets/actuallyadditions/textures/item/bats_wing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_bat_wing.png rename to src/main/resources/assets/actuallyadditions/textures/item/bats_wing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png new file mode 100644 index 000000000..8c6a496b5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/black_crystal_shard.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/blue_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/blue_crystal_shard.png new file mode 100644 index 000000000..8c6a496b5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/blue_crystal_shard.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_water_bowl.png b/src/main/resources/assets/actuallyadditions/textures/item/bowl_of_water.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_water_bowl.png rename to src/main/resources/assets/actuallyadditions/textures/item/bowl_of_water.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_canola.png b/src/main/resources/assets/actuallyadditions/textures/item/canola.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_canola.png rename to src/main/resources/assets/actuallyadditions/textures/item/canola.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_canola_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/canola_seed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_canola_seed.png rename to src/main/resources/assets/actuallyadditions/textures/item/canola_seed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_coffee_beans.png b/src/main/resources/assets/actuallyadditions/textures/item/coffee_beans.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_coffee_beans.png rename to src/main/resources/assets/actuallyadditions/textures/item/coffee_beans.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_coffee_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/coffee_seed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_coffee_seed.png rename to src/main/resources/assets/actuallyadditions/textures/item/coffee_seed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_coil.png b/src/main/resources/assets/actuallyadditions/textures/item/coil.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_coil.png rename to src/main/resources/assets/actuallyadditions/textures/item/coil.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crafter_on_a_stick.png b/src/main/resources/assets/actuallyadditions/textures/item/crafting_table_on_a_stick.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crafter_on_a_stick.png rename to src/main/resources/assets/actuallyadditions/textures/item/crafting_table_on_a_stick.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_dust.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_black_quartz.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_dust.png rename to src/main/resources/assets/actuallyadditions/textures/item/crushed_black_quartz.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_coal.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_coal.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_coal.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_diamond.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_diamond.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_diamond.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_emerals.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_emerals.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_emerals.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_gold.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_gold.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_gold.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_iron.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_iron.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_iron.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_lapis.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_lapis.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_lapis.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/crushed_quartz.png b/src/main/resources/assets/actuallyadditions/textures/item/crushed_quartz.png new file mode 100644 index 000000000..460eb1d7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/crushed_quartz.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_crystallized_canola_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/crystallized_canola_seed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_crystallized_canola_seed.png rename to src/main/resources/assets/actuallyadditions/textures/item/crystallized_canola_seed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_coffee.png b/src/main/resources/assets/actuallyadditions/textures/item/cup_with_coffee.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_coffee.png rename to src/main/resources/assets/actuallyadditions/textures/item/cup_with_coffee.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_black.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_black.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/diamatine_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_battery_double.png b/src/main/resources/assets/actuallyadditions/textures/item/double_battery.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_battery_double.png rename to src/main/resources/assets/actuallyadditions/textures/item/double_battery.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_dough.png b/src/main/resources/assets/actuallyadditions/textures/item/dough.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_dough.png rename to src/main/resources/assets/actuallyadditions/textures/item/dough.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_black.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_black.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_black.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_black.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_block_placing.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_block_placing_augment.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_block_placing.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_block_placing_augment.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_blue.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_blue.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_brown.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_brown.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_brown.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_brown.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_drill_core.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_core.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_drill_core.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_core.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_cyan.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_cyan.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_cyan.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_cyan.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_fortune.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_i.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_fortune.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_i.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_fortune_ii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_ii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_fortune_ii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_fortune_augment_ii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_gray.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_gray.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_green.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_green.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_green.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_green.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_light_blue.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_light_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_light_blue.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_light_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_light_gray.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_light_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_light_gray.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_light_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_lime.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_lime.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_lime.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_lime.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_magenta.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_magenta.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_magenta.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_magenta.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_three_by_three.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_i.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_three_by_three.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_i.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_five_by_five.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_ii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_five_by_five.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_mining_augment_ii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_orange.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_orange.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_orange.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_orange.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_pink.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_pink.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_pink.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_pink.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_purple.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_purple.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_purple.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_purple.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_red.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_red.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_red.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_red.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_silk_touch.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_silk_touch_augment.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_silk_touch.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_silk_touch_augment.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_speed.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_i.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_speed.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_i.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_speed_ii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_ii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_speed_ii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_ii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_speed_iii.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_iii.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_upgrade_speed_iii.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_speed_augment_iii.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_white.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_white.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_white.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_white.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_drill_yellow.png b/src/main/resources/assets/actuallyadditions/textures/item/drill_yellow.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_drill_yellow.png rename to src/main/resources/assets/actuallyadditions/textures/item/drill_yellow.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_blue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_blue.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/emeradic_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_empowered_canola_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/empowered_canola_seed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_empowered_canola_seed.png rename to src/main/resources/assets/actuallyadditions/textures/item/empowered_canola_seed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_cup.png b/src/main/resources/assets/actuallyadditions/textures/item/empty_cup.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_cup.png rename to src/main/resources/assets/actuallyadditions/textures/item/empty_cup.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_ender_star.png b/src/main/resources/assets/actuallyadditions/textures/item/ender_star.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_ender_star.png rename to src/main/resources/assets/actuallyadditions/textures/item/ender_star.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_engineer_goggles.png b/src/main/resources/assets/actuallyadditions/textures/item/engineer_goggles.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_engineer_goggles.png rename to src/main/resources/assets/actuallyadditions/textures/item/engineer_goggles.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_engineer_goggles_advanced.png b/src/main/resources/assets/actuallyadditions/textures/item/engineer_goggles_advanced.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_engineer_goggles_advanced.png rename to src/main/resources/assets/actuallyadditions/textures/item/engineer_goggles_advanced.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_green.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/enori_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_green.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/enori_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_fertilizer.png b/src/main/resources/assets/actuallyadditions/textures/item/fertilizer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_fertilizer.png rename to src/main/resources/assets/actuallyadditions/textures/item/fertilizer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_filter.png b/src/main/resources/assets/actuallyadditions/textures/item/filter.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_filter.png rename to src/main/resources/assets/actuallyadditions/textures/item/filter.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_flax_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/flax_seed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_flax_seed.png rename to src/main/resources/assets/actuallyadditions/textures/item/flax_seed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_bacon.png b/src/main/resources/assets/actuallyadditions/textures/item/food_bacon.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_bacon.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_bacon.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_baguette.png b/src/main/resources/assets/actuallyadditions/textures/item/food_baguette.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_baguette.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_baguette.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_big_cookie.png b/src/main/resources/assets/actuallyadditions/textures/item/food_big_cookie.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_big_cookie.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_big_cookie.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_carrot_juice.png b/src/main/resources/assets/actuallyadditions/textures/item/food_carrot_juice.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_carrot_juice.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_carrot_juice.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_cheese.png b/src/main/resources/assets/actuallyadditions/textures/item/food_cheese.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_cheese.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_cheese.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_chocolate.png b/src/main/resources/assets/actuallyadditions/textures/item/food_chocolate.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_chocolate.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_chocolate.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_chocolate_cake.png b/src/main/resources/assets/actuallyadditions/textures/item/food_chocolate_cake.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_chocolate_cake.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_chocolate_cake.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_doughnut.png b/src/main/resources/assets/actuallyadditions/textures/item/food_doughnut.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_doughnut.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_doughnut.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_fish_n_chips.png b/src/main/resources/assets/actuallyadditions/textures/item/food_fish_n_chips.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_fish_n_chips.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_fish_n_chips.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_french_fries.png b/src/main/resources/assets/actuallyadditions/textures/item/food_french_fries.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_french_fries.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_french_fries.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_french_fry.png b/src/main/resources/assets/actuallyadditions/textures/item/food_french_fry.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_french_fry.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_french_fry.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_hamburger.png b/src/main/resources/assets/actuallyadditions/textures/item/food_hamburger.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_hamburger.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_hamburger.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_noodle.png b/src/main/resources/assets/actuallyadditions/textures/item/food_noodle.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_noodle.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_noodle.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_pizza.png b/src/main/resources/assets/actuallyadditions/textures/item/food_pizza.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_pizza.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_pizza.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_pumpkin_stew.png b/src/main/resources/assets/actuallyadditions/textures/item/food_pumpkin_stew.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_pumpkin_stew.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_pumpkin_stew.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_rice.png b/src/main/resources/assets/actuallyadditions/textures/item/food_rice.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_rice.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_rice.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_rice_bread.png b/src/main/resources/assets/actuallyadditions/textures/item/food_rice_bread.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_rice_bread.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_rice_bread.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_spaghetti.png b/src/main/resources/assets/actuallyadditions/textures/item/food_spaghetti.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_spaghetti.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_spaghetti.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_submarine_sandwich.png b/src/main/resources/assets/actuallyadditions/textures/item/food_submarine_sandwich.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_submarine_sandwich.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_submarine_sandwich.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_toast.png b/src/main/resources/assets/actuallyadditions/textures/item/food_toast.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_toast.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_toast.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_food_chocolate_toast.png b/src/main/resources/assets/actuallyadditions/textures/item/food_toast_o_chocolate.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_food_chocolate_toast.png rename to src/main/resources/assets/actuallyadditions/textures/item/food_toast_o_chocolate.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_hairy_ball.png b/src/main/resources/assets/actuallyadditions/textures/item/fur_ball.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_hairy_ball.png rename to src/main/resources/assets/actuallyadditions/textures/item/fur_ball.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png new file mode 100644 index 000000000..8c6a496b5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/green_crystal_shard.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_filling_wand.png b/src/main/resources/assets/actuallyadditions/textures/item/handheld_filler.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_filling_wand.png rename to src/main/resources/assets/actuallyadditions/textures/item/handheld_filler.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png deleted file mode 100644 index 56f2ff5fb..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crate_keeper.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crate_keeper.png deleted file mode 100644 index f7a6237d0..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crate_keeper.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_black.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_black.png deleted file mode 100644 index 8205b80e0..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_black.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_blue.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_blue.png deleted file mode 100644 index 98e5ca212..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_blue.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_green.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_green.png deleted file mode 100644 index 66db525e7..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_green.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_light_blue.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_light_blue.png deleted file mode 100644 index 01470fe41..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_light_blue.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_red.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_red.png deleted file mode 100644 index fc4653875..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_red.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_white.png b/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_white.png deleted file mode 100644 index 2d5a5d457..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_white.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_medium_to_large_crate_upgrade.png b/src/main/resources/assets/actuallyadditions/textures/item/item_medium_to_large_crate_upgrade.png deleted file mode 100644 index 5de641d0b..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_medium_to_large_crate_upgrade.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_biocoal.png b/src/main/resources/assets/actuallyadditions/textures/item/item_misc_biocoal.png deleted file mode 100644 index abb277cbc..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_biocoal.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_biomass.png b/src/main/resources/assets/actuallyadditions/textures/item/item_misc_biomass.png deleted file mode 100644 index a54c1704e..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_biomass.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_mashed_food.png b/src/main/resources/assets/actuallyadditions/textures/item/item_misc_mashed_food.png deleted file mode 100644 index e4cdcc881..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_mashed_food.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_spawner_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/item_misc_spawner_shard.png deleted file mode 100644 index 56964bef7..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_spawner_shard.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_small_to_medium_crate_upgrade.png b/src/main/resources/assets/actuallyadditions/textures/item/item_small_to_medium_crate_upgrade.png deleted file mode 100644 index 1f6a9f59b..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_small_to_medium_crate_upgrade.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_jam.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_ch_ap_ci.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_jam.png rename to src/main/resources/assets/actuallyadditions/textures/item/jam_ch_ap_ci.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_jam_overlay.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_cu_ba_ra.png similarity index 60% rename from src/main/resources/assets/actuallyadditions/textures/item/item_jam_overlay.png rename to src/main/resources/assets/actuallyadditions/textures/item/jam_cu_ba_ra.png index 7708802a2..5cca1441d 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/item/item_jam_overlay.png and b/src/main/resources/assets/actuallyadditions/textures/item/jam_cu_ba_ra.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_gra_ki_ba.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_gra_ki_ba.png new file mode 100644 index 000000000..5cca1441d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/jam_gra_ki_ba.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_ho_me_co.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_ho_me_co.png new file mode 100644 index 000000000..5cca1441d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/jam_ho_me_co.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_ho_me_ki.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_ho_me_ki.png new file mode 100644 index 000000000..5cca1441d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/jam_ho_me_ki.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_pi_co.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_pi_co.png new file mode 100644 index 000000000..5cca1441d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/jam_pi_co.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/jam_pl_ap_le.png b/src/main/resources/assets/actuallyadditions/textures/item/jam_pl_ap_le.png new file mode 100644 index 000000000..5cca1441d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/jam_pl_ap_le.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/knife.png b/src/main/resources/assets/actuallyadditions/textures/item/knife.png new file mode 100644 index 000000000..c51cdd9ab Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/knife.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_laser_upgrade_invisibility.png b/src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_invisibility.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_laser_upgrade_invisibility.png rename to src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_invisibility.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_laser_upgrade_range.png b/src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_range.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_laser_upgrade_range.png rename to src/main/resources/assets/actuallyadditions/textures/item/laser_relay_modifier_range.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_laser_wrench.png b/src/main/resources/assets/actuallyadditions/textures/item/laser_wrench.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_laser_wrench.png rename to src/main/resources/assets/actuallyadditions/textures/item/laser_wrench.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_leaf_blower.png b/src/main/resources/assets/actuallyadditions/textures/item/leaf_blower.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_leaf_blower.png rename to src/main/resources/assets/actuallyadditions/textures/item/leaf_blower.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_damage_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_certain_death.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_damage_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_certain_death.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_color_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_color.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_color_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_color.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_color_lens.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_color.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_color_lens.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_color.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_explosion_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_detonation.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_explosion_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_detonation.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_disenchanting_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_disenchanting.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_disenchanting_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_disenchanting.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_more_damage_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_the_killer.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_more_damage_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_the_killer.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_mining_lens.png b/src/main/resources/assets/actuallyadditions/textures/item/lens_of_the_miner.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_mining_lens.png rename to src/main/resources/assets/actuallyadditions/textures/item/lens_of_the_miner.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png new file mode 100644 index 000000000..8c6a496b5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/light_blue_crystal_shard.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_light_blue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/palis_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_light_blue.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/palis_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_paper_cone.png b/src/main/resources/assets/actuallyadditions/textures/item/paper_cone.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_paper_cone.png rename to src/main/resources/assets/actuallyadditions/textures/item/paper_cone.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_phantom_connector.png b/src/main/resources/assets/actuallyadditions/textures/item/phantom_connector.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_phantom_connector.png rename to src/main/resources/assets/actuallyadditions/textures/item/phantom_connector.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_player_probe.png b/src/main/resources/assets/actuallyadditions/textures/item/player_probe.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_player_probe.png rename to src/main/resources/assets/actuallyadditions/textures/item/player_probe.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_battery_quadruple.png b/src/main/resources/assets/actuallyadditions/textures/item/quadruple_battery.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_battery_quadruple.png rename to src/main/resources/assets/actuallyadditions/textures/item/quadruple_battery.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_battery_quintuple.png b/src/main/resources/assets/actuallyadditions/textures/item/quintuple_battery.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_battery_quintuple.png rename to src/main/resources/assets/actuallyadditions/textures/item/quintuple_battery.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png new file mode 100644 index 000000000..8c6a496b5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/red_crystal_shard.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_resonant_rice.png b/src/main/resources/assets/actuallyadditions/textures/item/resonant_rice.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_resonant_rice.png rename to src/main/resources/assets/actuallyadditions/textures/item/resonant_rice.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_resonant_rice.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/resonant_rice.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_resonant_rice.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/resonant_rice.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_red.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_red.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/restonia_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_rice_dough.png b/src/main/resources/assets/actuallyadditions/textures/item/rice_dough.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_rice_dough.png rename to src/main/resources/assets/actuallyadditions/textures/item/rice_dough.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_rice_seed.png b/src/main/resources/assets/actuallyadditions/textures/item/rice_seed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_rice_seed.png rename to src/main/resources/assets/actuallyadditions/textures/item/rice_seed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_rice_slime.png b/src/main/resources/assets/actuallyadditions/textures/item/rice_slimeball.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_rice_slime.png rename to src/main/resources/assets/actuallyadditions/textures/item/rice_slimeball.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_ring.png b/src/main/resources/assets/actuallyadditions/textures/item/ring.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_ring.png rename to src/main/resources/assets/actuallyadditions/textures/item/ring.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_growth_ring.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_growth_ring.png rename to src/main/resources/assets/actuallyadditions/textures/item/ring_of_.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_fire_resistance.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_fire_resistance.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_fire_resistance.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_haste.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_haste.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_haste.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_invisibility.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_invisibility.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_invisibility.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_jump_boost.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_jump_boost.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_jump_boost.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_suction_ring.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_magnetizing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_suction_ring.png rename to src/main/resources/assets/actuallyadditions/textures/item/ring_of_magnetizing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_night_vision.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_night_vision.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_night_vision.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_regeneration.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_regeneration.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_regeneration.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_resistance.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_resistance.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_resistance.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_speed.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_speed.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_speed.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_strength.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_strength.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_strength.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/ring_of_water_breathing.png b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_water_breathing.png new file mode 100644 index 000000000..85dcdcaec Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/ring_of_water_breathing.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_battery.png b/src/main/resources/assets/actuallyadditions/textures/item/single_battery.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_battery.png rename to src/main/resources/assets/actuallyadditions/textures/item/single_battery.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_solidified_experience.png b/src/main/resources/assets/actuallyadditions/textures/item/solidified_experience.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_solidified_experience.png rename to src/main/resources/assets/actuallyadditions/textures/item/solidified_experience.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_tele_staff.png b/src/main/resources/assets/actuallyadditions/textures/item/teleport_staff.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_tele_staff.png rename to src/main/resources/assets/actuallyadditions/textures/item/teleport_staff.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_tiny_charcoal.png b/src/main/resources/assets/actuallyadditions/textures/item/tiny_charcoal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_tiny_charcoal.png rename to src/main/resources/assets/actuallyadditions/textures/item/tiny_charcoal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_misc_tiny_coal.png b/src/main/resources/assets/actuallyadditions/textures/item/tiny_coal.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_misc_tiny_coal.png rename to src/main/resources/assets/actuallyadditions/textures/item/tiny_coal.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_bag.png b/src/main/resources/assets/actuallyadditions/textures/item/travelers_sack.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_bag.png rename to src/main/resources/assets/actuallyadditions/textures/item/travelers_sack.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_battery_triple.png b/src/main/resources/assets/actuallyadditions/textures/item/triple_battery.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_battery_triple.png rename to src/main/resources/assets/actuallyadditions/textures/item/triple_battery.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_white.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/void_crystal.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_crystal_empowered_white.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/item/void_crystal.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_void_bag.png b/src/main/resources/assets/actuallyadditions/textures/item/void_sack.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_void_bag.png rename to src/main/resources/assets/actuallyadditions/textures/item/void_sack.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png b/src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png new file mode 100644 index 000000000..8c6a496b5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/white_crystal_shard.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_wings_of_the_bats.png b/src/main/resources/assets/actuallyadditions/textures/item/wings_of_the_bats.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/item_wings_of_the_bats.png rename to src/main/resources/assets/actuallyadditions/textures/item/wings_of_the_bats.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/worm.png b/src/main/resources/assets/actuallyadditions/textures/item/worm.png new file mode 100644 index 000000000..df4918cff Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/worm.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/worm.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/item/worm.png.mcmeta new file mode 100644 index 000000000..84934a9d9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/item/worm.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": + { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items_old/item_suction_ring.png b/src/main/resources/assets/actuallyadditions/textures/items_old/ring_of_magnetizing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items_old/item_suction_ring.png rename to src/main/resources/assets/actuallyadditions/textures/items_old/ring_of_magnetizing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items_old/item_suction_ring.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items_old/ring_of_magnetizing.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items_old/item_suction_ring.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/items_old/ring_of_magnetizing.png.mcmeta