diff options
14 files changed, 74 insertions, 1599 deletions
diff --git a/build.gradle b/build.gradle index 9e9c7b7640..ca971dba7d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ buildscript { repositories { + jcenter() mavenCentral() maven { name = "forge" @@ -9,14 +10,21 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { + url = "https://plugins.gradle.org/m2/" + } } dependencies { classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT" + classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.55" } } apply plugin: "forge" apply plugin: "idea" +apply plugin: "java" +apply plugin: "maven" +apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin" idea { module { inheritOutputDirs = true } } @@ -29,25 +37,52 @@ sourceSets { } configurations { - fatJar + //fatJar } dependencies { - compile files('mods/gregtech-5.09.32-dev.jar') - compile files('mods/industrialcraft-2-2.2.720-experimental-dev.jar') compile fileTree(dir: 'libs', include: '*.jar') - fatJar files('libs/Segment-2.1.1.jar') + testCompile 'junit:junit:4.12' + //fatJar files('libs/Segment-2.1.1.jar') } +//Java Version sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +//Jar Info archivesBaseName = "GT-PlusPlus" -version = "1.7.0-prerelease-17-early" +version = "1.7.0-prerelease-19-early-test2" minecraft.version = "1.7.10-10.13.4.1614-1.7.10" +//Gradle Tweak +//Prevent java 8's strict doclint for javadocs from failing builds +allprojects { + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } +} + +//Maven +repositories { + maven { + name = "ic2" + url = "http://maven.ic2.player.to/" + } +} + +task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) { + file = new File("CHANGELOG.md"); + untaggedName = "Current release ${project.version}" + fromCommit = "1e6bf5e889344acabacec633f7be1aabcfbf4e0e" + toRef = "HEAD" + templateContent = file('changelog.mustache').getText('UTF-8') +} + +//task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) { +// file = new File("CHANGELOG.md"); +// templateContent = file('changelog.mustache').getText('UTF-8'); +//} jar { archiveName = archivesBaseName + "-" + version + ".jar" @@ -55,7 +90,7 @@ jar { attributes 'FMLCorePlugin': 'gtPlusPlus.preloader.asm.Preloader_FMLLoadingPlugin' attributes 'FMLCorePluginContainsFMLMod': 'true' } - from configurations.fatJar.collect { it.isDirectory() ? it : zipTree(it) } + //from configurations.fatJar.collect { it.isDirectory() ? it : zipTree(it) } } @@ -79,16 +114,30 @@ task devJar(type: Jar) { artifacts { archives devJar + archives sourceJar } +build.finalizedBy(gitChangelogTask) + processResources { - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - include 'pack.mcmeta' - expand 'version': project.version, 'mcversion': project.minecraft.version - } - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - exclude 'pack.mcmeta' - } + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + exclude '**/*.md' + } +} + +def getBuildNumber() { + return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0" }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java index e03acf2ed5..1dc70a9360 100644 --- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java @@ -22,9 +22,6 @@ import gtPlusPlus.core.inventories.BaseInventoryGrindle; import gtPlusPlus.core.tileentities.base.TileEntityBase; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import gtPlusPlus.core.tileentities.machines.*; -import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastAlchemyFurnace; -import gtPlusPlus.xmod.thaumcraft.gui.ContainerFastAlchemyFurnace; -import gtPlusPlus.xmod.thaumcraft.gui.GuiFastAlchemyFurnace; public class GuiHandler implements IGuiHandler { @@ -84,7 +81,7 @@ public class GuiHandler implements IGuiHandler { return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te); } else if (ID == GUI8){ - return new ContainerFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te); + //return new ContainerFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te); } } @@ -136,7 +133,7 @@ public class GuiHandler implements IGuiHandler { return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner()); } else if (ID == GUI8){ - return new GuiFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te); + //return new GuiFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te); } } diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java index af778e261a..d8218d9249 100644 --- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -6,7 +6,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.general.*; import gtPlusPlus.core.tileentities.machines.*; -import gtPlusPlus.xmod.thaumcraft.common.tile.TCTileEntities; public class ModTileEntities { @@ -26,7 +25,7 @@ public class ModTileEntities { //Mod TEs if (LoadedMods.Thaumcraft){ - TCTileEntities.init(); + } } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java index a33ea101c2..813ebcbe25 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java @@ -5,7 +5,6 @@ import java.util.List; import org.apache.commons.lang3.reflect.FieldUtils; -import com.google.common.collect.ImmutableMap; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -23,7 +22,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import forestry.api.core.Tabs; -import forestry.api.recipes.RecipeManagers; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -135,17 +133,17 @@ public class ItemCustomComb extends Item { } public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance){ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); + //RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); } public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000, chance2 * 100 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f)); + //RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f)); } public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2, ItemStack aOutput3, int chance3){ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000, chance2 * 100, chance3*100 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f,aOutput3,chance3*0.01f)); + //RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f,aOutput3,chance3*0.01f)); } public void addProcess(ItemStack tComb, Materials aMaterial, int chance){ @@ -154,7 +152,7 @@ public class ItemCustomComb extends Item { GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384); }else{ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); + //RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); } } @@ -164,7 +162,7 @@ public class ItemCustomComb extends Item { GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 10000, (int) (aOutMaterial.getMass() * 128), 384); }else{ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); + //RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); } } diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index 529d9349d9..77a9054c8f 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.internal.IThaumcraftCompat; import gregtech.api.util.GT_Utility; @@ -15,7 +14,6 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects.TC_AspectStack_Ex; -import gtPlusPlus.xmod.thaumcraft.common.block.TC_BlockHandler; import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils; public class HANDLER_Thaumcraft { @@ -29,7 +27,6 @@ public class HANDLER_Thaumcraft { public static void preInit(){ if (LoadedMods.Thaumcraft){ - TC_BlockHandler.run(); } } diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java deleted file mode 100644 index 55baf19276..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java +++ /dev/null @@ -1,36 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; - -public class ItemBlockThaumcraft extends ItemBlockEntityBase{ - - public ItemBlockThaumcraft(final Block block) { - super(block); - } - - @Override - public int getMetadata(final int par1) { - return par1; - } - - @Override - public String getUnlocalizedName(final ItemStack par1ItemStack) { - return super.getUnlocalizedName() + "." + par1ItemStack.getItemDamage(); - } - - @Override - public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x, - final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, - final int metadata) { - final boolean ret = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); - return ret; - } - - - -} diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/BlockFastAlchemyFurnace.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/BlockFastAlchemyFurnace.java deleted file mode 100644 index a70710fa3f..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/BlockFastAlchemyFurnace.java +++ /dev/null @@ -1,252 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common.block; - -import java.util.List; -import java.util.Random; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.xmod.thaumcraft.common.ItemBlockThaumcraft; -import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastAlchemyFurnace; -import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.common.lib.utils.InventoryUtils; - -public class BlockFastAlchemyFurnace extends BlockContainer { - - public IIcon[] iconFurnace; - public IIcon[] iconPedestal; - - public BlockFastAlchemyFurnace() { - super(Material.iron); - this.iconFurnace = new IIcon[5]; - this.iconPedestal = new IIcon[2]; - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setBlockName("blockFastAlchemyFurnace"); - this.setHardness(3.0f); - this.setResistance(25.0f); - this.setStepSound(Block.soundTypeStone); - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - GameRegistry.registerBlock(this, ItemBlockThaumcraft.class, "blockFastAlchemyFurnace"); - LanguageRegistry.addName(this, "Upgraded Alchemical Furnace"); - } - - @Override - public int getLightValue(final IBlockAccess world, final int x, final int y, final int z) { - final Block block = world.getBlock(x, y, z); - if (block != this) - { - return block.getLightValue(world, x, y, z); - } - /** - * Gets the light value of the specified block coords. Args: x, y, z - */ - return this.getLightValue(); - } - - @Override - public int damageDropped(final int metadata) { - return 0; - } - - @Override - public TileEntity createTileEntity(final World world, final int metadata) { - if (metadata == 0){ - return new TileFastAlchemyFurnace(); - } - return null; - } - - @Override - public TileEntity createNewTileEntity(final World var1, final int md) { - return null; - } - - @Override - public int getComparatorInputOverride(final World world, final int x, final int y, final int z, final int rs) { - final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileFastAlchemyFurnace)) { - return Container.calcRedstoneFromInventory((IInventory) te); - } - return 0; - } - - @Override - public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, - final int side, final float par7, final float par8, final float par9) { - - if (world.isRemote) { - return true; - } - - final int metadata = world.getBlockMetadata(x, y, z); - final TileEntity tileEntity = world.getTileEntity(x, y, z); - - if ((metadata == 0) && (tileEntity instanceof TileFastAlchemyFurnace) && !player.isSneaking()) { - player.openGui(GTplusplus.instance, GuiHandler.GUI8, world, x, y, z); - return true; - } - return false; - } - - - @Override - public void addCollisionBoxesToList(final World world, final int i, final int j, final int k, - final AxisAlignedBB axisalignedbb, final List arraylist, final Entity par7Entity) { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); - } - - @Override - public void setBlockBoundsBasedOnState(final IBlockAccess world, final int i, final int j, final int k) { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - super.setBlockBoundsBasedOnState(world, i, j, k); - } - - @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, - final int par5, final int par6) { - /*if (par5 == 1) { - if (par1World.isRemote) { - Thaumcraft.proxy.blockSparkle(par1World, par2, par3, par4, 11960575, 2); - par1World.playAuxSFX(2001, par2, par3, par4, Block.getIdFromBlock(Blocks.stonebrick) + 0); - } - return true; - }*/ - return super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - } - - @Override - public boolean isSideSolid(final IBlockAccess world, final int x, final int y, final int z, - final ForgeDirection side) { - return super.isSideSolid(world, x, y, z, side); - } - - @Override - public boolean hasComparatorInputOverride() { - return true; - } - - @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, - final int par6) { - InventoryUtils.dropItems(par1World, par2, par3, par4); - super.breakBlock(par1World, par2, par3, par4, par5, par6); - } - - @Override - public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block par5) { - final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileFastAlchemyFurnace)) { - ((TileFastAlchemyFurnace) te).getBellows(); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(final World w, final int i, final int j, final int k, final Random r) { - final TileEntity te = w.getTileEntity(i, j, k); - if ((te != null) && (te instanceof TileFastAlchemyFurnace) && ((TileFastAlchemyFurnace) te).isBurning()) { - final float f = i + 0.5f; - final float f2 = j + 0.2f + ((r.nextFloat() * 5.0f) / 16.0f); - final float f3 = k + 0.5f; - final float f4 = 0.52f; - final float f5 = (r.nextFloat() * 0.5f) - 0.25f; - w.spawnParticle("smoke", f - f4, f2, f3 + f5, 0.0, 0.0, 0.0); - w.spawnParticle("flame", f - f4, f2, f3 + f5, 0.0, 0.0, 0.0); - w.spawnParticle("smoke", f + f4, f2, f3 + f5, 0.0, 0.0, 0.0); - w.spawnParticle("flame", f + f4, f2, f3 + f5, 0.0, 0.0, 0.0); - w.spawnParticle("smoke", f + f5, f2, f3 - f4, 0.0, 0.0, 0.0); - w.spawnParticle("flame", f + f5, f2, f3 - f4, 0.0, 0.0, 0.0); - w.spawnParticle("smoke", f + f5, f2, f3 + f4, 0.0, 0.0, 0.0); - w.spawnParticle("flame", f + f5, f2, f3 + f4, 0.0, 0.0, 0.0); - } - } - - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister ir) { - this.iconPedestal[0] = ir.registerIcon("thaumcraft:pedestal_side"); - this.iconPedestal[1] = ir.registerIcon("thaumcraft:pedestal_top"); - this.iconFurnace[0] = ir.registerIcon("thaumcraft:al_furnace_side"); - this.iconFurnace[1] = ir.registerIcon("thaumcraft:al_furnace_top"); - this.iconFurnace[2] = ir.registerIcon("thaumcraft:al_furnace_front_off"); - this.iconFurnace[3] = ir.registerIcon("thaumcraft:al_furnace_front_on"); - this.iconFurnace[4] = ir.registerIcon("thaumcraft:al_furnace_top_filled"); - } - - /*@Override - public int getRenderType() { - return ConfigBlocks.blockStoneDeviceRI; - }*/ - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public IIcon getIcon(final int side, final int md) { - if (md == 0) { - if (side == 1) { - return this.iconFurnace[1]; - } - if (side > 1) { - return this.iconFurnace[2]; - } - } else if (md == 1) { - if (side <= 1) { - return this.iconPedestal[1]; - } - if (side > 1) { - return this.iconPedestal[0]; - } - } - return this.iconPedestal[1]; - } - - @Override - public IIcon getIcon(final IBlockAccess iblockaccess, final int i, final int j, final int k, final int side) { - final int metadata = iblockaccess.getBlockMetadata(i, j, k); - if (metadata == 0) { - final TileEntity te = iblockaccess.getTileEntity(i, j, k); - if (side == 1) { - if ((te != null) && (te instanceof TileFastAlchemyFurnace) && (((TileFastAlchemyFurnace) te).vis > 0)) { - return this.iconFurnace[4]; - } - return this.iconFurnace[1]; - } else if (side > 1) { - if ((te != null) && (te instanceof TileFastAlchemyFurnace) && ((TileFastAlchemyFurnace) te).isBurning()) { - return this.iconFurnace[3]; - } - return this.iconFurnace[2]; - } - } - return this.iconFurnace[0]; - } - -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/BlockFastArcaneAlembic.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/BlockFastArcaneAlembic.java deleted file mode 100644 index 7a19b5798e..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/BlockFastArcaneAlembic.java +++ /dev/null @@ -1,371 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common.block; - -import java.util.List; -import java.util.Random; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.xmod.thaumcraft.common.ItemBlockThaumcraft; -import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastArcaneAlembic; -import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.IEssentiaContainerItem; -import thaumcraft.common.blocks.ItemJarFilled; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.lib.utils.InventoryUtils; - -public class BlockFastArcaneAlembic extends BlockContainer { - public IIcon[] icon; - public IIcon iconGlow; - private final int delay; - - public BlockFastArcaneAlembic() { - super(Material.iron); - this.icon = new IIcon[23]; - this.delay = 0; - this.setStepSound(Block.soundTypeMetal); - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setBlockName("blockFastArcaneAlembic"); - this.setHardness(3.0f); - this.setResistance(25.0f); - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - GameRegistry.registerBlock(this, ItemBlockThaumcraft.class, "blockFastArcaneAlembic"); - LanguageRegistry.addName(this, "Upgraded Arcane Alembic"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister ir) { - this.icon[0] = ir.registerIcon("thaumcraft:metalbase"); - for (int a = 1; a <= 6; ++a) { - this.icon[a] = ir.registerIcon("thaumcraft:crucible" + a); - } - this.icon[7] = ir.registerIcon("thaumcraft:goldbase"); - this.iconGlow = ir.registerIcon("thaumcraft:animatedglow"); - } - - @Override - public IIcon getIcon(final int i, final int md) { - return ((md == 0) || (md == 1) || (md == 5) || (md == 6)) ? this.icon[0] : this.icon[7]; - } - - @Override - public IIcon getIcon(final IBlockAccess iblockaccess, final int i, final int j, final int k, final int side) { - if (side == 1) { - return this.icon[1]; - } - if (side == 0) { - return this.icon[2]; - } - return this.icon[3]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - par3List.add(new ItemStack(par1, 1, 1)); - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public void onEntityCollidedWithBlock(final World world, final int i, final int j, final int k, - final Entity entity) { - if (!world.isRemote) { - - } - } - - @Override - public void addCollisionBoxesToList(final World world, final int i, final int j, final int k, - final AxisAlignedBB axisalignedbb, final List arraylist, final Entity par7Entity) { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(final World w, final int i, final int j, final int k, final Random r) { - - } - - @Override - public int damageDropped(final int metadata) { - return metadata; - } - - @Override - public TileEntity createTileEntity(final World world, final int metadata) { - - if (metadata == 1) { - return new TileFastArcaneAlembic(); - } - return super.createTileEntity(world, metadata); - } - - @Override - public boolean hasComparatorInputOverride() { - return true; - } - - @Override - public int getComparatorInputOverride(final World world, final int x, final int y, final int z, final int rs) { - final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileFastArcaneAlembic)) { - final float r = ((TileFastArcaneAlembic) te).amount / ((TileFastArcaneAlembic) te).maxAmount; - return MathHelper.floor_float(r * 14.0f) + ((((TileFastArcaneAlembic) te).amount > 0) ? 1 : 0); - } - return 0; - } - - @Override - public TileEntity createNewTileEntity(final World var1, final int md) { - return null; - } - - @Override - public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block nbid) { - final TileEntity te = world.getTileEntity(x, y, z); - if (!world.isRemote) { - if ((te != null) && (te instanceof TileFastArcaneAlembic)) { - world.markBlockForUpdate(x, y, z); - } - } - super.onNeighborBlockChange(world, x, y, z, nbid); - } - - @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, - final int par6) { - InventoryUtils.dropItems(par1World, par2, par3, par4); - final TileEntity te = par1World.getTileEntity(par2, par3, par4); - if ((te != null) && (te instanceof TileFastArcaneAlembic) && (((TileFastArcaneAlembic) te).aspectFilter != null)) { - par1World.spawnEntityInWorld(new EntityItem(par1World, par2 + 0.5f, - par3 + 0.5f, par4 + 0.5f, new ItemStack(ConfigItems.itemResource, 1, 13))); - } - super.breakBlock(par1World, par2, par3, par4, par5, par6); - } - - @Override - public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, - final int side, final float par7, final float par8, final float par9) { - final int metadata = world.getBlockMetadata(x, y, z); - - if ((metadata == 1) && !world.isRemote && !player.isSneaking() && (player.getHeldItem() == null)) { - final TileEntity te2 = world.getTileEntity(x, y, z); - if ((te2 != null) && (te2 instanceof TileFastArcaneAlembic)) { - final TileFastArcaneAlembic tile2 = (TileFastArcaneAlembic) te2; - String msg = ""; - if ((tile2.aspect == null) || (tile2.amount == 0)) { - msg = StatCollector.translateToLocal("tile.alembic.msg.1"); - } else if (tile2.amount < (tile2.maxAmount * 0.4)) { - msg = StatCollector.translateToLocal("tile.alembic.msg.2"); - } else if (tile2.amount < (tile2.maxAmount * 0.8)) { - msg = StatCollector.translateToLocal("tile.alembic.msg.3"); - } else if (tile2.amount < tile2.maxAmount) { - msg = StatCollector.translateToLocal("tile.alembic.msg.4"); - } else if (tile2.amount == tile2.maxAmount) { - msg = StatCollector.translateToLocal("tile.alembic.msg.5"); - } - player.addChatMessage(new ChatComponentTranslation("ยง3" + msg, new Object[0])); - world.playSoundEffect(x, y, z, "thaumcraft:alembicknock", 0.2f, 1.0f); - } - } - if (metadata == 1) { - final TileEntity te2 = world.getTileEntity(x, y, z); - if ((te2 != null) && (te2 instanceof TileFastArcaneAlembic)) { - if (player.isSneaking() && (((TileFastArcaneAlembic) te2).aspectFilter != null)) { - ((TileFastArcaneAlembic) te2).aspectFilter = null; - world.markBlockForUpdate(x, y, z); - te2.markDirty(); - if (world.isRemote) { - world.playSound(x + 0.5f, y + 0.5f, z + 0.5f, - "thaumcraft:page", 1.0f, 1.1f, false); - } else { - final ForgeDirection fd = ForgeDirection.getOrientation(side); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5f + (fd.offsetX / 3.0f), - y + 0.5f, z + 0.5f + (fd.offsetZ / 3.0f), - new ItemStack(ConfigItems.itemResource, 1, 13))); - } - return true; - } - if (player.isSneaking() && (player.getHeldItem() == null)) { - ((TileFastArcaneAlembic) te2).amount = 0; - ((TileFastArcaneAlembic) te2).aspect = null; - if (world.isRemote) { - world.playSound(x + 0.5f, y + 0.5f, z + 0.5f, - "thaumcraft:alembicknock", 0.2f, 1.0f, false); - world.playSound(x + 0.5f, y + 0.5f, z + 0.5f, - "game.neutral.swim", 0.5f, - 1.0f + ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.3f), false); - } - } else if ((player.getHeldItem() != null) && (((TileFastArcaneAlembic) te2).aspectFilter == null) - && (player.getHeldItem().getItem() == ConfigItems.itemResource) - && (player.getHeldItem().getItemDamage() == 13)) { - if ((((TileFastArcaneAlembic) te2).amount == 0) && (((IEssentiaContainerItem) player.getHeldItem().getItem()) - .getAspects(player.getHeldItem()) == null)) { - return true; - } - if ((((TileFastArcaneAlembic) te2).amount == 0) && (((IEssentiaContainerItem) player.getHeldItem().getItem()) - .getAspects(player.getHeldItem()) != null)) { - ((TileFastArcaneAlembic) te2).aspect = ((IEssentiaContainerItem) player.getHeldItem().getItem()) - .getAspects(player.getHeldItem()).getAspects()[0]; - } - final ItemStack heldItem = player.getHeldItem(); - --heldItem.stackSize; - ((TileFastArcaneAlembic) te2).aspectFilter = ((TileFastArcaneAlembic) te2).aspect; - world.markBlockForUpdate(x, y, z); - te2.markDirty(); - if (world.isRemote) { - world.playSound(x + 0.5f, y + 0.5f, z + 0.5f, - "thaumcraft:page", 1.0f, 0.9f, false); - } - return true; - } else if ((player.getHeldItem() != null) && (((TileFastArcaneAlembic) te2).amount > 0) - && ((player.getHeldItem().getItem() == ConfigItems.itemJarFilled) - || player.getHeldItem().isItemEqual(new ItemStack(ConfigBlocks.blockJar, 1, 0)) - || player.getHeldItem().isItemEqual(new ItemStack(ConfigBlocks.blockJar, 1, 3)))) { - boolean doit = false; - ItemStack drop = null; - if (player.getHeldItem().isItemEqual(new ItemStack(ConfigBlocks.blockJar, 1, 0)) - || player.getHeldItem().isItemEqual(new ItemStack(ConfigBlocks.blockJar, 1, 3))) { - drop = new ItemStack(ConfigItems.itemJarFilled, 1, player.getHeldItem().getItemDamage()); - doit = true; - ((ItemJarFilled) drop.getItem()).setAspects(drop, - new AspectList().add(((TileFastArcaneAlembic) te2).aspect, ((TileFastArcaneAlembic) te2).amount)); - ((TileFastArcaneAlembic) te2).amount = 0; - ((TileFastArcaneAlembic) te2).aspect = null; - final ItemStack heldItem2 = player.getHeldItem(); - --heldItem2.stackSize; - if (!player.inventory.addItemStackToInventory(drop) && !world.isRemote) { - world.spawnEntityInWorld( - new EntityItem(world, player.posX, player.posY, player.posZ, drop)); - } - } else { - drop = player.getHeldItem(); - if (((((ItemJarFilled) drop.getItem()).getAspects(drop) == null) - || (((ItemJarFilled) drop.getItem()).getAspects(drop).visSize() == 0) - || (((ItemJarFilled) drop.getItem()).getAspects(drop) - .getAmount(((TileFastArcaneAlembic) te2).aspect) > 0)) - && ((((ItemJarFilled) drop.getItem()).getFilter(drop) == null) - || (((ItemJarFilled) drop.getItem()) - .getFilter(drop) == ((TileFastArcaneAlembic) te2).aspect))) { - int amount = Math.min( - (((ItemJarFilled) drop.getItem()).getAspects(drop) == null) - ? 64 - : (64 - ((ItemJarFilled) drop.getItem()).getAspects(drop).visSize()), - ((TileFastArcaneAlembic) te2).amount); - if (drop.getItemDamage() == 3) { - amount = ((TileFastArcaneAlembic) te2).amount; - } - if (amount > 0) { - final TileFastArcaneAlembic TileFastArcaneAlembic = (TileFastArcaneAlembic) te2; - TileFastArcaneAlembic.amount -= amount; - AspectList as = ((ItemJarFilled) drop.getItem()).getAspects(drop); - if (as == null) { - as = new AspectList(); - } - as.add(((TileFastArcaneAlembic) te2).aspect, amount); - if (as.getAmount(((TileFastArcaneAlembic) te2).aspect) > 64) { - final int q = as.getAmount(((TileFastArcaneAlembic) te2).aspect) - 64; - as.reduce(((TileFastArcaneAlembic) te2).aspect, q); - } - ((ItemJarFilled) drop.getItem()).setAspects(drop, as); - if (((TileFastArcaneAlembic) te2).amount <= 0) { - ((TileFastArcaneAlembic) te2).aspect = null; - } - doit = true; - player.setCurrentItemOrArmor(0, drop); - } - } - } - if (doit) { - te2.markDirty(); - world.markBlockForUpdate(x, y, z); - if (world.isRemote) { - world.playSound(x + 0.5f, y + 0.5f, z + 0.5f, - "game.neutral.swim", 0.5f, - 1.0f + ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.3f), false); - } - } - return true; - } - } - } - - if (world.isRemote) { - return true; - } - - return super.onBlockActivated(world, x, y, z, player, side, par7, par8, par9); - } - - public void onPoweredBlockChange(final World par1World, final int par2, final int par3, final int par4, - final boolean flag) { - final int l = par1World.getBlockMetadata(par2, par3, par4); - if ((l == 5) && flag) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, 6, 2); - par1World.playAuxSFXAtEntity((EntityPlayer) null, 1003, par2, par3, par4, 0); - } else if ((l == 6) && !flag) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, 5, 2); - par1World.playAuxSFXAtEntity((EntityPlayer) null, 1003, par2, par3, par4, 0); - } - } - - @Override - public void onBlockPlacedBy(final World world, final int par2, final int par3, final int par4, - final EntityLivingBase ent, final ItemStack stack) { - final int l = MathHelper.floor_double(((ent.rotationYaw * 4.0f) / 360.0f) + 0.5) & 0x3; - if (stack.getItemDamage() == 1) { - final TileEntity tile = world.getTileEntity(par2, par3, par4); - if (tile instanceof TileFastArcaneAlembic) { - if (l == 0) { - ((TileFastArcaneAlembic) tile).facing = 2; - } - if (l == 1) { - ((TileFastArcaneAlembic) tile).facing = 5; - } - if (l == 2) { - ((TileFastArcaneAlembic) tile).facing = 3; - } - if (l == 3) { - ((TileFastArcaneAlembic) tile).facing = 4; - } - } - } - } - - @Override - public int getLightValue(final IBlockAccess world, final int x, final int y, final int z) { - return super.getLightValue(world, x, y, z); - } -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/TC_BlockHandler.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/TC_BlockHandler.java deleted file mode 100644 index 0b8d18f7d2..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/block/TC_BlockHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common.block; - -import net.minecraft.block.Block; - -public class TC_BlockHandler { - - public static Block blockFastAlchemyFurnace; - public static Block blockFastArcaneAlembic; - - public static void run(){ - blockFastAlchemyFurnace = new BlockFastAlchemyFurnace(); - blockFastArcaneAlembic = new BlockFastArcaneAlembic(); - } - -} diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java deleted file mode 100644 index a6d93edbda..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java +++ /dev/null @@ -1,19 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common.tile; - -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; - -public class TCTileEntities { - - @Optional.Method(modid = "Thaumcraft") - public static void init() { - Logger.INFO("Registering TC Tile Entities."); - if (LoadedMods.Thaumcraft){ - GameRegistry.registerTileEntity(TileFastAlchemyFurnace.class, "TileFastAlchemyFurnace"); - GameRegistry.registerTileEntity(TileFastArcaneAlembic.class, "TileFastArcaneAlembic"); - } - } - }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TileFastAlchemyFurnace.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TileFastAlchemyFurnace.java deleted file mode 100644 index 393bfdcbef..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TileFastAlchemyFurnace.java +++ /dev/null @@ -1,427 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common.tile; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.world.EnumSkyBlock; - -import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.TileThaumcraft; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; -import thaumcraft.common.tiles.TileAlembic; -import thaumcraft.common.tiles.TileBellows; - -public class TileFastAlchemyFurnace extends TileThaumcraft implements ISidedInventory { - private static final int[] slots_bottom; - private static final int[] slots_top; - private static final int[] slots_sides; - public AspectList aspects; - public int vis; - private final int maxVis; - public int smeltTime; - int bellows; - boolean speedBoost; - private ItemStack[] furnaceItemStacks; - public int furnaceBurnTime; - public int currentItemBurnTime; - public int furnaceCookTime; - private String customName; - int count; - - public TileFastAlchemyFurnace() { - this.aspects = new AspectList(); - this.maxVis = 150; - this.smeltTime = 100; - this.bellows = -1; - this.speedBoost = true; - this.furnaceItemStacks = new ItemStack[2]; - this.count = 0; - } - - @Override - public int getSizeInventory() { - return this.furnaceItemStacks.length; - } - - @Override - public ItemStack getStackInSlot(final int par1) { - return this.furnaceItemStacks[par1]; - } - - @Override - public ItemStack decrStackSize(final int par1, final int par2) { - if (this.furnaceItemStacks[par1] == null) { - return null; - } - if (this.furnaceItemStacks[par1].stackSize <= par2) { - final ItemStack itemstack = this.furnaceItemStacks[par1]; - this.furnaceItemStacks[par1] = null; - return itemstack; - } - final ItemStack itemstack = this.furnaceItemStacks[par1].splitStack(par2); - if (this.furnaceItemStacks[par1].stackSize == 0) { - this.furnaceItemStacks[par1] = null; - } - return itemstack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int par1) { - if (this.furnaceItemStacks[par1] != null) { - final ItemStack itemstack = this.furnaceItemStacks[par1]; - this.furnaceItemStacks[par1] = null; - return itemstack; - } - return null; - } - - @Override - public void setInventorySlotContents(final int par1, final ItemStack par2ItemStack) { - this.furnaceItemStacks[par1] = par2ItemStack; - if ((par2ItemStack != null) && (par2ItemStack.stackSize > this.getInventoryStackLimit())) { - par2ItemStack.stackSize = this.getInventoryStackLimit(); - } - } - - @Override - public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.alchemyfurnace"; - } - - @Override - public boolean hasCustomInventoryName() { - return (this.customName != null) && (this.customName.length() > 0); - } - - public void setGuiDisplayName(final String par1Str) { - this.customName = par1Str; - } - - @Override - public void readCustomNBT(final NBTTagCompound nbttagcompound) { - this.furnaceBurnTime = nbttagcompound.getShort("BurnTime"); - this.vis = nbttagcompound.getShort("Vis"); - } - - @Override - public void writeCustomNBT(final NBTTagCompound nbttagcompound) { - nbttagcompound.setShort("BurnTime", (short) this.furnaceBurnTime); - nbttagcompound.setShort("Vis", (short) this.vis); - } - - @Override - public void readFromNBT(final NBTTagCompound nbtCompound) { - super.readFromNBT(nbtCompound); - final NBTTagList nbttaglist = nbtCompound.getTagList("Items", 10); - this.furnaceItemStacks = new ItemStack[this.getSizeInventory()]; - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - final NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - final byte b0 = nbttagcompound1.getByte("Slot"); - if ((b0 >= 0) && (b0 < this.furnaceItemStacks.length)) { - this.furnaceItemStacks[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - this.speedBoost = nbtCompound.getBoolean("speedBoost"); - this.furnaceCookTime = nbtCompound.getShort("CookTime"); - this.currentItemBurnTime = TileEntityFurnace.getItemBurnTime(this.furnaceItemStacks[1]); - if (nbtCompound.hasKey("CustomName")) { - this.customName = nbtCompound.getString("CustomName"); - } - this.aspects.readFromNBT(nbtCompound); - this.vis = this.aspects.visSize(); - } - - @Override - public void writeToNBT(final NBTTagCompound nbtCompound) { - super.writeToNBT(nbtCompound); - nbtCompound.setBoolean("speedBoost", this.speedBoost); - nbtCompound.setShort("CookTime", (short) this.furnaceCookTime); - final NBTTagList nbttaglist = new NBTTagList(); - for (int i = 0; i < this.furnaceItemStacks.length; ++i) { - if (this.furnaceItemStacks[i] != null) { - final NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - this.furnaceItemStacks[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - nbtCompound.setTag("Items", nbttaglist); - if (this.hasCustomInventoryName()) { - nbtCompound.setString("CustomName", this.customName); - } - this.aspects.writeToNBT(nbtCompound); - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @SideOnly(Side.CLIENT) - public int getCookProgressScaled(final int par1) { - if (this.smeltTime <= 0) { - this.smeltTime = 1; - } - return (this.furnaceCookTime * par1) / this.smeltTime; - } - - @SideOnly(Side.CLIENT) - public int getContentsScaled(final int par1) { - return (this.vis * par1) / this.maxVis; - } - - @SideOnly(Side.CLIENT) - public int getBurnTimeRemainingScaled(final int par1) { - if (this.currentItemBurnTime == 0) { - this.currentItemBurnTime = 200; - } - return (this.furnaceBurnTime * par1) / this.currentItemBurnTime; - } - - public boolean isBurning() { - return this.furnaceBurnTime > 0; - } - - @Override - public void onDataPacket(final NetworkManager net, final S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); - if (this.worldObj != null) { - this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord); - } - } - - @Override - public boolean canUpdate() { - return true; - } - - @Override - public void updateEntity() { - final boolean flag = this.furnaceBurnTime > 0; - boolean flag2 = false; - ++this.count; - if (this.furnaceBurnTime > 0) { - --this.furnaceBurnTime; - } - if (!this.worldObj.isRemote) { - if (this.bellows < 0) { - this.getBellows(); - } - if (((this.count % (this.speedBoost ? 10 : 20)) == 0) && (this.aspects.size() > 0)) { - final AspectList exlude = new AspectList(); - int deep = 0; - TileEntity tile = null; - while (deep < 5) { - ++deep; - tile = this.worldObj.getTileEntity(this.xCoord, this.yCoord + deep, this.zCoord); - if (!(tile instanceof TileAlembic) || !(tile instanceof TileFastArcaneAlembic)) { - break; - } - - final TileAlembic alembic = (TileAlembic) tile; - if ((alembic.aspect != null) && (alembic.amount < alembic.maxAmount) - && (this.aspects.getAmount(alembic.aspect) > 0)) { - this.takeFromContainer(alembic.aspect, 1); - alembic.addToContainer(alembic.aspect, 1); - exlude.merge(alembic.aspect, 1); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord + deep, this.zCoord); - } - tile = null; - } - deep = 0; - while (deep < 5) { - ++deep; - tile = this.worldObj.getTileEntity(this.xCoord, this.yCoord + deep, this.zCoord); - if (!(tile instanceof TileAlembic)) { - break; - } - final TileAlembic alembic = (TileAlembic) tile; - if ((alembic.aspect != null) && (alembic.amount != 0)) { - continue; - } - Aspect as = null; - if (alembic.aspectFilter == null) { - as = this.takeRandomAspect(exlude); - } else if (this.takeFromContainer(alembic.aspectFilter, 1)) { - as = alembic.aspectFilter; - } - if (as != null) { - alembic.addToContainer(as, 1); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord + deep, this.zCoord); - break; - } - } - } - if ((this.furnaceBurnTime == 0) && this.canSmelt()) { - final int itemBurnTime = TileEntityFurnace.getItemBurnTime(this.furnaceItemStacks[1]); - this.furnaceBurnTime = itemBurnTime; - this.currentItemBurnTime = itemBurnTime; - if (this.furnaceBurnTime > 0) { - flag2 = true; - this.speedBoost = false; - if (this.furnaceItemStacks[1] != null) { - if (this.furnaceItemStacks[1].isItemEqual(new ItemStack(ConfigItems.itemResource, 1, 0))) { - this.speedBoost = true; - } - final ItemStack itemStack = this.furnaceItemStacks[1]; - --itemStack.stackSize; - if (this.furnaceItemStacks[1].stackSize == 0) { - this.furnaceItemStacks[1] = this.furnaceItemStacks[1].getItem() - .getContainerItem(this.furnaceItemStacks[1]); - } - } - } - } - if (this.isBurning() && this.canSmelt()) { - ++this.furnaceCookTime; - if (this.furnaceCookTime >= this.smeltTime) { - this.furnaceCookTime = 0; - this.smeltItem(); - flag2 = true; - } - } else { - this.furnaceCookTime = 0; - } - if (flag != (this.furnaceBurnTime > 0)) { - flag2 = true; - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - } - } - if (flag2) { - this.markDirty(); - } - } - - private boolean canSmelt() { - if (this.furnaceItemStacks[0] == null) { - return false; - } - AspectList al = ThaumcraftCraftingManager.getObjectTags(this.furnaceItemStacks[0]); - al = ThaumcraftCraftingManager.getBonusTags(this.furnaceItemStacks[0], al); - if ((al == null) || (al.size() == 0)) { - return false; - } - final int vs = al.visSize(); - if (vs > (this.maxVis - this.vis)) { - return false; - } - this.smeltTime = (int) (vs * 10 * (1.0f - (0.125f * this.bellows))); - return true; - } - - public void getBellows() { - this.bellows = TileBellows.getBellows(this.worldObj, this.xCoord, this.yCoord, this.zCoord, - ForgeDirection.VALID_DIRECTIONS); - } - - public void smeltItem() { - if (this.canSmelt()) { - AspectList al = ThaumcraftCraftingManager.getObjectTags(this.furnaceItemStacks[0]); - al = ThaumcraftCraftingManager.getBonusTags(this.furnaceItemStacks[0], al); - for (final Aspect a : al.getAspects()) { - this.aspects.add(a, al.getAmount(a)); - } - this.vis = this.aspects.visSize(); - final ItemStack itemStack = this.furnaceItemStacks[0]; - --itemStack.stackSize; - if (this.furnaceItemStacks[0].stackSize <= 0) { - this.furnaceItemStacks[0] = null; - } - } - } - - public static boolean isItemFuel(final ItemStack par0ItemStack) { - return TileEntityFurnace.getItemBurnTime(par0ItemStack) > 0; - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer par1EntityPlayer) { - return (this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this) - && (par1EntityPlayer.getDistanceSq(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5) <= 64.0); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(final int par1, final ItemStack par2ItemStack) { - if (par1 == 0) { - AspectList al = ThaumcraftCraftingManager.getObjectTags(par2ItemStack); - al = ThaumcraftCraftingManager.getBonusTags(par2ItemStack, al); - if ((al != null) && (al.size() > 0)) { - return true; - } - } - return (par1 == 1) && isItemFuel(par2ItemStack); - } - - @Override - public int[] getAccessibleSlotsFromSide(final int par1) { - return (par1 == 0) - ? TileFastAlchemyFurnace.slots_bottom - : ((par1 == 1) ? TileFastAlchemyFurnace.slots_top : TileFastAlchemyFurnace.slots_sides); - } - - @Override - public boolean canInsertItem(final int par1, final ItemStack par2ItemStack, final int par3) { - return (par3 != 1) && this.isItemValidForSlot(par1, par2ItemStack); - } - - @Override - public boolean canExtractItem(final int par1, final ItemStack par2ItemStack, final int par3) { - return (par3 != 0) || (par1 != 1) || (par2ItemStack.getItem() == Items.bucket); - } - - public Aspect takeRandomAspect(final AspectList exlude) { - if (this.aspects.size() > 0) { - final AspectList temp = this.aspects.copy(); - if (exlude.size() > 0) { - for (final Aspect a : exlude.getAspects()) { - temp.remove(a); - } - } - if (temp.size() > 0) { - final Aspect tag = temp.getAspects()[this.worldObj.rand.nextInt(temp.getAspects().length)]; - this.aspects.remove(tag, 1); - --this.vis; - return tag; - } - } - return null; - } - - public boolean takeFromContainer(final Aspect tag, final int amount) { - if ((this.aspects != null) && (this.aspects.getAmount(tag) >= amount)) { - this.aspects.remove(tag, amount); - this.vis -= amount; - return true; - } - return false; - } - - static { - slots_bottom = new int[]{1}; - slots_top = new int[0]; - slots_sides = new int[]{0}; - } -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TileFastArcaneAlembic.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TileFastArcaneAlembic.java deleted file mode 100644 index cfbc753ff5..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TileFastArcaneAlembic.java +++ /dev/null @@ -1,253 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.common.tile; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - -import gtPlusPlus.xmod.thaumcraft.common.block.TC_BlockHandler; -import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.tiles.TileAlembic; - -public class TileFastArcaneAlembic extends TileAlembic { - ForgeDirection fd; - - public TileFastArcaneAlembic() { - this.aspectFilter = null; - this.amount = 0; - this.maxAmount = 64; - this.facing = 2; - this.aboveAlembic = false; - this.aboveFurnace = false; - this.fd = null; - } - - @Override - public AspectList getAspects() { - return (this.aspect != null) ? new AspectList().add(this.aspect, this.amount) : new AspectList(); - } - - @Override - public void setAspects(final AspectList aspects) { - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() { - return AxisAlignedBB.getBoundingBox(this.xCoord - 1, this.yCoord, - this.zCoord - 1, this.xCoord + 2, this.yCoord + 1, - this.zCoord + 2); - } - - @Override - public void readCustomNBT(final NBTTagCompound nbttagcompound) { - this.facing = nbttagcompound.getByte("facing"); - this.aspectFilter = Aspect.getAspect(nbttagcompound.getString("AspectFilter")); - final String tag = nbttagcompound.getString("aspect"); - if (tag != null) { - this.aspect = Aspect.getAspect(tag); - } - this.amount = nbttagcompound.getShort("amount"); - this.fd = ForgeDirection.getOrientation(this.facing); - } - - @Override - public void writeCustomNBT(final NBTTagCompound nbttagcompound) { - if (this.aspect != null) { - nbttagcompound.setString("aspect", this.aspect.getTag()); - } - if (this.aspectFilter != null) { - nbttagcompound.setString("AspectFilter", this.aspectFilter.getTag()); - } - nbttagcompound.setShort("amount", (short) this.amount); - nbttagcompound.setByte("facing", (byte) this.facing); - } - - @Override - public boolean canUpdate() { - return false; - } - - @Override - public int addToContainer(final Aspect tt, int am) { - if (((this.amount < this.maxAmount) && (tt == this.aspect)) || (this.amount == 0)) { - this.aspect = tt; - final int added = Math.min(am, this.maxAmount - this.amount); - this.amount += added; - am -= added; - } - this.markDirty(); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - return am; - } - - @Override - public boolean takeFromContainer(final Aspect tt, final int am) { - if ((this.amount == 0) || (this.aspect == null)) { - this.aspect = null; - this.amount = 0; - } - if ((this.aspect != null) && (this.amount >= am) && (tt == this.aspect)) { - this.amount -= am; - if (this.amount <= 0) { - this.aspect = null; - this.amount = 0; - } - this.markDirty(); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - return true; - } - return false; - } - - @Override - public boolean doesContainerContain(final AspectList ot) { - return (this.amount > 0) && (this.aspect != null) && (ot.getAmount(this.aspect) > 0); - } - - @Override - public boolean doesContainerContainAmount(final Aspect tt, final int am) { - return (this.amount >= am) && (tt == this.aspect); - } - - @Override - public int containerContains(final Aspect tt) { - return (tt == this.aspect) ? this.amount : 0; - } - - @Override - public boolean doesContainerAccept(final Aspect tag) { - return true; - } - - @Override - public boolean takeFromContainer(final AspectList ot) { - return false; - } - - @Override - public void getAppearance() { - this.aboveAlembic = false; - this.aboveFurnace = false; - if ((this.worldObj.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ConfigBlocks.blockStoneDevice) - && (this.worldObj.getBlockMetadata(this.xCoord, this.yCoord - 1, this.zCoord) == 0)) { - this.aboveFurnace = true; - } - else if ((this.worldObj.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == TC_BlockHandler.blockFastAlchemyFurnace) - && (this.worldObj.getBlockMetadata(this.xCoord, this.yCoord - 1, this.zCoord) == 0)) { - this.aboveFurnace = true; - } - - if ((this.worldObj.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ConfigBlocks.blockMetalDevice) - && (this.worldObj.getBlockMetadata(this.xCoord, this.yCoord - 1, this.zCoord) == this - .getBlockMetadata())) { - this.aboveAlembic = true; - } - else if ((this.worldObj.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == TC_BlockHandler.blockFastArcaneAlembic) - && (this.worldObj.getBlockMetadata(this.xCoord, this.yCoord - 1, this.zCoord) == 1)) { - this.aboveAlembic = true; - } - } - - @Override - public void onDataPacket(final NetworkManager net, final S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); - this.getAppearance(); - } - - @Override - public int onWandRightClick(final World world, final ItemStack wandstack, final EntityPlayer player, final int x, - final int y, final int z, final int side, final int md) { - if (side <= 1) { - return 0; - } - this.facing = side; - this.fd = ForgeDirection.getOrientation(this.facing); - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - player.swingItem(); - this.markDirty(); - return 0; - } - - @Override - public ItemStack onWandRightClick(final World world, final ItemStack wandstack, final EntityPlayer player) { - return null; - } - - @Override - public void onUsingWandTick(final ItemStack wandstack, final EntityPlayer player, final int count) { - } - - @Override - public void onWandStoppedUsing(final ItemStack wandstack, final World world, final EntityPlayer player, - final int count) { - } - - @Override - public boolean isConnectable(final ForgeDirection face) { - return (face != ForgeDirection.getOrientation(this.facing)) && (face != ForgeDirection.DOWN); - } - - @Override - public boolean canInputFrom(final ForgeDirection face) { - return false; - } - - @Override - public boolean canOutputTo(final ForgeDirection face) { - return (face != ForgeDirection.getOrientation(this.facing)) && (face != ForgeDirection.DOWN); - } - - @Override - public void setSuction(final Aspect aspect, final int amount) { - } - - @Override - public Aspect getSuctionType(final ForgeDirection loc) { - return null; - } - - @Override - public int getSuctionAmount(final ForgeDirection loc) { - return 0; - } - - @Override - public Aspect getEssentiaType(final ForgeDirection loc) { - return this.aspect; - } - - @Override - public int getEssentiaAmount(final ForgeDirection loc) { - return this.amount; - } - - @Override - public int takeEssentia(final Aspect aspect, final int amount, final ForgeDirection face) { - return (this.canOutputTo(face) && this.takeFromContainer(aspect, amount)) ? amount : 0; - } - - @Override - public int addEssentia(final Aspect aspect, final int amount, final ForgeDirection loc) { - return 0; - } - - @Override - public int getMinimumSuction() { - return 0; - } - - @Override - public boolean renderExtendedTube() { - return true; - } -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/gui/ContainerFastAlchemyFurnace.java b/src/Java/gtPlusPlus/xmod/thaumcraft/gui/ContainerFastAlchemyFurnace.java deleted file mode 100644 index 9689a3fa38..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/gui/ContainerFastAlchemyFurnace.java +++ /dev/null @@ -1,145 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.gui; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastAlchemyFurnace; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.container.SlotLimitedHasAspects; -import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; - -public class ContainerFastAlchemyFurnace extends Container { - private final TileFastAlchemyFurnace furnace; - private int lastCookTime; - private int lastBurnTime; - private int lastItemBurnTime; - private int lastVis; - private int lastSmelt; - - public ContainerFastAlchemyFurnace(final InventoryPlayer par1InventoryPlayer, final TileFastAlchemyFurnace tileEntity) { - this.furnace = tileEntity; - this.addSlotToContainer(new SlotLimitedHasAspects(tileEntity, 0, 80, 8)); - this.addSlotToContainer(new Slot(tileEntity, 1, 80, 48)); - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer( - new Slot(par1InventoryPlayer, j + (i * 9) + 9, 8 + (j * 18), 84 + (i * 18))); - } - } - for (int i = 0; i < 9; ++i) { - this.addSlotToContainer(new Slot(par1InventoryPlayer, i, 8 + (i * 18), 142)); - } - } - - @Override - public void addCraftingToCrafters(final ICrafting par1ICrafting) { - super.addCraftingToCrafters(par1ICrafting); - par1ICrafting.sendProgressBarUpdate(this, 0, this.furnace.furnaceCookTime); - par1ICrafting.sendProgressBarUpdate(this, 1, this.furnace.furnaceBurnTime); - par1ICrafting.sendProgressBarUpdate(this, 2, this.furnace.currentItemBurnTime); - par1ICrafting.sendProgressBarUpdate(this, 3, this.furnace.vis); - par1ICrafting.sendProgressBarUpdate(this, 4, this.furnace.smeltTime); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); ++i) { - final ICrafting icrafting = (ICrafting) this.crafters.get(i); - if (this.lastCookTime != this.furnace.furnaceCookTime) { - icrafting.sendProgressBarUpdate(this, 0, this.furnace.furnaceCookTime); - } - if (this.lastBurnTime != this.furnace.furnaceBurnTime) { - icrafting.sendProgressBarUpdate(this, 1, this.furnace.furnaceBurnTime); - } - if (this.lastItemBurnTime != this.furnace.currentItemBurnTime) { - icrafting.sendProgressBarUpdate(this, 2, this.furnace.currentItemBurnTime); - } - if (this.lastVis != this.furnace.vis) { - icrafting.sendProgressBarUpdate(this, 3, this.furnace.vis); - } - if (this.lastSmelt != this.furnace.smeltTime) { - icrafting.sendProgressBarUpdate(this, 4, this.furnace.smeltTime); - } - } - this.lastCookTime = this.furnace.furnaceCookTime; - this.lastBurnTime = this.furnace.furnaceBurnTime; - this.lastItemBurnTime = this.furnace.currentItemBurnTime; - this.lastVis = this.furnace.vis; - this.lastSmelt = this.furnace.smeltTime; - } - - @Override - @SideOnly(Side.CLIENT) - public void updateProgressBar(final int par1, final int par2) { - if (par1 == 0) { - this.furnace.furnaceCookTime = par2; - } - if (par1 == 1) { - this.furnace.furnaceBurnTime = par2; - } - if (par1 == 2) { - this.furnace.currentItemBurnTime = par2; - } - if (par1 == 3) { - this.furnace.vis = par2; - } - if (par1 == 4) { - this.furnace.smeltTime = par2; - } - } - - @Override - public boolean canInteractWith(final EntityPlayer par1EntityPlayer) { - return this.furnace.isUseableByPlayer(par1EntityPlayer); - } - - @Override - public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { - ItemStack itemstack = null; - final Slot slot = (Slot) this.inventorySlots.get(par2); - if ((slot != null) && slot.getHasStack()) { - final ItemStack itemstack2 = slot.getStack(); - itemstack = itemstack2.copy(); - if ((par2 != 1) && (par2 != 0)) { - AspectList al = ThaumcraftCraftingManager.getObjectTags(itemstack2); - al = ThaumcraftCraftingManager.getBonusTags(itemstack2, al); - if (TileFastAlchemyFurnace.isItemFuel(itemstack2)) { - if (!this.mergeItemStack(itemstack2, 1, 2, false) - && !this.mergeItemStack(itemstack2, 0, 1, false)) { - return null; - } - } else if ((al != null) && (al.size() > 0)) { - if (!this.mergeItemStack(itemstack2, 0, 1, false)) { - return null; - } - } else if ((par2 >= 2) && (par2 < 29)) { - if (!this.mergeItemStack(itemstack2, 29, 38, false)) { - return null; - } - } else if ((par2 >= 29) && (par2 < 38) && !this.mergeItemStack(itemstack2, 2, 29, false)) { - return null; - } - } else if (!this.mergeItemStack(itemstack2, 2, 38, false)) { - return null; - } - if (itemstack2.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - if (itemstack2.stackSize == itemstack.stackSize) { - return null; - } - slot.onPickupFromSlot(par1EntityPlayer, itemstack2); - } - return itemstack; - } -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/gui/GuiFastAlchemyFurnace.java b/src/Java/gtPlusPlus/xmod/thaumcraft/gui/GuiFastAlchemyFurnace.java deleted file mode 100644 index 0d8539e472..0000000000 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/gui/GuiFastAlchemyFurnace.java +++ /dev/null @@ -1,47 +0,0 @@ -package gtPlusPlus.xmod.thaumcraft.gui; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; - -import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastAlchemyFurnace; -import thaumcraft.client.lib.UtilsFX; - -@SideOnly(Side.CLIENT) -public class GuiFastAlchemyFurnace extends GuiContainer { - private final TileFastAlchemyFurnace furnaceInventory; - - public GuiFastAlchemyFurnace(final InventoryPlayer par1InventoryPlayer, - final TileFastAlchemyFurnace par2TileEntityFurnace) { - super(new ContainerFastAlchemyFurnace(par1InventoryPlayer, par2TileEntityFurnace)); - this.furnaceInventory = par2TileEntityFurnace; - } - - @Override - protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - } - - @Override - protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) { - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - UtilsFX.bindTexture("textures/gui/gui_alchemyfurnace.png"); - final int k = (this.width - this.xSize) / 2; - final int l = (this.height - this.ySize) / 2; - GL11.glEnable(3042); - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - if (this.furnaceInventory.isBurning()) { - final int i1 = this.furnaceInventory.getBurnTimeRemainingScaled(20); - this.drawTexturedModalRect(k + 80, (l + 26 + 20) - i1, 176, 20 - i1, 16, i1); - } - int i1 = this.furnaceInventory.getCookProgressScaled(46); - this.drawTexturedModalRect(k + 106, (l + 13 + 46) - i1, 216, 46 - i1, 9, i1); - i1 = this.furnaceInventory.getContentsScaled(48); - this.drawTexturedModalRect(k + 61, (l + 12 + 48) - i1, 200, 48 - i1, 8, i1); - this.drawTexturedModalRect(k + 60, l + 8, 232, 0, 10, 55); - GL11.glDisable(3042); - } -}
\ No newline at end of file |