Skip to content

Commit e460af1

Browse files
committed
Merge remote-tracking branch 'origin/firestone' into dev
2 parents 1ae3e85 + 01a3aad commit e460af1

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

dependencies.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ dependencies {
2727

2828
runtimeOnly('com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev')
2929
runtimeOnly('com.github.GTNewHorizons:Railcraft:9.16.32:dev') {transitive=false}
30+
3031
}

src/main/java/witchinggadgets/common/items/ItemClusters.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
import net.minecraft.util.StatCollector;
1212
import net.minecraftforge.oredict.OreDictionary;
1313

14+
import cpw.mods.fml.common.Optional;
1415
import gregtech.api.enums.Materials;
16+
import mods.railcraft.common.items.firestone.IItemFirestoneBurning;
1517
import witchinggadgets.WitchingGadgets;
1618
import witchinggadgets.common.WGConfig;
1719
import witchinggadgets.common.WGContent;
1820

19-
public class ItemClusters extends Item {
21+
@Optional.Interface(iface = "mods.railcraft.common.items.firestone.IItemFirestoneBurning", modid = "Railcraft")
22+
public class ItemClusters extends Item implements IItemFirestoneBurning {
2023

2124
@Deprecated
2225
public static String[] subNames = {
@@ -158,4 +161,18 @@ public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> itemList) {
158161
itemList.add(new ItemStack(item, 1, iOre));
159162
}
160163
}
164+
165+
@Override
166+
@Optional.Method(modid = "Railcraft")
167+
public boolean shouldBurn(ItemStack itemStack) {
168+
if (itemStack != null) {
169+
int dmg = itemStack.getItemDamage();
170+
// This should be safe since mDefaultLocalName gets inserted into GT_Cluster at
171+
// {@link WGContent#initGTClusters()} directly and the firestone Material name
172+
// is a literal inside gregtechs MaterialsInit1 class
173+
return (dmg < witchinggadgets.common.WGContent.GT_Cluster.length
174+
&& witchinggadgets.common.WGContent.GT_Cluster[dmg] == Materials.Firestone.mDefaultLocalName);
175+
}
176+
return false;
177+
}
161178
}

0 commit comments

Comments
 (0)