Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Fixed Lignite and its registration, added 2 more variants - same texture.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-07-19 00:46:29 +02:00
parent 114cb69985
commit bac0955b44
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sosnitzka/taiga/Items.java
View File

@@ -20,7 +20,9 @@ import static com.sosnitzka.taiga.util.Utils.PREFIX_NUGGET;
public class Items { public class Items {
public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); 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 ItemIronNugget iron_nugget = new ItemIronNugget();
public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot(); public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot();
public static Item fuel_brick = new BasicItem("fuel_brick"); public static Item fuel_brick = new BasicItem("fuel_brick");

8
src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java
View File

@@ -12,6 +12,8 @@ import net.minecraft.world.World;
import java.util.Random; import java.util.Random;
import static com.sosnitzka.taiga.Items.lignite; 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 { public class BlockLignite extends BasicBlock {
@@ -35,6 +37,12 @@ public class BlockLignite extends BasicBlock {
@Override @Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) { public Item getItemDropped(IBlockState state, Random rand, int fortune) {
int r = RANDOM.nextInt(3);
if (r == 0) {
return lignite; return lignite;
} else if (r == 1) {
return lignite2;
} else
return lignite3;
} }
} }

6
src/main/java/com/sosnitzka/taiga/generic/BasicItem.java
View File

@@ -11,6 +11,12 @@ public class BasicItem extends Item {
this.oreDictPrefix = oreDictPrefix; this.oreDictPrefix = oreDictPrefix;
} }
public BasicItem(String name, String oreDictPrefix, String registryname) {
setUnlocalizedName(name);
setRegistryName(registryname);
this.oreDictPrefix = oreDictPrefix;
}
public BasicItem(String name) { public BasicItem(String name) {
this(name, null); this(name, null);
} }

4
src/main/java/com/sosnitzka/taiga/items/ItemLignite.java
View File

@@ -4,8 +4,8 @@ import com.sosnitzka.taiga.generic.BasicItem;
public class ItemLignite extends BasicItem { public class ItemLignite extends BasicItem {
public ItemLignite() { public ItemLignite(String name, String registry) {
super("lignite"); super(name, null, registry);
} }
} }

18
src/main/java/com/sosnitzka/taiga/util/FuelHandler.java
View File

@@ -2,24 +2,28 @@ package com.sosnitzka.taiga.util;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.IFuelHandler; 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.*;
import static com.sosnitzka.taiga.Items.glimmercoal; import static slimeknights.tconstruct.TConstruct.random;
import static com.sosnitzka.taiga.Items.lignite;
public class FuelHandler implements IFuelHandler { public class FuelHandler implements IFuelHandler {
@Override @Override
public int getBurnTime(ItemStack fuel) { public int getBurnTime(ItemStack fuel) {
if (fuel.getItem().equals(lignite)) { 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)) { 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)) { 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; return 0;
} }