Merge remote-tracking branch 'origin/master'

This commit is contained in:
paulevsGitch 2020-12-04 15:09:19 +03:00
commit a93d7b7ef1
9 changed files with 36 additions and 16 deletions

View file

@ -185,7 +185,7 @@ public class EndBlocks {
public static final Block BULB_VINE = registerBlock("bulb_vine", new BlockBulbVine());
// Ores //
public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(EndItems.ENDER_DUST, 1, 3, 5));
public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(EndItems.ENDER_SHARD, 1, 3, 5));
public static final Block AMBER_ORE = registerBlock("amber_ore", new BlockOre(EndItems.RAW_AMBER, 1, 2, 4));
// Materials //

View file

@ -40,6 +40,7 @@ import ru.betterend.item.EndHoe;
import ru.betterend.item.EndPickaxe;
import ru.betterend.item.EndToolMaterial;
import ru.betterend.item.EternalCrystal;
import ru.betterend.item.PatternedItem;
import ru.betterend.tab.CreativeTab;
import ru.betterend.util.TagHelper;
@ -51,6 +52,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 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");
@ -104,7 +106,7 @@ public class EndItems {
public static final Item ETERNAL_CRYSTAL = registerItem("eternal_crystal", new EternalCrystal());
protected static Item registerItem(String name) {
return registerItem(BetterEnd.makeID(name), new Item(makeSettings()));
return registerItem(BetterEnd.makeID(name), new PatternedItem(makeSettings()));
}
protected static Item registerItem(String name, Item item) {