-
Notifications
You must be signed in to change notification settings - Fork 287
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into collisions
- Loading branch information
Showing
36 changed files
with
348 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package gtPlusPlus.core.block.fuel; | ||
|
|
||
| import static gregtech.api.enums.Mods.GTPlusPlus; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.material.Material; | ||
| import net.minecraft.client.renderer.texture.IIconRegister; | ||
| import net.minecraft.creativetab.CreativeTabs; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.IIcon; | ||
|
|
||
| import cpw.mods.fml.common.registry.GameRegistry; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; | ||
| import gtPlusPlus.core.util.minecraft.ItemUtils; | ||
|
|
||
| public class BlockCactusCharcoal extends Block { | ||
|
|
||
| private final IIcon[] textureArray = new IIcon[6]; | ||
|
|
||
| public BlockCactusCharcoal() { | ||
| super(Material.rock); | ||
| this.setBlockName("blockCactusCharcoal"); | ||
| this.setStepSound(soundTypeStone); | ||
| GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCactusCharcoal"); | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void registerBlockIcons(IIconRegister iconRegister) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockCactusCharcoal" + i); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public IIcon getIcon(int side, int meta) { | ||
| return this.textureArray[meta]; | ||
| } | ||
|
|
||
| @Override | ||
| public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| ItemStack is = new ItemStack(item, 1, i); | ||
| ItemUtils.registerFuel(is, 4000 * (int) Math.pow(9, i)); | ||
| list.add(is); | ||
| } | ||
| } | ||
|
|
||
| } |
55 changes: 55 additions & 0 deletions
55
src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package gtPlusPlus.core.block.fuel; | ||
|
|
||
| import static gregtech.api.enums.Mods.GTPlusPlus; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.material.Material; | ||
| import net.minecraft.client.renderer.texture.IIconRegister; | ||
| import net.minecraft.creativetab.CreativeTabs; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.IIcon; | ||
|
|
||
| import cpw.mods.fml.common.registry.GameRegistry; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; | ||
| import gtPlusPlus.core.util.minecraft.ItemUtils; | ||
|
|
||
| public class BlockCactusCoke extends Block { | ||
|
|
||
| private final IIcon[] textureArray = new IIcon[6]; | ||
|
|
||
| public BlockCactusCoke() { | ||
| super(Material.rock); | ||
| this.setBlockName("blockCactusCoke"); | ||
| this.setStepSound(soundTypeStone); | ||
| GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCactusCoke"); | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void registerBlockIcons(IIconRegister iconRegister) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockCactusCoke" + i); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public IIcon getIcon(int side, int meta) { | ||
| return this.textureArray[meta]; | ||
| } | ||
|
|
||
| @Override | ||
| public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| ItemStack is = new ItemStack(item, 1, i); | ||
| ItemUtils.registerFuel(is, 8000 * (int) Math.pow(9, i)); | ||
| list.add(is); | ||
| } | ||
| } | ||
|
|
||
| } |
55 changes: 55 additions & 0 deletions
55
src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package gtPlusPlus.core.block.fuel; | ||
|
|
||
| import static gregtech.api.enums.Mods.GTPlusPlus; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.material.Material; | ||
| import net.minecraft.client.renderer.texture.IIconRegister; | ||
| import net.minecraft.creativetab.CreativeTabs; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.IIcon; | ||
|
|
||
| import cpw.mods.fml.common.registry.GameRegistry; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; | ||
| import gtPlusPlus.core.util.minecraft.ItemUtils; | ||
|
|
||
| public class BlockSugarCharcoal extends Block { | ||
|
|
||
| private final IIcon[] textureArray = new IIcon[6]; | ||
|
|
||
| public BlockSugarCharcoal() { | ||
| super(Material.rock); | ||
| this.setBlockName("blockSugarCharcoal"); | ||
| this.setStepSound(soundTypeStone); | ||
| GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockSugarCharcoal"); | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void registerBlockIcons(IIconRegister iconRegister) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockSugarCharcoal" + i); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public IIcon getIcon(int side, int meta) { | ||
| return this.textureArray[meta]; | ||
| } | ||
|
|
||
| @Override | ||
| public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| ItemStack is = new ItemStack(item, 1, i); | ||
| ItemUtils.registerFuel(is, 4000 * (int) Math.pow(9, i)); | ||
| list.add(is); | ||
| } | ||
| } | ||
|
|
||
| } |
55 changes: 55 additions & 0 deletions
55
src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package gtPlusPlus.core.block.fuel; | ||
|
|
||
| import static gregtech.api.enums.Mods.GTPlusPlus; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.material.Material; | ||
| import net.minecraft.client.renderer.texture.IIconRegister; | ||
| import net.minecraft.creativetab.CreativeTabs; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.IIcon; | ||
|
|
||
| import cpw.mods.fml.common.registry.GameRegistry; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; | ||
| import gtPlusPlus.core.util.minecraft.ItemUtils; | ||
|
|
||
| public class BlockSugarCoke extends Block { | ||
|
|
||
| private final IIcon[] textureArray = new IIcon[6]; | ||
|
|
||
| public BlockSugarCoke() { | ||
| super(Material.rock); | ||
| this.setBlockName("blockSugarCoke"); | ||
| this.setStepSound(soundTypeStone); | ||
| GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockSugarCoke"); | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void registerBlockIcons(IIconRegister iconRegister) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockSugarCoke" + i); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public IIcon getIcon(int side, int meta) { | ||
| return this.textureArray[meta]; | ||
| } | ||
|
|
||
| @Override | ||
| public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) { | ||
| for (int i = 0; i < textureArray.length; i++) { | ||
| ItemStack is = new ItemStack(item, 1, i); | ||
| ItemUtils.registerFuel(is, 8000 * (int) Math.pow(9, i)); | ||
| list.add(is); | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.