diff options
Diffstat (limited to 'src/Java/gregtech/api')
| -rw-r--r-- | src/Java/gregtech/api/enums/TAE.java | 10 | ||||
| -rw-r--r-- | src/Java/gregtech/api/util/CustomRecipeMap.java | 4 | ||||
| -rw-r--r-- | src/Java/gregtech/api/util/EmptyRecipeMap.java | 4 | ||||
| -rw-r--r-- | src/Java/gregtech/api/util/FishPondFakeRecipe.java | 7 | ||||
| -rw-r--r-- | src/Java/gregtech/api/util/HotFuel.java | 1 | ||||
| -rw-r--r-- | src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java | 5 | ||||
| -rw-r--r-- | src/Java/gregtech/api/util/Recipe_GT.java | 7 |
7 files changed, 25 insertions, 13 deletions
diff --git a/src/Java/gregtech/api/enums/TAE.java b/src/Java/gregtech/api/enums/TAE.java index 248722269b..0abc5db38a 100644 --- a/src/Java/gregtech/api/enums/TAE.java +++ b/src/Java/gregtech/api/enums/TAE.java @@ -2,10 +2,9 @@ package gregtech.api.enums; import java.lang.reflect.Field; -import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_CopiedBlockTexture; -import gregtech.api.objects.GT_RenderedTexture; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -95,4 +94,11 @@ public class TAE { } return (64+ID); } + + public static int getIndexFromPage(int page, int blockMeta) { + int id = 64; + id += (page == 0 ? 0 : page == 1 ? 16 : page == 2 ? 32 : page == 3 ? 48 : page == 4 ? 64 : 0); + id += blockMeta; + return id; + } } diff --git a/src/Java/gregtech/api/util/CustomRecipeMap.java b/src/Java/gregtech/api/util/CustomRecipeMap.java index 5096947886..a39050b4e0 100644 --- a/src/Java/gregtech/api/util/CustomRecipeMap.java +++ b/src/Java/gregtech/api/util/CustomRecipeMap.java @@ -4,11 +4,13 @@ import static gregtech.api.enums.GT_Values.*; import java.util.*; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; + import gtPlusPlus.api.objects.Logger; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gregtech/api/util/EmptyRecipeMap.java b/src/Java/gregtech/api/util/EmptyRecipeMap.java index 60da5c3d0a..31e1e3db17 100644 --- a/src/Java/gregtech/api/util/EmptyRecipeMap.java +++ b/src/Java/gregtech/api/util/EmptyRecipeMap.java @@ -2,8 +2,10 @@ package gregtech.api.util; import java.util.Collection; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import net.minecraft.item.ItemStack; + +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; + import net.minecraftforge.fluids.FluidStack; public class EmptyRecipeMap extends GT_Recipe_Map{ diff --git a/src/Java/gregtech/api/util/FishPondFakeRecipe.java b/src/Java/gregtech/api/util/FishPondFakeRecipe.java index d8661c23bd..e8032d63d5 100644 --- a/src/Java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/Java/gregtech/api/util/FishPondFakeRecipe.java @@ -2,12 +2,13 @@ package gregtech.api.util; import java.util.ArrayList; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomFishable; + import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.array.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomFishable; import net.minecraftforge.common.FishingHooks; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gregtech/api/util/HotFuel.java b/src/Java/gregtech/api/util/HotFuel.java index 62aaceeaad..746ff68382 100644 --- a/src/Java/gregtech/api/util/HotFuel.java +++ b/src/Java/gregtech/api/util/HotFuel.java @@ -1,6 +1,7 @@ package gregtech.api.util; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; public class HotFuel { diff --git a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java index a93748390b..7f241b1178 100644 --- a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java +++ b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java @@ -3,12 +3,13 @@ package gregtech.api.util; import java.util.ArrayList; import java.util.Collection; -import gregtech.api.util.GT_Recipe; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_Recipe.GT_Recipe_Map; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index 5a7121397c..1eb385ed68 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -4,15 +4,14 @@ import static gregtech.api.enums.GT_Values.*; import java.util.*; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map_Assembler; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.item.ItemUtils; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; |
