From 04e3372e2b387d7833def8d4cbbee1acca14e4b9 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Wed, 20 Jan 2021 22:27:29 +0300 Subject: [PATCH] Thalassium Block & recipes --- .../java/ru/betterend/recipe/AlloyingRecipes.java | 13 +++++++++++++ .../java/ru/betterend/recipe/CraftingRecipes.java | 8 ++++++++ .../java/ru/betterend/recipe/FurnaceRecipes.java | 1 + .../java/ru/betterend/registry/EndBlocks.java | 1 + src/main/java/ru/betterend/registry/EndTags.java | 2 ++ .../resources/assets/betterend/lang/en_us.json | 3 ++- .../resources/assets/betterend/lang/ru_ru.json | 3 ++- .../betterend/textures/block/thalassium_block.png | Bin 0 -> 421 bytes 8 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/thalassium_block.png diff --git a/src/main/java/ru/betterend/recipe/AlloyingRecipes.java b/src/main/java/ru/betterend/recipe/AlloyingRecipes.java index b3927ce4..2dc62043 100644 --- a/src/main/java/ru/betterend/recipe/AlloyingRecipes.java +++ b/src/main/java/ru/betterend/recipe/AlloyingRecipes.java @@ -3,6 +3,7 @@ package ru.betterend.recipe; import net.minecraft.block.Blocks; import net.minecraft.item.Items; import ru.betterend.recipe.builders.AlloyingRecipe; +import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; public class AlloyingRecipes { @@ -35,5 +36,17 @@ public class AlloyingRecipes { .setExpiriense(4.5F) .setSmeltTime(600) .build(); + AlloyingRecipe.Builder.create("terminite_ingot_thalassium") + .setInput(EndItems.THALASSIUM_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) + .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 d4c236fb..66f11907 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -189,6 +189,14 @@ public class CraftingRecipes { .build(); 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("thalassium_axe", EndItems.THALASSIUM_AXE).setShape("##", "#I", " I").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thalassium_axe", EndItems.THALASSIUM_HOE).setShape("##", " I", " I").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thalassium_axe", EndItems.THALASSIUM_PICKAXE).setShape("###", " I ", " I ").addMaterial('#', EndItems.THALASSIUM_INGOT).addMaterial('I', Items.STICK).build(); + GridRecipe.make("thalassium_axe", EndItems.THALASSIUM_SWORD).setShape("#", "#", "I").addMaterial('#', EndItems.THALASSIUM_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 3c664ec5..11dfc6b0 100644 --- a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java +++ b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java @@ -13,5 +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(); } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 0ec3c22c..5a939e4e 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -287,6 +287,7 @@ public class EndBlocks { // 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 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/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index 30b0650e..d32226c9 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -68,7 +68,9 @@ public class EndTags { public static void register() { addSurfaceBlock(Blocks.END_STONE); + addSurfaceBlock(EndBlocks.THALASSIUM_ORE); addSurfaceBlock(EndBlocks.ENDSTONE_DUST); + addSurfaceBlock(EndBlocks.AMBER_ORE); EndItems.getModBlocks().forEach((item) -> { Block block = ((BlockItem) item).getBlock(); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 07b2716f..6985862f 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -582,5 +582,6 @@ "item.betterend.thalassium_ingot": "Thalassium Ingot", "item.betterend.thalassium_pickaxe": "Thalassium Pickaxe", "item.betterend.thalassium_shovel": "Thalassium Shovel", - "item.betterend.thalassium_sword": "Thalassium Sword" + "item.betterend.thalassium_sword": "Thalassium Sword", + "block.betterend.thalassium_block": "Thalassium Block" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 454135a5..51e0286d 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -584,5 +584,6 @@ "item.betterend.thalassium_ingot": "Талласиевый слиток", "item.betterend.thalassium_pickaxe": "Талласиевая кирка", "item.betterend.thalassium_shovel": "Талласиевая лопата", - "item.betterend.thalassium_sword": "Талласиевый меч" + "item.betterend.thalassium_sword": "Талласиевый меч", + "block.betterend.thalassium_block": "Талласиевый блок" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/thalassium_block.png b/src/main/resources/assets/betterend/textures/block/thalassium_block.png new file mode 100644 index 0000000000000000000000000000000000000000..e76081e3f419dc21e645c1b8074d74833142d024 GIT binary patch literal 421 zcmV;W0b2fvP)!T$v>gLO&382|ARUS9TcSqF2NEDh4xBITZ#_p zN%K)XQ*v{j_rB*NI~TXTA5x+93;?C3l^PX#jjz;aCO$)A=e9P8Gl1K#dw6NlufHvD%f@` z1K(8u1vovGOb^mEi%rKe3Xak}+0}Z+aI*Xp&etrk?<&gmCcEU~KUhkVNdU2cEQlm` zJ5>VDF5C=ocC-&b7-<&cQ7jNfIs=Pn80n<$Fw)7ltz+B1B|NCJ(1U*~q}N<3)PDy8&P^9#O70lV^$iS^oVOt4QziR{<4f P00000NkvXXu0mjf02;T; literal 0 HcmV?d00001