diff --git a/src/main/java/ru/betterend/item/material/EndToolMaterial.java b/src/main/java/ru/betterend/item/material/EndToolMaterial.java index 5060662f..4302dfaa 100644 --- a/src/main/java/ru/betterend/item/material/EndToolMaterial.java +++ b/src/main/java/ru/betterend/item/material/EndToolMaterial.java @@ -8,7 +8,7 @@ import net.minecraft.util.Lazy; import ru.betterend.registry.EndItems; public enum EndToolMaterial implements ToolMaterial { - THALASSIUM(2, 320, 6.5F, 4.5F, 13, () -> { + THALLASIUM(2, 320, 6.5F, 4.5F, 13, () -> { return Ingredient.ofItems(EndItems.AETERNIUM_INGOT); }), TERMINITE(3, 1230, 8.5F, 3.0F, 14, () -> { diff --git a/src/main/java/ru/betterend/recipe/AlloyingRecipes.java b/src/main/java/ru/betterend/recipe/AlloyingRecipes.java index 2dc62043..d8bacb80 100644 --- a/src/main/java/ru/betterend/recipe/AlloyingRecipes.java +++ b/src/main/java/ru/betterend/recipe/AlloyingRecipes.java @@ -36,15 +36,15 @@ public class AlloyingRecipes { .setExpiriense(4.5F) .setSmeltTime(600) .build(); - AlloyingRecipe.Builder.create("terminite_ingot_thalassium") - .setInput(EndItems.THALASSIUM_INGOT, EndItems.ENDER_DUST) + AlloyingRecipe.Builder.create("terminite_ingot_thallasium") + .setInput(EndItems.THALLASIUM_INGOT, EndItems.ENDER_DUST) .setOutput(EndItems.TERMINITE_INGOT, 1) .setExpiriense(2.5F) .setSmeltTime(450) .build(); - AlloyingRecipe.Builder.create("thalassium_ingot") - .setInput(EndBlocks.THALASSIUM_ORE, EndBlocks.THALASSIUM_ORE) - .setOutput(EndItems.THALASSIUM_INGOT, 3) + AlloyingRecipe.Builder.create("thallasium_ingot") + .setInput(EndBlocks.THALLASIUM_ORE, EndBlocks.THALLASIUM_ORE) + .setOutput(EndItems.THALLASIUM_INGOT, 3) .setExpiriense(2.1F) .setSmeltTime(600) .build(); diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 9e7c6ab9..9a73f132 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -190,13 +190,13 @@ public class CraftingRecipes { GridRecipe.make("fiber_string", Items.STRING).setOutputCount(6).setShape("#", "#", "#").addMaterial('#', EndItems.SILK_FIBER).build(); - GridRecipe.make("thalassium_block", EndBlocks.THALASSIUM_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.THALASSIUM_INGOT).build(); - GridRecipe.make("thalassium_ingot_from_block", EndItems.THALASSIUM_INGOT).setOutputCount(9).setList("#").addMaterial('#', EndBlocks.THALASSIUM_BLOCK).build(); + GridRecipe.make("thallasium_block", EndBlocks.THALLASIUM_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.THALLASIUM_INGOT).build(); + GridRecipe.make("thallasium_ingot_from_block", EndItems.THALLASIUM_INGOT).setOutputCount(9).setList("#").addMaterial('#', EndBlocks.THALLASIUM_BLOCK).build(); - GridRecipe.make("thalassium_axe", EndItems.THALASSIUM_AXE).setShape("##", "#I", " I").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); - GridRecipe.make("thalassium_hoe", EndItems.THALASSIUM_HOE).setShape("##", " I", " I").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); - GridRecipe.make("thalassium_pickaxe", EndItems.THALASSIUM_PICKAXE).setShape("###", " I ", " I ").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); - GridRecipe.make("thalassium_sword", EndItems.THALASSIUM_SWORD).setShape("#", "#", "I").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thallasium_axe", EndItems.THALLASIUM_AXE).setShape("##", "#I", " I").addMaterial('#', EndItems.THALLASIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thallasium_hoe", EndItems.THALLASIUM_HOE).setShape("##", " I", " I").addMaterial('#', EndItems.THALLASIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thallasium_pickaxe", EndItems.THALLASIUM_PICKAXE).setShape("###", " I ", " I ").addMaterial('#', EndItems.THALLASIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thallasium_sword", EndItems.THALLASIUM_SWORD).setShape("#", "#", "I").addMaterial('#', EndItems.THALLASIUM_INGOT).addMaterial('I', Items.STICK).build(); } private static void registerLantern(String name, Block lantern, Block slab) { diff --git a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java index 11dfc6b0..febed809 100644 --- a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java +++ b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java @@ -13,6 +13,6 @@ public class FurnaceRecipes { FurnaceRecipe.make("end_berry", EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_COOKED).build(); FurnaceRecipe.make("end_fish", EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED).build(); FurnaceRecipe.make("slime_ball", EndBlocks.JELLYSHROOM_CAP_PURPLE, Items.SLIME_BALL).build(); - FurnaceRecipe.make("thalassium_ingot_furnace", EndBlocks.THALASSIUM_ORE, EndItems.THALASSIUM_INGOT).build(); + FurnaceRecipe.make("thallasium_ingot_furnace", EndBlocks.THALLASIUM_ORE, EndItems.THALLASIUM_INGOT).build(); } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 5a939e4e..dfc04652 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -280,14 +280,14 @@ public class EndBlocks { public static final Block SILK_MOTH_NEST = registerBlock("silk_moth_nest", new SilkMothNestBlock()); // Ores // - public static final Block THALASSIUM_ORE = registerBlock("thalassium_ore", new BaseBlock(FabricBlockSettings.copyOf(Blocks.END_STONE))); + public static final Block THALLASIUM_ORE = registerBlock("thallasium_ore", new BaseBlock(FabricBlockSettings.copyOf(Blocks.END_STONE))); public static final Block ENDER_ORE = registerBlock("ender_ore", new EndOreBlock(EndItems.ENDER_SHARD, 1, 3, 5)); public static final Block AMBER_ORE = registerBlock("amber_ore", new EndOreBlock(EndItems.RAW_AMBER, 1, 2, 4)); // Materials // public static final Block TERMINITE_BLOCK = registerBlock("terminite_block", new TerminiteBlock()); public static final Block AETERNIUM_BLOCK = registerBlock("aeternium_block", new AeterniumBlock()); - public static final Block THALASSIUM_BLOCK = registerBlock("thalassium_block", new BaseBlock(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK))); + public static final Block THALLASIUM_BLOCK = registerBlock("thallasium_block", new BaseBlock(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK))); public static final Block ENDER_BLOCK = registerBlock("ender_block", new EnderBlock()); public static final Block AURORA_CRYSTAL = registerBlock("aurora_crystal", new AuroraCrystalBlock()); public static final Block AMBER_BLOCK = registerBlock("amber_block", new AmberBlock()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index f04d3eb8..d4a74f9e 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -157,7 +157,7 @@ public class EndFeatures { public static final EndFeature SULPHUR_HILL = EndFeature.makeChansedFeature("sulphur_hill", new SulphurHillFeature(), 8); // Ores // - public static final EndFeature THALASSIUM_ORE = EndFeature.makeOreFeature("thalassium_ore", EndBlocks.THALASSIUM_ORE, 12, 6, 0, 16, 128); + public static final EndFeature THALLASIUM_ORE = EndFeature.makeOreFeature("thallasium_ore", EndBlocks.THALLASIUM_ORE, 12, 6, 0, 16, 128); public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", EndBlocks.ENDER_ORE, 8, 3, 0, 16, 128); public static final EndFeature AMBER_ORE = EndFeature.makeOreFeature("amber_ore", EndBlocks.AMBER_ORE, 12, 6, 0, 16, 128); public static final EndFeature VIOLECITE_LAYER = EndFeature.makeLayerFeature("violecite_layer", EndBlocks.VIOLECITE, 15, 16, 128, 8); @@ -187,7 +187,7 @@ public class EndFeatures { } addFeature(FLAVOLITE_LAYER, features); - addFeature(THALASSIUM_ORE, features); + addFeature(THALLASIUM_ORE, features); addFeature(ENDER_ORE, features); addFeature(CRASHED_SHIP, features); diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 30011e19..3e1922e0 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -57,7 +57,7 @@ public class EndItems { // Materials // public final static Item ENDER_DUST = registerItem("ender_dust"); public final static Item ENDER_SHARD = registerItem("ender_shard"); - public final static Item THALASSIUM_INGOT = registerItem("thalassium_ingot"); + public final static Item THALLASIUM_INGOT = registerItem("thallasium_ingot"); public final static Item TERMINITE_INGOT = registerItem("terminite_ingot"); public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot"); public final static Item END_LILY_LEAF = registerItem("end_lily_leaf"); @@ -90,11 +90,11 @@ public class EndItems { public static final Item CRYSTALITE_BOOTS = registerItem("crystalite_boots", new ArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.FEET, makeItemSettings().rarity(Rarity.UNCOMMON))); // Tools // - public static final ToolItem THALASSIUM_SHOVEL = registerTool("thalassium_shovel", new EndShovelItem(EndToolMaterial.THALASSIUM, 1.0F, -3.0F, makeItemSettings())); - public static final ToolItem THALASSIUM_SWORD = registerTool("thalassium_sword", new EndSwordItem(EndToolMaterial.THALASSIUM, 2, -2.4F, makeItemSettings())); - public static final ToolItem THALASSIUM_PICKAXE = registerTool("thalassium_pickaxe", new EndPickaxeItem(EndToolMaterial.THALASSIUM, 1, -2.8F, makeItemSettings())); - public static final ToolItem THALASSIUM_AXE = registerTool("thalassium_axe", new EndAxeItem(EndToolMaterial.THALASSIUM, 5.0F, -3.0F, makeItemSettings())); - public static final ToolItem THALASSIUM_HOE = registerTool("thalassium_hoe", new EndHoeItem(EndToolMaterial.THALASSIUM, -3, 0.0F, makeItemSettings())); + public static final ToolItem THALLASIUM_SHOVEL = registerTool("thallasium_shovel", new EndShovelItem(EndToolMaterial.THALLASIUM, 1.0F, -3.0F, makeItemSettings())); + public static final ToolItem THALLASIUM_SWORD = registerTool("thallasium_sword", new EndSwordItem(EndToolMaterial.THALLASIUM, 2, -2.4F, makeItemSettings())); + public static final ToolItem THALLASIUM_PICKAXE = registerTool("thallasium_pickaxe", new EndPickaxeItem(EndToolMaterial.THALLASIUM, 1, -2.8F, makeItemSettings())); + public static final ToolItem THALLASIUM_AXE = registerTool("thallasium_axe", new EndAxeItem(EndToolMaterial.THALLASIUM, 5.0F, -3.0F, makeItemSettings())); + public static final ToolItem THALLASIUM_HOE = registerTool("thallasium_hoe", new EndHoeItem(EndToolMaterial.THALLASIUM, -3, 0.0F, makeItemSettings())); public static final ToolItem TERMINITE_SHOVEL = registerTool("terminite_shovel", new EndShovelItem(EndToolMaterial.TERMINITE, 1.5F, -3.0F, makeItemSettings())); public static final ToolItem TERMINITE_SWORD = registerTool("terminite_sword", new EndSwordItem(EndToolMaterial.TERMINITE, 3, -2.4F, makeItemSettings())); diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index d32226c9..f89ba480 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -68,7 +68,7 @@ public class EndTags { public static void register() { addSurfaceBlock(Blocks.END_STONE); - addSurfaceBlock(EndBlocks.THALASSIUM_ORE); + addSurfaceBlock(EndBlocks.THALLASIUM_ORE); addSurfaceBlock(EndBlocks.ENDSTONE_DUST); addSurfaceBlock(EndBlocks.AMBER_ORE); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 6985862f..3b448522 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -576,12 +576,12 @@ "item.betterend.silk_fiber": "Silk Fiber", "item.betterend.spawn_egg_silk_moth": "Silk Moth Spawn Egg", - "block.betterend.thalassium_ore": "Thalassium Ore", - "item.betterend.thalassium_axe": "Thalassium Axe", - "item.betterend.thalassium_hoe": "Thalassium Hoe", - "item.betterend.thalassium_ingot": "Thalassium Ingot", - "item.betterend.thalassium_pickaxe": "Thalassium Pickaxe", - "item.betterend.thalassium_shovel": "Thalassium Shovel", - "item.betterend.thalassium_sword": "Thalassium Sword", - "block.betterend.thalassium_block": "Thalassium Block" + "block.betterend.thallasium_ore": "Thallasium Ore", + "item.betterend.thallasium_axe": "Thallasium Axe", + "item.betterend.thallasium_hoe": "Thallasium Hoe", + "item.betterend.thallasium_ingot": "Thallasium Ingot", + "item.betterend.thallasium_pickaxe": "Thallasium Pickaxe", + "item.betterend.thallasium_shovel": "Thallasium Shovel", + "item.betterend.thallasium_sword": "Thallasium Sword", + "block.betterend.thallasium_block": "Thallasium Block" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 51e0286d..c9f090b5 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -578,12 +578,12 @@ "item.betterend.silk_fiber": "Шёлковое волокно", "item.betterend.spawn_egg_silk_moth": "Яйцо призыва шелковичной моли", - "block.betterend.thalassium_ore": "Талласиевая руда", - "item.betterend.thalassium_axe": "Талласиевый топор", - "item.betterend.thalassium_hoe": "Талласиевая мотыга", - "item.betterend.thalassium_ingot": "Талласиевый слиток", - "item.betterend.thalassium_pickaxe": "Талласиевая кирка", - "item.betterend.thalassium_shovel": "Талласиевая лопата", - "item.betterend.thalassium_sword": "Талласиевый меч", - "block.betterend.thalassium_block": "Талласиевый блок" + "block.betterend.thallasium_ore": "Талласиевая руда", + "item.betterend.thallasium_axe": "Талласиевый топор", + "item.betterend.thallasium_hoe": "Талласиевая мотыга", + "item.betterend.thallasium_ingot": "Талласиевый слиток", + "item.betterend.thallasium_pickaxe": "Талласиевая кирка", + "item.betterend.thallasium_shovel": "Талласиевая лопата", + "item.betterend.thallasium_sword": "Талласиевый меч", + "block.betterend.thallasium_block": "Талласиевый блок" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_0.png b/src/main/resources/assets/betterend/textures/block/lumecorn_0.png new file mode 100644 index 00000000..9322a74a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_0.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_1.png b/src/main/resources/assets/betterend/textures/block/lumecorn_1.png new file mode 100644 index 00000000..0e2856f2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_2.png b/src/main/resources/assets/betterend/textures/block/lumecorn_2.png new file mode 100644 index 00000000..04a3c654 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_3.png b/src/main/resources/assets/betterend/textures/block/lumecorn_3.png new file mode 100644 index 00000000..3ec3dbe2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/thalassium_block.png b/src/main/resources/assets/betterend/textures/block/thalassium_block.png deleted file mode 100644 index e76081e3..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/thalassium_block.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_block.png b/src/main/resources/assets/betterend/textures/block/thallasium_block.png new file mode 100644 index 00000000..a50b3a8b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/thallasium_block.png differ diff --git a/src/main/resources/assets/betterend/textures/block/thalassium_ore.png b/src/main/resources/assets/betterend/textures/block/thallasium_ore.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/thalassium_ore.png rename to src/main/resources/assets/betterend/textures/block/thallasium_ore.png diff --git a/src/main/resources/assets/betterend/textures/item/lumicorn.png b/src/main/resources/assets/betterend/textures/item/lumicorn.png new file mode 100644 index 00000000..575b0aa9 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/lumicorn.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thalassium_axe.png b/src/main/resources/assets/betterend/textures/item/thallasium_axe.png similarity index 100% rename from src/main/resources/assets/betterend/textures/item/thalassium_axe.png rename to src/main/resources/assets/betterend/textures/item/thallasium_axe.png diff --git a/src/main/resources/assets/betterend/textures/item/thalassium_hoe.png b/src/main/resources/assets/betterend/textures/item/thallasium_hoe.png similarity index 100% rename from src/main/resources/assets/betterend/textures/item/thalassium_hoe.png rename to src/main/resources/assets/betterend/textures/item/thallasium_hoe.png diff --git a/src/main/resources/assets/betterend/textures/item/thalassium_ingot.png b/src/main/resources/assets/betterend/textures/item/thallasium_ingot.png similarity index 100% rename from src/main/resources/assets/betterend/textures/item/thalassium_ingot.png rename to src/main/resources/assets/betterend/textures/item/thallasium_ingot.png diff --git a/src/main/resources/assets/betterend/textures/item/thalassium_pickaxe.png b/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png similarity index 100% rename from src/main/resources/assets/betterend/textures/item/thalassium_pickaxe.png rename to src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png diff --git a/src/main/resources/assets/betterend/textures/item/thalassium_shovel.png b/src/main/resources/assets/betterend/textures/item/thallasium_shovel.png similarity index 100% rename from src/main/resources/assets/betterend/textures/item/thalassium_shovel.png rename to src/main/resources/assets/betterend/textures/item/thallasium_shovel.png diff --git a/src/main/resources/assets/betterend/textures/item/thalassium_sword.png b/src/main/resources/assets/betterend/textures/item/thallasium_sword.png similarity index 100% rename from src/main/resources/assets/betterend/textures/item/thalassium_sword.png rename to src/main/resources/assets/betterend/textures/item/thallasium_sword.png