Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct

This commit is contained in:
Progwml6 committed 2013-10-19 09:10:26 -04:00
commit acf16da0b2
7 files changed
+43 -38

No files matched your search

+6 -6
View File
@@ -10,7 +10,7 @@
"authors": [
"mDiyo", "fuj1n", "ProgWML6", "Sunstrike"
],
"credits": "Ecu",
"credits": "Slime Knights, EcuTruin",
"logoFile": "",
"screenshots": [],
"parent":"",
@@ -22,12 +22,12 @@
"description": "Preloader for Tinkers Construct",
"version": "0.0.1",
"mcversion": "@MCVERSION@",
"url": "https://github.com/mDiyo/TinkersConstruct/tree/master/src/tconstruct/preloader",
"url": "https://github.com/SlimeKnights/TinkersConstruct/tree/master/src/tconstruct/preloader",
"updateUrl": "",
"authors": [
"AlgorithmX2", "Sunstrike"
"Sunstrike", "Slime Knights"
],
"credits": "",
"credits": "AlgorithmX2 (ASMInterfaceRepair)",
"logoFile": "",
"screenshots": [],
"parent":"",
@@ -44,7 +44,7 @@
"authors": [
"mDiyo", "fuj1n", "ProgWML6", "Sunstrike"
],
"credits": "",
"credits": "Slime Knights",
"logoFile": "",
"screenshots": [],
"parent":"TConstruct",
@@ -63,7 +63,7 @@
"authors": [
"mDiyo", "fuj1n", "ProgWML6", "Sunstrike"
],
"credits": "",
"credits": "Slime Knights",
"logoFile": "",
"screenshots": [],
"parent":"TConstruct",
+1 -1
View File
@@ -94,6 +94,6 @@ public class TankAirBlock extends BlockContainer
@Override
public boolean isAirBlock(World world, int x, int y, int z)
{
return true;
return false;
}
}
@@ -185,7 +185,9 @@ public class SearedRender implements ISimpleBlockRenderingHandler
}
}
float height = logic.getLiquidAmount() / (logic.getCapacity() * 1.03F) / 16F;
float percent = (float)logic.getLiquidAmount() / (float)logic.getCapacity();
float height = percent * (maxHeight - minHeight);
//float height = logic.getLiquidAmount() / (logic.getCapacity() * 1.03F) / 16F;
renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ);
Fluid fluid = logic.liquid.getFluid();
@@ -402,7 +404,10 @@ public class SearedRender implements ISimpleBlockRenderingHandler
maxZ = rec.fluidRenderProperties.maxZ;
}
}
float height = (logic.getLiquidAmount() / (logic.getCapacity() * 1.05F) * 0.6875F) / maxHeight;
float percent = (float)logic.getLiquidAmount() / (float)logic.getCapacity();
float height = percent * (maxHeight - minHeight);
//float height = (logic.getLiquidAmount() / (logic.getCapacity() * 1.05F) * 0.6875F) / maxHeight;
renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ);
Fluid fluid = logic.liquid.getFluid();
+20 -9
View File
@@ -1,5 +1,11 @@
package tconstruct.common;
import tconstruct.library.client.FluidRenderProperties;
import tconstruct.library.client.FluidRenderProperties.Applications;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.common.EnumHelper;
import cpw.mods.fml.common.*;
@@ -414,7 +420,7 @@ public class TContent implements IFuelHandler
GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel");
GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel");
tankAir = new TankAirBlock(PHConstruct.airTank, Material.air).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air");
tankAir = new TankAirBlock(PHConstruct.airTank, Material.leaves).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air");
GameRegistry.registerBlock(tankAir, "TankAir");
GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air");
@@ -1289,14 +1295,14 @@ public class TContent implements IFuelHandler
basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender
//Armor casts
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50);
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN));
//TODO TEST
// basinCasting.addCastingRecipe(new ItemStack(armorTest), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 24), new ItemStack(armorPattern, 1, 0), false, 100, new FluidRenderProperties(0.5F, 0.575F, 0.15F, 0.85F, 0.15F, 0.85F));
@@ -1545,6 +1551,11 @@ public class TContent implements IFuelHandler
GameRegistry.addRecipe(new ItemStack(materials, 1, 25), "sss", "sns", "sss", 'n', new ItemStack(Item.goldNugget), 's', new ItemStack(Item.silk));
GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); //Silky Jewel
GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[]{"www", "w w", 'w', "logWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[]{"w w", "www", "www", 'w', "logWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[]{"www", "w w", "w w", 'w', "logWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[]{"w w", "w w", 'w', "logWood"}));
//FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f);
//FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f);
FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f);
@@ -40,7 +40,7 @@ public class FluidRenderProperties {
public static enum Applications {
TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.0625F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F);
float minHeight, maxHeight, minX, maxX, minZ, maxZ;
public float minHeight, maxHeight, minX, maxX, minZ, maxZ;
Applications(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) {
this.minHeight = minHeight;
@@ -1,23 +1,11 @@
package tconstruct.library.component;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.HashSet;
import java.util.*;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagIntArray;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.*;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.classloading.FMLForgePlugin;
import scala.compat.Platform$;
import tconstruct.TConstruct;
import tconstruct.library.util.CoordTuple;
import tconstruct.library.util.CoordTupleSort;
import tconstruct.library.util.IFacingLogic;
import tconstruct.library.util.IMasterLogic;
import tconstruct.library.util.IServantLogic;
import tconstruct.library.util.*;
public class TankLayerScan extends LogicComponent
{
@@ -25,7 +25,7 @@ public class ASMInterfaceRepair implements IClassTransformer {
@Override
public byte[] transform(String name, String transformedName, byte[] bytes)
{
if ( name.startsWith( "tconstruct." ) && ! name.startsWith( "tconstruct.preloader." ))// && !isBlacklisted(name) )
if ( name.startsWith( "tconstruct." ) && !isBlacklisted(name) )
{
ClassReader cr = new ClassReader(bytes);
ClassNode cn = new ClassNode();
@@ -59,10 +59,11 @@ public class ASMInterfaceRepair implements IClassTransformer {
}
// Used in transform() above.
/*private boolean isBlacklisted( String path )
private boolean isBlacklisted( String path )
{
return path.startsWith( "tconstruct.plugins.minefactoryreloaded." );
}*/
return path.startsWith( "tconstruct.plugins." )
|| path.startsWith("tconstruct.preloader.");
}
private boolean isClassAvailable( String inf )
{