diff options
Diffstat (limited to 'src/main/java')
5 files changed, 31 insertions, 11 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index 37e36e4..53cbc60 100644 --- a/src/main/java/com/sosnitzka/taiga/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -20,7 +20,9 @@ import static com.sosnitzka.taiga.util.Utils.PREFIX_NUGGET; public class Items { public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); - public static ItemLignite lignite = new ItemLignite(); + public static Item lignite = new ItemLignite("lignite", "lignite"); + public static Item lignite2 = new ItemLignite("lignite", "lignite2"); + public static Item lignite3 = new ItemLignite("lignite", "lignite3"); public static ItemIronNugget iron_nugget = new ItemIronNugget(); public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot(); public static Item fuel_brick = new BasicItem("fuel_brick"); diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java index a524024..827411e 100644 --- a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java @@ -12,6 +12,8 @@ import net.minecraft.world.World; import java.util.Random; import static com.sosnitzka.taiga.Items.lignite; +import static com.sosnitzka.taiga.Items.lignite2; +import static com.sosnitzka.taiga.Items.lignite3; public class BlockLignite extends BasicBlock { @@ -35,6 +37,12 @@ public class BlockLignite extends BasicBlock { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return lignite; + int r = RANDOM.nextInt(3); + if (r == 0) { + return lignite; + } else if (r == 1) { + return lignite2; + } else + return lignite3; } } diff --git a/src/main/java/com/sosnitzka/taiga/generic/BasicItem.java b/src/main/java/com/sosnitzka/taiga/generic/BasicItem.java index 4197e45..fdddcfc 100644 --- a/src/main/java/com/sosnitzka/taiga/generic/BasicItem.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicItem.java @@ -11,6 +11,12 @@ public class BasicItem extends Item { this.oreDictPrefix = oreDictPrefix; } + public BasicItem(String name, String oreDictPrefix, String registryname) { + setUnlocalizedName(name); + setRegistryName(registryname); + this.oreDictPrefix = oreDictPrefix; + } + public BasicItem(String name) { this(name, null); } diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemLignite.java b/src/main/java/com/sosnitzka/taiga/items/ItemLignite.java index 5de29fb..bc60014 100644 --- a/src/main/java/com/sosnitzka/taiga/items/ItemLignite.java +++ b/src/main/java/com/sosnitzka/taiga/items/ItemLignite.java @@ -4,8 +4,8 @@ import com.sosnitzka.taiga.generic.BasicItem; public class ItemLignite extends BasicItem { - public ItemLignite() { - super("lignite"); + public ItemLignite(String name, String registry) { + super(name, null, registry); } } diff --git a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java index ee655e5..25eb7ed 100644 --- a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java +++ b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java @@ -2,24 +2,28 @@ package com.sosnitzka.taiga.util; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.IFuelHandler; -import org.apache.commons.lang3.RandomUtils; -import static com.sosnitzka.taiga.Items.fuel_brick; -import static com.sosnitzka.taiga.Items.glimmercoal; -import static com.sosnitzka.taiga.Items.lignite; +import static com.sosnitzka.taiga.Items.*; +import static slimeknights.tconstruct.TConstruct.random; public class FuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { if (fuel.getItem().equals(lignite)) { - return 200 * 2; + return 200 * 8; + } + if (fuel.getItem().equals(lignite2)) { + return 200 * 6; + } + if (fuel.getItem().equals(lignite3)) { + return 200 * 10; } if (fuel.getItem().equals(fuel_brick)) { - return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(1, 32))) * 100; + return 200 * 16; } if (fuel.getItem().equals(glimmercoal)) { - return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(16, 64))) * 200; + return (random.nextInt(32) + 32) * 200; } return 0; } |