diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-07-26 19:43:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-26 19:43:29 +0200 |
| commit | a1bc16ae700db9a0445e707bc95ed9f21fcb13f9 (patch) | |
| tree | bd64d8a4e8577606895c8fb4344d2de580a4b5d4 /src/main/java/gregtech/api/interfaces | |
| parent | eeab702de4c84effbe22fd0a78b96deae1a31def (diff) | |
| parent | 7a872dfad2b018869e2790573196a3dfc12cafe9 (diff) | |
| download | GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.gz GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.bz2 GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.zip | |
Merge branch 'new-features' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index c318429204..26c7604b3e 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -161,7 +161,7 @@ public interface IGT_RecipeAdder { public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, boolean hidden); - + /** * Adds a CNC-Machine Recipe * @@ -387,7 +387,7 @@ public interface IGT_RecipeAdder { * Adds a Recipe for Fluid Smelting */ public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt); - + /** * Adds a Recipe for Fluid Smelting */ @@ -453,7 +453,7 @@ public interface IGT_RecipeAdder { */ public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden); - + /** * Adds a Recipe for the GT Pulveriser. (up to 4 Outputs) */ diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java index ea46c9cc11..048ddbdd06 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java @@ -1,10 +1,11 @@ package gregtech.api.interfaces.tileentity; import gregtech.api.interfaces.ITexture; +import net.minecraft.block.Block; public interface ITexturedTileEntity { /** * @return the Textures rendered by the GT Rendering */ - public ITexture[] getTexture(byte aSide); + public ITexture[] getTexture(Block aBlock, byte aSide); }
\ No newline at end of file |