mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +00:00
Finish TE Integration: Molten Lumium, Signalum, Mithril/ManaInfused and Enderium. Also add alloys and the ability to create liquid red/glowstone in the smeltery with Pyrotheum as fuel
This commit is contained in:
1 parent
3508fe5c09
commit
08c95c654b
25 files changed
+351
-20
No files matched your search
@@ -43,6 +43,7 @@ import tconstruct.plugins.imc.TinkerMystcraft;
|
||||
import tconstruct.plugins.TinkerThaumcraft;
|
||||
import tconstruct.plugins.mfr.TinkerMFR;
|
||||
import tconstruct.plugins.te4.TinkerTE4;
|
||||
import tconstruct.plugins.te4.TinkersThermalFoundation;
|
||||
import tconstruct.plugins.ubc.TinkerUBC;
|
||||
import tconstruct.plugins.waila.TinkerWaila;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
@@ -139,6 +140,7 @@ public class TConstruct
|
||||
pulsar.registerPulse(new TinkerMystcraft());
|
||||
pulsar.registerPulse(new TinkerMFR());
|
||||
pulsar.registerPulse(new TinkerTE4());
|
||||
pulsar.registerPulse(new TinkersThermalFoundation());
|
||||
pulsar.registerPulse(new TinkerFMP());
|
||||
pulsar.registerPulse(new TinkerUBC());
|
||||
pulsar.registerPulse(new TinkerGears());
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
package tconstruct.plugins.te4;
|
||||
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import mantle.pulsar.pulse.Handler;
|
||||
import mantle.pulsar.pulse.Pulse;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
import tconstruct.library.crafting.Smeltery;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@GameRegistry.ObjectHolder(TinkersThermalFoundation.TF_MOD_ID)
|
||||
@Pulse(id = "Tinkers Thermal Foundation Compatibility", description = "Tinkers Construct compatibility for Thermal Foundation", modsRequired = TinkersThermalFoundation.TF_MOD_ID, forced = true)
|
||||
public class TinkersThermalFoundation {
|
||||
static final String TF_MOD_ID = "ThermalFoundation";
|
||||
|
||||
@Handler
|
||||
public void init(FMLInitializationEvent event) {
|
||||
// melt stuff in the smeltery
|
||||
Fluid pyrotheumFluid = FluidRegistry.getFluid("pyrotheum");
|
||||
Fluid cryotheumFluid = FluidRegistry.getFluid("cryotheum");
|
||||
Fluid redstoneFluid = FluidRegistry.getFluid("redstone");
|
||||
Fluid glowstoneFluid = FluidRegistry.getFluid("glowstone");
|
||||
Fluid coalFluid = FluidRegistry.getFluid("coal");
|
||||
|
||||
//pyrotheum fuel
|
||||
// register pyrotheum if it's present
|
||||
Smeltery.addSmelteryFuel(pyrotheumFluid, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb
|
||||
|
||||
// liquid redstone
|
||||
for(ItemStack stack : OreDictionary.getOres("blockRedstone"))
|
||||
Smeltery.addMelting(stack, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3000, new FluidStack(redstoneFluid, 900));
|
||||
for(ItemStack stack : OreDictionary.getOres("dustRedstone"))
|
||||
Smeltery.addMelting(stack, Blocks.redstone_block, stack.getItemDamage(), 2500, new FluidStack(redstoneFluid, 100));
|
||||
|
||||
// liquid glowstone
|
||||
for(ItemStack stack : OreDictionary.getOres("glowstone"))
|
||||
Smeltery.addMelting(stack, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3000, new FluidStack(glowstoneFluid, 1000));
|
||||
for(ItemStack stack : OreDictionary.getOres("dustGlowstone"))
|
||||
Smeltery.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250));
|
||||
|
||||
// liquid pyrotheum
|
||||
for(ItemStack stack : OreDictionary.getOres("dustPyrotheum"))
|
||||
Smeltery.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 4000, new FluidStack(pyrotheumFluid, 100));
|
||||
|
||||
// liquid cryotheum
|
||||
for(ItemStack stack : OreDictionary.getOres("dustCryotheum"))
|
||||
Smeltery.addMelting(stack, Blocks.snow, stack.getItemDamage(), 4000, new FluidStack(cryotheumFluid, 100));
|
||||
|
||||
// liquid coal
|
||||
for(ItemStack stack : OreDictionary.getOres("dustCoal"))
|
||||
Smeltery.addMelting(stack, Blocks.coal_block, stack.getItemDamage(), 4000, new FluidStack(coalFluid, 100));
|
||||
|
||||
// Alloying
|
||||
int amount = TConstruct.ingotLiquidValue;
|
||||
FluidStack result, part1, part2, part3;
|
||||
|
||||
// Invar
|
||||
result = new FluidStack(TinkerSmeltery.moltenInvarFluid, amount * 3);
|
||||
part1 = new FluidStack(TinkerSmeltery.moltenIronFluid, amount * 2);
|
||||
part2 = new FluidStack(TinkerSmeltery.moltenNickelFluid, amount);
|
||||
Smeltery.addAlloyMixing(result, part1, part2);
|
||||
|
||||
// Electrum
|
||||
result = new FluidStack(TinkerSmeltery.moltenElectrumFluid, amount * 2);
|
||||
part1 = new FluidStack(TinkerSmeltery.moltenGoldFluid, amount);
|
||||
part2 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount);
|
||||
Smeltery.addAlloyMixing(result, part1, part2);
|
||||
|
||||
// Lumium
|
||||
result = new FluidStack(TinkerSmeltery.moltenLumiumFluid, amount * 4);
|
||||
part1 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount);
|
||||
part2 = new FluidStack(TinkerSmeltery.moltenTinFluid, amount * 3);
|
||||
part3 = new FluidStack(glowstoneFluid, amount);
|
||||
Smeltery.addAlloyMixing(result, part1, part2, part3);
|
||||
|
||||
// Signalum
|
||||
result = new FluidStack(TinkerSmeltery.moltenSignalumFluid, amount * 4);
|
||||
part1 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount);
|
||||
part2 = new FluidStack(TinkerSmeltery.moltenCopperFluid, amount * 3);
|
||||
part3 = new FluidStack(redstoneFluid, amount);
|
||||
Smeltery.addAlloyMixing(result, part1, part2, part3);
|
||||
|
||||
// Enderium
|
||||
result = new FluidStack(TinkerSmeltery.moltenEnderiumFluid, amount * 4);
|
||||
part1 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount);
|
||||
part2 = new FluidStack(TinkerSmeltery.moltenTinFluid, amount * 2);
|
||||
part3 = new FluidStack(TinkerSmeltery.moltenShinyFluid, amount);
|
||||
Smeltery.addAlloyMixing(result, part1, part2, part3, new FluidStack(TinkerSmeltery.moltenEnderFluid, amount));
|
||||
}
|
||||
}
|
||||
@@ -99,6 +99,10 @@ public class TinkerSmeltery
|
||||
public static Fluid moltenShinyFluid;
|
||||
public static Fluid moltenInvarFluid;
|
||||
public static Fluid moltenElectrumFluid;
|
||||
public static Fluid moltenLumiumFluid;
|
||||
public static Fluid moltenSignalumFluid;
|
||||
public static Fluid moltenMithrilFluid;
|
||||
public static Fluid moltenEnderiumFluid;
|
||||
public static Fluid moltenEnderFluid;
|
||||
public static Block moltenIron;
|
||||
public static Block moltenGold;
|
||||
@@ -122,6 +126,10 @@ public class TinkerSmeltery
|
||||
public static Block moltenShiny;
|
||||
public static Block moltenInvar;
|
||||
public static Block moltenElectrum;
|
||||
public static Block moltenLumium;
|
||||
public static Block moltenSignalum;
|
||||
public static Block moltenMithril;
|
||||
public static Block moltenEnderium;
|
||||
public static Block moltenEnder;
|
||||
// Glue
|
||||
public static Fluid glueFluid;
|
||||
@@ -243,6 +251,18 @@ public class TinkerSmeltery
|
||||
TinkerSmeltery.moltenEnderFluid = registerFluid("ender", "ender", "fluid.ender", "liquid_ender", 3000, 6000, 295, Material.water);
|
||||
TinkerSmeltery.moltenEnder = TinkerSmeltery.moltenEnderFluid.getBlock();
|
||||
|
||||
TinkerSmeltery.moltenLumiumFluid = registerFluid("lumium");
|
||||
TinkerSmeltery.moltenLumium = TinkerSmeltery.moltenLumiumFluid.getBlock();
|
||||
|
||||
TinkerSmeltery.moltenSignalumFluid = registerFluid("signalum");
|
||||
TinkerSmeltery.moltenSignalum = TinkerSmeltery.moltenSignalumFluid.getBlock();
|
||||
|
||||
TinkerSmeltery.moltenMithrilFluid = registerFluid("mithril");
|
||||
TinkerSmeltery.moltenMithril = TinkerSmeltery.moltenMithrilFluid.getBlock();
|
||||
|
||||
TinkerSmeltery.moltenEnderiumFluid = registerFluid("enderium");
|
||||
TinkerSmeltery.moltenEnderium = TinkerSmeltery.moltenEnderiumFluid.getBlock();
|
||||
|
||||
// Special liquids with different properties/blocks than the rest
|
||||
|
||||
TinkerSmeltery.bloodFluid = new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
@@ -332,6 +352,10 @@ public class TinkerSmeltery
|
||||
FluidType.registerFluidType("Platinum", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenShinyFluid, false);
|
||||
FluidType.registerFluidType("Invar", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenInvarFluid, false);
|
||||
FluidType.registerFluidType("Electrum", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenElectrumFluid, false);
|
||||
FluidType.registerFluidType("Lumium", TinkerWorld.metalBlock, 0, 370, TinkerSmeltery.moltenLumiumFluid, false);
|
||||
FluidType.registerFluidType("Signalum", TinkerWorld.metalBlock, 0, 450, TinkerSmeltery.moltenSignalumFluid, false);
|
||||
FluidType.registerFluidType("Mithril", TinkerWorld.metalBlock, 0, 800, TinkerSmeltery.moltenMithrilFluid, false);
|
||||
FluidType.registerFluidType("Enderium", TinkerWorld.metalBlock, 0, 1000, TinkerSmeltery.moltenEnderiumFluid, false);
|
||||
FluidType.registerFluidType("Obsidian", Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true);
|
||||
FluidType.registerFluidType("Ender", TinkerWorld.metalBlock, 10, 500, TinkerSmeltery.moltenEnderFluid, false);
|
||||
FluidType.registerFluidType("Glass", Blocks.sand, 0, 625, TinkerSmeltery.moltenGlassFluid, false);
|
||||
@@ -753,10 +777,6 @@ public class TinkerSmeltery
|
||||
{
|
||||
// Smeltery fuels
|
||||
Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 80); // lava lasts 4 seconds per 15 mb
|
||||
// register pyrotheum if it's present
|
||||
Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum");
|
||||
if (pyrotheum != null)
|
||||
Smeltery.addSmelteryFuel(pyrotheum, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb
|
||||
|
||||
// BLOOD FOR THE BLOOD GOD
|
||||
if (TinkerWorld.meatBlock != null)
|
||||
@@ -975,17 +995,9 @@ public class TinkerSmeltery
|
||||
if (taintedSoil != null && heatSand != null)
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand);
|
||||
|
||||
ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0);
|
||||
LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
|
||||
LiquidCasting basinCasting = TConstructRegistry.getBasinCasting();
|
||||
ArrayList<ItemStack> ores;
|
||||
|
||||
// TE alloys
|
||||
Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.ingotLiquidValue * 1)); // Invar
|
||||
Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.ingotLiquidValue)); // Electrum
|
||||
|
||||
// TE is handled by the oredicted variant already
|
||||
|
||||
/* Extra Utilities */
|
||||
ores = OreDictionary.getOres("compressedGravel1x");
|
||||
if (ores.size() > 0)
|
||||
@@ -1009,15 +1021,17 @@ public class TinkerSmeltery
|
||||
}
|
||||
}
|
||||
|
||||
public Fluid registerFluid(String name) {
|
||||
|
||||
|
||||
public static Fluid registerFluid(String name) {
|
||||
return registerFluid(name, "liquid_" + name);
|
||||
}
|
||||
|
||||
public Fluid registerFluid(String name, String texture) {
|
||||
public static Fluid registerFluid(String name, String texture) {
|
||||
return registerFluid(name, name + ".molten", "fluid.molten." + name, texture, 3000, 6000, 1300, Material.lava);
|
||||
}
|
||||
|
||||
public Fluid registerFluid(String name, String fluidName, String blockName, String texture, int density, int viscosity, int temperature, Material material) {
|
||||
public static Fluid registerFluid(String name, String fluidName, String blockName, String texture, int density, int viscosity, int temperature, Material material) {
|
||||
// create the new fluid
|
||||
Fluid fluid = new Fluid(fluidName).setDensity(density).setViscosity(viscosity).setTemperature(temperature);
|
||||
|
||||
@@ -1025,7 +1039,7 @@ public class TinkerSmeltery
|
||||
fluid.setLuminosity(12);
|
||||
|
||||
// register it if it's not already existing
|
||||
boolean isElectrumPreReg = !FluidRegistry.registerFluid(fluid);
|
||||
boolean isFluidPreRegistered = !FluidRegistry.registerFluid(fluid);
|
||||
|
||||
// register our fluid block for the fluid
|
||||
// this constructor implicitly does fluid.setBlock to it, that's why it's not called separately
|
||||
@@ -1034,7 +1048,7 @@ public class TinkerSmeltery
|
||||
GameRegistry.registerBlock(block, blockName);
|
||||
|
||||
// if the fluid was already registered we use that one instead
|
||||
if (isElectrumPreReg)
|
||||
if (isFluidPreRegistered)
|
||||
{
|
||||
fluid = FluidRegistry.getFluid(fluidName);
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ public class FilledBucket extends ItemBucket
|
||||
return getUnlocalizedName() + "." + materialNames[arr];
|
||||
}
|
||||
|
||||
public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron" };
|
||||
public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron", "Lumium", "Signalum", "Mithril", "Enderium" };
|
||||
|
||||
public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron" };
|
||||
public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron", "lumium", "signalum", "mithril", "enderium" };
|
||||
}
|
||||
Reference in new issue
Block a user