diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-27 14:13:50 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-11-27 14:13:50 +1000 |
| commit | 2f23943b0c802ce4439ee166e7eb258bd93f0eea (patch) | |
| tree | 237d34ebc9ee4710e0013cd72660c7f4baee5cd1 /src | |
| parent | 5d4f2648ceb147aae7ce00241ebfb34919dbb1bf (diff) | |
| download | GT5-Unofficial-2f23943b0c802ce4439ee166e7eb258bd93f0eea.tar.gz GT5-Unofficial-2f23943b0c802ce4439ee166e7eb258bd93f0eea.tar.bz2 GT5-Unofficial-2f23943b0c802ce4439ee166e7eb258bd93f0eea.zip | |
$ 5.08.33 compat.
Diffstat (limited to 'src')
4 files changed, 21 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 365218e28e..959513e62a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -290,7 +290,7 @@ public class RECIPES_GREGTECH { }, FluidUtils.getFluidStack("molten.tungstencarbide", 2*144), 0, - MathUtils.findPercentageOfInt((int) Math.max(Materials.TungstenCarbide.getMass() / 40L, 1L) * Materials.TungstenCarbide.mBlastFurnaceTemp, 80), + MathUtils.findPercentageOfInt((int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) * Materials.get("TungstenCarbide").mBlastFurnaceTemp, 80), 480); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java index fcefd101b2..7b4cf471b0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java @@ -10,12 +10,12 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.objects.XSTR; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.xmod.gregtech.api.objects.XSTR; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java index 04bcd5e0dc..eb7b1eb712 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java @@ -53,7 +53,7 @@ public class GregtechMetaTileEntityGeneratorArray extends GT_MetaTileEntity_Mult public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[48], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[48], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[48]}; } diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java new file mode 100644 index 0000000000..5366eb9cec --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java @@ -0,0 +1,18 @@ +package gtPlusPlus.xmod.thaumcraft.common.tile; + +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.util.Utils; + +public class TCTileEntities { + + @Optional.Method(modid = "Thaumcraft") + public static void init() { + Utils.LOG_INFO("Registering TC Tile Entities."); + if (LoadedMods.Thaumcraft){ + GameRegistry.registerTileEntity(TileFastAlchemyFurnace.class, "TileFastAlchemyFurnace"); + GameRegistry.registerTileEntity(TileFastArcaneAlembic.class, "TileFastArcaneAlembic"); + } + } + }
\ No newline at end of file |