Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Finish TE Integration: Molten Lumium, Signalum, Mithril/ManaInfused a…
…nd Enderium. Also add alloys and the ability to create liquid red/glowstone in the smeltery with Pyrotheum as fuel
- Loading branch information
Showing
25 changed files
with
351 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
45
resources/assets/tinker/textures/blocks/liquid_enderium.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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.
5 changes: 5 additions & 0 deletions
5
resources/assets/tinker/textures/blocks/liquid_enderium_flow.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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
45
resources/assets/tinker/textures/blocks/liquid_lumium.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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.
5 changes: 5 additions & 0 deletions
5
resources/assets/tinker/textures/blocks/liquid_lumium_flow.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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
45
resources/assets/tinker/textures/blocks/liquid_mithril.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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.
5 changes: 5 additions & 0 deletions
5
resources/assets/tinker/textures/blocks/liquid_mithril_flow.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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
45
resources/assets/tinker/textures/blocks/liquid_signalum.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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.
5 changes: 5 additions & 0 deletions
5
resources/assets/tinker/textures/blocks/liquid_signalum_flow.png.mcmeta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"animation": { | ||
"frametime": 3 | ||
} | ||
} |
Binary file added
BIN
+507 Bytes
resources/assets/tinker/textures/items/materials/bucket_enderium.png
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.
Binary file added
BIN
+460 Bytes
resources/assets/tinker/textures/items/materials/bucket_mithril.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+450 Bytes
resources/assets/tinker/textures/items/materials/bucket_signalum.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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)); | ||
} | ||
} |
Oops, something went wrong.