Merge branch 'master' into weaponry

Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-16 16:13:11 +02:00
commit 65ce5f23c2
11 files changed
+163 -67

No files matched your search

+1 -1
View File
@@ -69,7 +69,7 @@ import cpw.mods.fml.relauncher.Side;
*/
@Mod(modid = "TConstruct", name = "TConstruct", version = "${version}",
dependencies = "required-after:Forge@[10.13.0.1200,);required-after:Mantle@[0.3.1,);after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion")
dependencies = "required-after:Forge@[10.13.0.1200,);required-after:Mantle@[0.3.1,);after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion;after:ThermalFoundation")
public class TConstruct
{
public static final String modVersion = "${version}";
@@ -220,6 +220,15 @@ public class TConstructRegistry
// Materials
public static HashMap<Integer, ToolMaterial> toolMaterials = new HashMap<Integer, ToolMaterial>(40);
public static HashMap<String, ToolMaterial> toolMaterialStrings = new HashMap<String, ToolMaterial>(40);
public static List<Integer> defaultToolPartMaterials = new LinkedList<Integer>();
public static void addDefaultToolPartMaterial(int materialID)
{
if(!toolMaterials.containsKey(materialID))
logger.error("[TCon API] Can't add default toolpart: Material ID " + materialID + " is unknown.");
else
defaultToolPartMaterials.add(materialID);
}
/**
* Adds a tool material to the registry
@@ -78,7 +78,14 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
// general name
else
{
return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", toolmat.prefixName());
// specific material name for materials?
String matName;
if(StatCollector.canTranslate("toolpart.material." + material))
matName = StatCollector.translateToLocal("toolpart.material." + material);
else
matName = toolmat.prefixName();
return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", matName);
}
}
@@ -98,8 +105,11 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
return;
// material id == metadata
for(Integer matID : TConstructRegistry.toolMaterials.keySet())
list.add(new ItemStack(item, 1, matID));
for(Integer matID : TConstructRegistry.defaultToolPartMaterials) {
ItemStack stack = new ItemStack(item, 1, matID);
if (this.getMaterialID(stack) != -1)
list.add(stack);
}
}
@Override
@@ -258,6 +258,10 @@ public abstract class HarvestTool extends ToolCore
}
return;
}
// callback to the tool the player uses. Called on both sides. This damages the tool n stuff.
player.getCurrentEquippedItem().func_150999_a(world, block, x, y, z, player);
// server sided handling
if (!world.isRemote) {
// serverside we reproduce ItemInWorldManager.tryHarvestBlock
@@ -1,34 +1,45 @@
package tconstruct.plugins.imc;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import mantle.pulsar.pulse.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid;
import tconstruct.TConstruct;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Mystcraft Compatibility", forced = true, modsRequired = "Mystcraft")
import static tconstruct.smeltery.TinkerSmeltery.*;
@Pulse(id = "Tinkers Mystcraft Compatibility", forced = true, modsRequired = "Mystcraft", pulsesRequired = "Tinkers' Smeltery")
public class TinkerMystcraft
{
private static String[] fluids = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", "moltenArdite", "ender", "steel.molten", "platinum.molten" };
@Handler
public void init (FMLInitializationEvent event)
{
final Fluid[] fluids = new Fluid[] {
// precious tinker fluids
moltenGoldFluid,
moltenSteelFluid,
moltenEmeraldFluid,
moltenArditeFluid,
moltenCobaltFluid,
// all alloys
pigIronFluid,
moltenBronzeFluid,
moltenAlumiteFluid,
moltenAlubrassFluid,
moltenManyullynFluid,
// precious TE fluids
moltenEnderFluid,
moltenSilverFluid,
moltenInvarFluid,
moltenElectrumFluid,
moltenShinyFluid
};
TConstruct.logger.info("Mystcraft detected. Blacklisting Mystcraft fluid symbols.");
for (String nm : fluids)
sendFluidBlacklist(nm);
for(Fluid fluid : fluids)
{
if(fluid == null)
continue;
FMLInterModComms.sendMessage("Mystcraft", "blacklistfluid", fluid.getName());
}
}
private void sendFluidBlacklist (String FluidName)
{
NBTTagCompound NBTMsg = new NBTTagCompound();
NBTMsg.setTag("fluidsymbol", new NBTTagCompound());
NBTMsg.getCompoundTag("fluidsymbol").setFloat("rarity", 0.0F);
NBTMsg.getCompoundTag("fluidsymbol").setFloat("grammarweight", 0.0F);
NBTMsg.getCompoundTag("fluidsymbol").setFloat("instabilityPerBlock", 10000F); // renders creative symbol useless
NBTMsg.getCompoundTag("fluidsymbol").setString("fluidname", FluidName);
FMLInterModComms.sendMessage("Mystcraft", "fluidsymbol", NBTMsg);
}
}
@@ -970,6 +970,10 @@ public class TinkerSmeltery
}
}
// water and lava bucket
tableCasting.addCastingRecipe(new ItemStack(Items.water_bucket), new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10);
tableCasting.addCastingRecipe(new ItemStack(Items.lava_bucket), new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10);
// Clear glass pane casting
tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.glassPane), new FluidStack(TinkerSmeltery.moltenGlassFluid, 250), null, 80);
@@ -734,6 +734,78 @@ public class TinkerTools
TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString(), 0x66AEB0);
TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString(), 0xF0A8A4);
<<<<<<< HEAD
=======
// Bow Materials: Material ID, durability, drawspeed, arrow speed
TConstructRegistry.addBowMaterial(MaterialID.Wood, 384, 20, 1.0f); // Wood
TConstructRegistry.addBowMaterial(MaterialID.Stone, 10, 80, 0.2f); // Stone
TConstructRegistry.addBowMaterial(MaterialID.Iron, 576, 30, 1.2f); // Iron
TConstructRegistry.addBowMaterial(MaterialID.Flint, 10, 80, 0.2f); // Flint
TConstructRegistry.addBowMaterial(MaterialID.Cactus, 384, 20, 1.0f); // Cactus
TConstructRegistry.addBowMaterial(MaterialID.Bone, 192, 30, 1.0f); // Bone
TConstructRegistry.addBowMaterial(MaterialID.Obsidian, 10, 80, 0.2f); // Obsidian
TConstructRegistry.addBowMaterial(MaterialID.Netherrack, 10, 80, 0.2f); // Netherrack
TConstructRegistry.addBowMaterial(MaterialID.Slime, 1536, 30, 1.2f); // Slime
TConstructRegistry.addBowMaterial(MaterialID.Paper, 48, 25, 0.5f); // Paper
TConstructRegistry.addBowMaterial(MaterialID.Cobalt, 1152, 30, 1.2f); // Cobalt
TConstructRegistry.addBowMaterial(MaterialID.Ardite, 960, 30, 1.2f); // Ardite
TConstructRegistry.addBowMaterial(MaterialID.Manyullyn, 1536, 30, 1.2f); // Manyullyn
TConstructRegistry.addBowMaterial(MaterialID.Copper, 384, 30, 1.2f); // Copper
TConstructRegistry.addBowMaterial(MaterialID.Bronze, 576, 30, 1.2f); // Bronze
TConstructRegistry.addBowMaterial(MaterialID.Alumite, 768, 30, 1.2f); // Alumite
TConstructRegistry.addBowMaterial(MaterialID.Steel, 768, 30, 1.2f); // Steel
TConstructRegistry.addBowMaterial(MaterialID.BlueSlime, 576, 20, 1.2f); // Blue Slime
TConstructRegistry.addBowMaterial(MaterialID.PigIron, 384, 20, 1.2f); // Pig Iron
// Fletchling Materials: Material ID, mass, fragility
TConstructRegistry.addArrowMaterial(MaterialID.Wood, 0.69F, 1.0F, 100F); //Wood
TConstructRegistry.addArrowMaterial(MaterialID.Stone, 2.05F, 5.0F, 100F); //Stone
TConstructRegistry.addArrowMaterial(MaterialID.Iron, 3.6F, 0.5F, 100F); //Iron
TConstructRegistry.addArrowMaterial(MaterialID.Flint, 1.325F, 1.0F, 100F); //Flint
TConstructRegistry.addArrowMaterial(MaterialID.Cactus, 0.76F, 1.0F, 100F); //Cactus
TConstructRegistry.addArrowMaterial(MaterialID.Bone, 0.69F, 1.0F, 100); //Bone
TConstructRegistry.addArrowMaterial(MaterialID.Obsidian, 2.4F, 1.0F, 100F); //Obsidian
TConstructRegistry.addArrowMaterial(MaterialID.Netherrack, 1.5F, 1.0F, 100F); //Netherrack
TConstructRegistry.addArrowMaterial(MaterialID.Slime, 0.22F, 0.0F, 100F); //Slime
TConstructRegistry.addArrowMaterial(MaterialID.Paper, 0.69F, 3.0F, 90F); //Paper
TConstructRegistry.addArrowMaterial(MaterialID.Cobalt, 3.0F, 0.25F, 100F); //Cobalt
TConstructRegistry.addArrowMaterial(MaterialID.Ardite, 1.25F, 0.25F, 100F); //Ardite
TConstructRegistry.addArrowMaterial(MaterialID.Manyullyn, 2.25F, 0.1F, 100F); //Manyullyn
TConstructRegistry.addArrowMaterial(MaterialID.Copper, 2.7F, 0.5F, 100F); //Copper
TConstructRegistry.addArrowMaterial(MaterialID.Bronze, 3.6F, 0.25F, 100F); //Bronze
TConstructRegistry.addArrowMaterial(MaterialID.Alumite, 1.1F, 0.25F, 100F); //Alumite
TConstructRegistry.addArrowMaterial(MaterialID.Steel, 3.6F, 0.25F, 100F); //Steel
TConstructRegistry.addArrowMaterial(MaterialID.BlueSlime, 0.22F, 0.0F, 100F); //Blue Slime
TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.6F, 0.5F, 100F); //Pigiron
TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TinkerTools.bowstring, 1, 0), 1F, 1F, 1f, 0xeeeeee); // String
TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TinkerTools.fletching, 1, 0), 100F, 0F, 0.05F, 0xffffff); // Feather
TConstructRegistry.addCustomMaterial(new FletchlingLeafMaterial(1, 2, "treeLeaves", new ItemStack(TinkerTools.fletching, 1, 1), 75F, 0F, 0.2F)); // all vanilla and oredicted leaves. and all leaves in general.
TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TinkerTools.materials, 1, 1), new ItemStack(TinkerTools.fletching, 1, 2), 100F, 0F, 0.12F, 0x82c873); // Slime
TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TinkerTools.materials, 1, 17), new ItemStack(TinkerTools.fletching, 1, 3), 100F, 0F, 0.12F, 0x74c8c7); // BlueSlime
// Register all the materials for default toolparts
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Wood);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Stone);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Iron);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Flint);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Cactus);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Bone);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Obsidian);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Netherrack);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Slime);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Paper);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Cobalt);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Ardite);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Manyullyn);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Copper);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Bronze);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Alumite);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Steel);
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.BlueSlime );
TConstructRegistry.addDefaultToolPartMaterial(MaterialID.PigIron);
>>>>>>> master
PatternBuilder pb = PatternBuilder.instance;
if (PHConstruct.enableTWood)
pb.registerFullMaterial(Blocks.planks, 2, "Wood", new ItemStack(Items.stick), new ItemStack(Items.stick), 0);
@@ -49,6 +49,7 @@ public final class IMCHandler {
ToolMaterial mat = scanMaterial(tag);
if(mat != null) {
TConstructRegistry.addtoolMaterial(tag.getInteger("Id"), mat);
TConstructRegistry.addDefaultToolPartMaterial(tag.getInteger("Id"));
TConstruct.logger.info("IMC: Added material " + mat.materialName);
}
}