From 1966d89dc7522f4e0594acbcec15ae0659a0a4a1 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 24 Sep 2020 15:25:04 +0300 Subject: [PATCH] Added Ender Ore and Ender Dust --- psd/ender_dust.psd | Bin 0 -> 21219 bytes psd/ender_ore.psd | Bin 0 -> 23546 bytes .../java/ru/betterend/blocks/BlockOre.java | 54 ++++++++++++++++++ .../ru/betterend/registry/BlockRegistry.java | 8 +-- .../ru/betterend/registry/ItemRegistry.java | 5 +- .../betterend/blockstates/ender_ore.json | 7 +++ .../assets/betterend/lang/en_us.json | 6 +- .../assets/betterend/lang/ru_ru.json | 6 +- .../betterend/models/block/ender_ore.json | 6 ++ .../betterend/models/item/ender_dust.json | 6 ++ .../betterend/models/item/ender_ore.json | 3 + .../betterend/textures/block/ender_ore.png | Bin 0 -> 848 bytes .../betterend/textures/item/ender_dust.png | Bin 0 -> 349 bytes 13 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 psd/ender_dust.psd create mode 100644 psd/ender_ore.psd create mode 100644 src/main/java/ru/betterend/blocks/BlockOre.java create mode 100644 src/main/resources/assets/betterend/blockstates/ender_ore.json create mode 100644 src/main/resources/assets/betterend/models/block/ender_ore.json create mode 100644 src/main/resources/assets/betterend/models/item/ender_dust.json create mode 100644 src/main/resources/assets/betterend/models/item/ender_ore.json create mode 100644 src/main/resources/assets/betterend/textures/block/ender_ore.png create mode 100644 src/main/resources/assets/betterend/textures/item/ender_dust.png diff --git a/psd/ender_dust.psd b/psd/ender_dust.psd new file mode 100644 index 0000000000000000000000000000000000000000..10854f8bd2a361a68562e0e0ab2fce7d29460c71 GIT binary patch literal 21219 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 Th6OtMoPb4oB4VSI!e0Ix&yW=h literal 0 HcmV?d00001 diff --git a/psd/ender_ore.psd b/psd/ender_ore.psd new file mode 100644 index 0000000000000000000000000000000000000000..49e8c9d17c8c700a2fcd355738ef7fd3dad316c9 GIT binary patch literal 23546 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 literal 0 HcmV?d00001 diff --git a/src/main/java/ru/betterend/blocks/BlockOre.java b/src/main/java/ru/betterend/blocks/BlockOre.java new file mode 100644 index 00000000..23a739dc --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockOre.java @@ -0,0 +1,54 @@ +package ru.betterend.blocks; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.OreBlock; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.math.MathHelper; + +import ru.betterend.util.MHelper; + +public class BlockOre extends OreBlock { + private final Item dropItem; + private final int minCount; + private final int maxCount; + + public BlockOre(Item drop, int minCount, int maxCount) { + super(FabricBlockSettings.of(Material.STONE, MaterialColor.SAND) + .hardness(3F) + .resistance(9F) + .requiresTool() + .sounds(BlockSoundGroup.STONE)); + this.dropItem = drop; + this.minCount = minCount; + this.maxCount = maxCount; + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + ItemStack tool = builder.get(LootContextParameters.TOOL); + if (tool.isEffectiveOn(state)) + { + int fortune = EnchantmentHelper.getLevel(Enchantments.FORTUNE, tool); + int min = MathHelper.clamp(minCount + fortune, 0, maxCount); + if (min == maxCount) + return Lists.newArrayList(new ItemStack(dropItem, maxCount)); + int count = MHelper.randRange(min, maxCount, MHelper.RANDOM); + return Lists.newArrayList(new ItemStack(dropItem, count)); + } + return Lists.newArrayList(); + } +} diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 4f8ed194..6a55b844 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -7,24 +7,24 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.blocks.BlockEndstoneDust; +import ru.betterend.blocks.BlockOre; import ru.betterend.blocks.BlockWetMycelium; import ru.betterend.tab.CreativeTab; public class BlockRegistry { public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust()); public static final Block WET_MYCELIUM = registerBlock("wet_mycelium", new BlockWetMycelium()); + public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(ItemRegistry.ENDER_DUST, 1, 3)); public static void register() {} - private static Block registerBlock(String name, Block block) - { + private static Block registerBlock(String name, Block block) { Registry.register(Registry.BLOCK, new Identifier(BetterEnd.MOD_ID, name), block); ItemRegistry.registerItem(name, new BlockItem(block, new Item.Settings().group(CreativeTab.END_TAB))); return block; } - public static Block registerBlockNI(String name, Block block) - { + public static Block registerBlockNI(String name, Block block) { return Registry.register(Registry.BLOCK, new Identifier(BetterEnd.MOD_ID, name), block); } } diff --git a/src/main/java/ru/betterend/registry/ItemRegistry.java b/src/main/java/ru/betterend/registry/ItemRegistry.java index 092256e4..cf871300 100644 --- a/src/main/java/ru/betterend/registry/ItemRegistry.java +++ b/src/main/java/ru/betterend/registry/ItemRegistry.java @@ -6,6 +6,7 @@ import com.google.common.collect.Lists; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -14,9 +15,11 @@ import ru.betterend.BetterEnd; public class ItemRegistry { private static final List MOD_BLOCKS = Lists.newArrayList(); private static final List MOD_ITEMS = Lists.newArrayList(); + + public final static Item ENDER_DUST = registerItem("ender_dust", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); protected static Item registerItem(String name, Item item) { - if (item instanceof BlockItem && item != Items.AIR) { + if (item != Items.AIR) { Registry.register(Registry.ITEM, new Identifier(BetterEnd.MOD_ID, name), item); if (item instanceof BlockItem) MOD_BLOCKS.add(item); diff --git a/src/main/resources/assets/betterend/blockstates/ender_ore.json b/src/main/resources/assets/betterend/blockstates/ender_ore.json new file mode 100644 index 00000000..fb7d0d1c --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/ender_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/ender_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 1a6d691e..596d9ee4 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -1,5 +1,9 @@ { "itemGroup.betterend.items": "Better End", + "block.betterend.wet_mycelium": "Wet Mycelium", - "block.betterend.endstone_dust": "End Stone Dust" + "block.betterend.endstone_dust": "End Stone Dust", + "block.betterend.ender_ore": "Ender Ore", + + "item.betterend.ender_dust": "Ender Dust" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 3583b7f6..14b3e993 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -1,5 +1,9 @@ { "itemGroup.betterend.items": "Улучшенный Край", + "block.betterend.wet_mycelium": "Влажный мицелий", - "block.betterend.endstone_dust": "Эндерняковая пыль" + "block.betterend.endstone_dust": "Эндерняковая пыль", + "block.betterend.ender_ore": "Руда Эндера", + + "item.betterend.ender_dust": "Пыль Эндера" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/ender_ore.json b/src/main/resources/assets/betterend/models/block/ender_ore.json new file mode 100644 index 00000000..0cf51384 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/ender_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/ender_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/ender_dust.json b/src/main/resources/assets/betterend/models/item/ender_dust.json new file mode 100644 index 00000000..221fcead --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/ender_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/ender_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/ender_ore.json b/src/main/resources/assets/betterend/models/item/ender_ore.json new file mode 100644 index 00000000..05801726 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/ender_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/ender_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/ender_ore.png b/src/main/resources/assets/betterend/textures/block/ender_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..13663c7e3feab4b2ffd04c902cb5f5d56fc2d8ea GIT binary patch literal 848 zcmV-W1F!svP)A#8nl`8T;N&!4O_R0fn9;Q}$E{{GSbO1$2on`Qs3_ifBZB|HZWI&*1uu3v zFN7*y1%y?!j7Ww;JJUH!ur_tIiFQlUq&Z8{w9Tw2jZ!{`NrFC)geVQ;_Xc>dcDq|Yg3qsP@xgKy_tFM? zMw7sqDP-A2A^jL096C$lh3mITS42E`uaT?aVE0LAlKNZytg^!i{I2U}p9r zrF;&5P(u`*Tx?f}KR3dt>PD7bSd7ggO)vO7BFQTnbJug6i;VKIW+SZ0)ay0;L5KR=z^AKgyzaK};*}Rjz6VCRz|^#kc~C``U0wKJ3*1S;$|_zp zKO%3Vh13% zSz~a3UI^AI{-B1^x2MtNfkzFX|ViVJ39aN5G=w<1`p#9x|V zRCOac6#7FdpCo=|J6G>ckh=9*XJ^0C+kO7G25`d4%a`z-u>CIPz1uUG z#U7HFB!oYxvES??>AQzfE?{r%Bg;X69;|Ov8T)aCA6}cJUauiJl&%W(dJSQ~O=7db zpXDsG^<5^;1u;#qhq^xy{^%=coPbXT#X<7&II(C1OCg1dkh0~ zjty?Sasj8)2|%OKz~>QJU;Z6SpGTsQ&R|yqjO!ufp_86W=0UZWhx@Ha9Aj4l$a1*% a;{O9WOFWGD!@>dp0000b&NjCbpF(_xK(3J#O0-O)h$*zP2qqCR zv2aN#TexF!*SM>QKaJp5&A^;9AN=!ZB~+CB5-tmawh;6M{ZolnLeLfO>A?!BdqOGy zO^Gf?@K6YP!r;P+s=GpI{R@d!_G8eCHRxGbt4NY;k{VAHCFm`@aLVq!k7?BK!fD8@ zLN5s>rUN1XrdWX73bf9keF;1R0=YHVKZ5#+^NKmVPbn`TkXeHC vf-Tv(fvfB2(Q$(LC`gE6XZ7aiw||-!Bfo?OBn;fH00000NkvXXu0mjf{{@#I literal 0 HcmV?d00001