Skip to content

Commit

Permalink
Finish TE Integration: Molten Lumium, Signalum, Mithril/ManaInfused a…
Browse files Browse the repository at this point in the history
…nd Enderium. Also add alloys and the ability to create liquid red/glowstone in the smeltery with Pyrotheum as fuel
  • Loading branch information
bonii-xx committed Feb 9, 2015
1 parent 3508fe5 commit 08c95c6
Show file tree
Hide file tree
Showing 25 changed files with 351 additions and 20 deletions.
14 changes: 13 additions & 1 deletion resources/assets/tinker/lang/en_US.lang
Expand Up @@ -487,6 +487,10 @@ item.tconstruct.bucket.Silver.name=Molten Silver Bucket
item.tconstruct.bucket.Shiny.name=Molten Shiny Bucket
item.tconstruct.bucket.Invar.name=Molten Invar Bucket
item.tconstruct.bucket.Electrum.name=Molten Electrum Bucket
item.tconstruct.bucket.Lumium.name=Molten Lumium Bucket
item.tconstruct.bucket.Signalum.name=Molten Signalum Bucket
item.tconstruct.bucket.Mithril.name=Molten Mana Infused Metal Bucket
item.tconstruct.bucket.Enderium.name=Molten Enderium Bucket
item.tconstruct.bucket.Ender.name=Liquified Ender Bucket
item.tconstruct.bucket.Slime.name=Liquid Slime Bucket
item.tconstruct.bucket.PigIron.name=Molten Pig Iron Bucket
Expand Down Expand Up @@ -519,6 +523,10 @@ tile.fluid.molten.lead.name=Molten Lead
tile.fluid.molten.shiny.name=Molten Shiny
tile.fluid.molten.invar.name=Molten Invar
tile.fluid.molten.electrum.name=Molten Electrum
tile.fluid.molten.lumium.name=Molten Lumium
tile.fluid.molten.signalum.name=Molten Signalum
tile.fluid.molten.mithril.name=Molten Mana Infused Metal
tile.fluid.molten.enderium.name=Molten Enderium
tile.fluid.ender.name=Liquified Ender
tile.liquid.slime.name=Liquified Slime

Expand Down Expand Up @@ -643,9 +651,13 @@ fluid.blood=Blood
fluid.nickel.molten=Molten Nickel
fluid.lead.molten=Molten Lead
fluid.silver.molten=Molten Silver
fluid.shiny.molten=Molten Shiny
fluid.platinum.molten=Molten Shiny
fluid.invar.molten=Molten Invar
fluid.electrum.molten=Molten Electrum
fluid.lumium.molten=Molten Lumium
fluid.signalum.molten=Molten Signalum
fluid.mithril.molten=Molten Mana Infused Metal
fluid.enderium.molten=Molten Enderium
fluid.ender=Liquid Ender
fluid.slime.blue=Liquid Blueslime
fluid.pigiron.molten=Pig Iron
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions resources/assets/tinker/textures/blocks/liquid_enderium.png.mcmeta
@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 3
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions resources/assets/tinker/textures/blocks/liquid_lumium.png.mcmeta
@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 3
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions resources/assets/tinker/textures/blocks/liquid_mithril.png.mcmeta
@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 3
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions resources/assets/tinker/textures/blocks/liquid_signalum.png.mcmeta
@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 3
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/main/java/tconstruct/TConstruct.java
Expand Up @@ -43,6 +43,7 @@
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;
Expand Down Expand Up @@ -139,6 +140,7 @@ public void preInit (FMLPreInitializationEvent event)
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());
Expand Down
103 changes: 103 additions & 0 deletions src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java
@@ -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));
}
}

0 comments on commit 08c95c6

Please sign in to comment.