diff --git a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java index d3626da5..fd4f4c17 100644 --- a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java @@ -112,6 +112,7 @@ public class WoodenMaterial { GridRecipe.make(name + "_bark", bark).setShape("##", "##").addMaterial('#', log).setOutputCount(3).build(); GridRecipe.make(name + "_log", log).setShape("##", "##").addMaterial('#', bark).setOutputCount(3).build(); GridRecipe.make(name + "_composter", composter).setShape("# #", "# #", "###").addMaterial('#', slab).build(); + GridRecipe.make(name + "_shulker", Items.SHULKER_BOX).setShape("S", "#", "S").addMaterial('S', Items.SHULKER_SHELL).addMaterial('#', chest).build(); // Item Tags // TagHelper.addTag(ItemTags.PLANKS, planks); diff --git a/src/main/resources/assets/betterend/textures/block/brimstone.png b/src/main/resources/assets/betterend/textures/block/brimstone.png index f642a972..e6c11d99 100644 Binary files a/src/main/resources/assets/betterend/textures/block/brimstone.png and b/src/main/resources/assets/betterend/textures/block/brimstone.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_plant.png b/src/main/resources/assets/betterend/textures/block/chorus_plant.png index 2bf9e6f2..756dae1e 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_plant.png and b/src/main/resources/assets/betterend/textures/block/chorus_plant.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_moss_side.png b/src/main/resources/assets/betterend/textures/block/end_moss_side.png index 6a328812..26a0031b 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_moss_side.png and b/src/main/resources/assets/betterend/textures/block/end_moss_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_mycelium_path_top.png b/src/main/resources/assets/betterend/textures/block/end_mycelium_path_top.png index efd16c00..14f7385b 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_mycelium_path_top.png and b/src/main/resources/assets/betterend/textures/block/end_mycelium_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front.png b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front.png index 50ef4579..1ee9ea3c 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front.png and b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png index 2a7aaad7..47c3f431 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png and b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_side.png b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_side.png index 185565fe..3abdc94f 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_side.png and b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_top.png b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_top.png index c54e06a5..71f47f4f 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_top.png and b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_polished.png b/src/main/resources/assets/betterend/textures/block/flavolite_polished.png index fdcb63e7..a98bc902 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_polished.png and b/src/main/resources/assets/betterend/textures/block/flavolite_polished.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_runed_active_1.png b/src/main/resources/assets/betterend/textures/block/flavolite_runed_active_1.png index 62d6cbad..804be8bb 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_runed_active_1.png and b/src/main/resources/assets/betterend/textures/block/flavolite_runed_active_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_tiles.png b/src/main/resources/assets/betterend/textures/block/flavolite_tiles.png index 7b757acc..8d2f6e06 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_tiles.png and b/src/main/resources/assets/betterend/textures/block/flavolite_tiles.png differ diff --git a/src/main/resources/assets/betterend/textures/block/helix_tree_log_side.png b/src/main/resources/assets/betterend/textures/block/helix_tree_log_side.png index 93245192..32df32a1 100644 Binary files a/src/main/resources/assets/betterend/textures/block/helix_tree_log_side.png and b/src/main/resources/assets/betterend/textures/block/helix_tree_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png index 362854f7..a987633a 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png index 8af2a9a1..f3fc5d84 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_4.png index bc171fb5..8d08e450 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_4.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/silk_moth_nest_top.png b/src/main/resources/assets/betterend/textures/block/silk_moth_nest_top.png index efca652e..d102e5ab 100644 Binary files a/src/main/resources/assets/betterend/textures/block/silk_moth_nest_top.png and b/src/main/resources/assets/betterend/textures/block/silk_moth_nest_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_0.png b/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_0.png index d3b78ec9..7aa548fa 100644 Binary files a/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_0.png and b/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_0.png differ diff --git a/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_1.png b/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_1.png index 69d0465d..b590f604 100644 Binary files a/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_1.png and b/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_2.png b/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_2.png index ee1d9403..cf463857 100644 Binary files a/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_2.png and b/src/main/resources/assets/betterend/textures/block/terminite_anvil_top_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_tiles.png b/src/main/resources/assets/betterend/textures/block/violecite_tiles.png index 70aa5f30..ef69ee4c 100644 Binary files a/src/main/resources/assets/betterend/textures/block/violecite_tiles.png and b/src/main/resources/assets/betterend/textures/block/violecite_tiles.png differ diff --git a/src/main/resources/assets/betterend/textures/item/diamond_hammer.png b/src/main/resources/assets/betterend/textures/item/diamond_hammer.png index faa4b9b4..ea668c2b 100644 Binary files a/src/main/resources/assets/betterend/textures/item/diamond_hammer.png and b/src/main/resources/assets/betterend/textures/item/diamond_hammer.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_axe.png b/src/main/resources/assets/betterend/textures/item/terminite_axe.png index dc0c5142..2140d04f 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_axe.png and b/src/main/resources/assets/betterend/textures/item/terminite_axe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_axe_head.png b/src/main/resources/assets/betterend/textures/item/terminite_axe_head.png index ff870193..5f65902a 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_axe_head.png and b/src/main/resources/assets/betterend/textures/item/terminite_axe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_boots.png b/src/main/resources/assets/betterend/textures/item/terminite_boots.png index c0f5d3eb..bfc2254a 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_boots.png and b/src/main/resources/assets/betterend/textures/item/terminite_boots.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_chestplate.png b/src/main/resources/assets/betterend/textures/item/terminite_chestplate.png index 88504a6f..90f9efd8 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_chestplate.png and b/src/main/resources/assets/betterend/textures/item/terminite_chestplate.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_hammer.png b/src/main/resources/assets/betterend/textures/item/terminite_hammer.png index b50ca942..2bd48312 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_hammer.png and b/src/main/resources/assets/betterend/textures/item/terminite_hammer.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_helmet.png b/src/main/resources/assets/betterend/textures/item/terminite_helmet.png index c13584e5..3bc9fa08 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_helmet.png and b/src/main/resources/assets/betterend/textures/item/terminite_helmet.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_hoe.png b/src/main/resources/assets/betterend/textures/item/terminite_hoe.png index 8fd994b9..778f244e 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_hoe.png and b/src/main/resources/assets/betterend/textures/item/terminite_hoe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_hoe_head.png b/src/main/resources/assets/betterend/textures/item/terminite_hoe_head.png index d189bbce..9a4863c2 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_hoe_head.png and b/src/main/resources/assets/betterend/textures/item/terminite_hoe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_ingot.png b/src/main/resources/assets/betterend/textures/item/terminite_ingot.png index 3774d653..4c0bcfdc 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_ingot.png and b/src/main/resources/assets/betterend/textures/item/terminite_ingot.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_leggings.png b/src/main/resources/assets/betterend/textures/item/terminite_leggings.png index eb4bf6dc..18503e47 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_leggings.png and b/src/main/resources/assets/betterend/textures/item/terminite_leggings.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_nugget.png b/src/main/resources/assets/betterend/textures/item/terminite_nugget.png index 1a8c9a3a..7d7fdeb3 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_nugget.png and b/src/main/resources/assets/betterend/textures/item/terminite_nugget.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png index 8b3f425c..42a0bbed 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png and b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe_head.png b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe_head.png index 4028e25e..88ab3a36 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe_head.png and b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_shovel.png b/src/main/resources/assets/betterend/textures/item/terminite_shovel.png index b95e9e48..37785342 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_shovel.png and b/src/main/resources/assets/betterend/textures/item/terminite_shovel.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_shovel_head.png b/src/main/resources/assets/betterend/textures/item/terminite_shovel_head.png index 8b444051..603bceef 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_shovel_head.png and b/src/main/resources/assets/betterend/textures/item/terminite_shovel_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_sword.png b/src/main/resources/assets/betterend/textures/item/terminite_sword.png index 0ebdbe88..ac4a40df 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_sword.png and b/src/main/resources/assets/betterend/textures/item/terminite_sword.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_sword_blade.png b/src/main/resources/assets/betterend/textures/item/terminite_sword_blade.png index 7d88d793..719e8002 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_sword_blade.png and b/src/main/resources/assets/betterend/textures/item/terminite_sword_blade.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_sword_handle.png b/src/main/resources/assets/betterend/textures/item/terminite_sword_handle.png index 524b0eff..c4e35d66 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_sword_handle.png and b/src/main/resources/assets/betterend/textures/item/terminite_sword_handle.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_axe_head.png b/src/main/resources/assets/betterend/textures/item/thallasium_axe_head.png index 1ce969e2..c82b065d 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_axe_head.png and b/src/main/resources/assets/betterend/textures/item/thallasium_axe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_hoe_head.png b/src/main/resources/assets/betterend/textures/item/thallasium_hoe_head.png index eb1efc43..0c235fb5 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_hoe_head.png and b/src/main/resources/assets/betterend/textures/item/thallasium_hoe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe_head.png b/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe_head.png index 67b34a1b..dcee9d06 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe_head.png and b/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_shovel_head.png b/src/main/resources/assets/betterend/textures/item/thallasium_shovel_head.png index 57fb43b2..fe00931e 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_shovel_head.png and b/src/main/resources/assets/betterend/textures/item/thallasium_shovel_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_sword_blade.png b/src/main/resources/assets/betterend/textures/item/thallasium_sword_blade.png index addc8489..9a58aea7 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_sword_blade.png and b/src/main/resources/assets/betterend/textures/item/thallasium_sword_blade.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_sword_handle.png b/src/main/resources/assets/betterend/textures/item/thallasium_sword_handle.png index 66da9d93..9d3e085e 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_sword_handle.png and b/src/main/resources/assets/betterend/textures/item/thallasium_sword_handle.png differ diff --git a/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png b/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png index 56cb9600..26bda1e9 100644 Binary files a/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png and b/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png differ