mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +00:00
Merge branch 'master' into experimental
This commit is contained in:
commit
e47b570915
14 files changed
+270
-10
No files matched your search
+25
-2
@@ -1,14 +1,23 @@
|
||||
package tconstruct.plugins.imc;
|
||||
package tconstruct.plugins;
|
||||
|
||||
import cpw.mods.fml.common.event.*;
|
||||
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
|
||||
import mantle.pulsar.pulse.*;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.armor.ArmorPart;
|
||||
import tconstruct.library.crafting.ModifyBuilder;
|
||||
import tconstruct.modifiers.armor.AModBoolean;
|
||||
import tconstruct.modifiers.armor.AModThaumicVision;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import thaumcraft.api.ItemApi;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft", pulsesRequired = "Tinkers' World")
|
||||
@Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft", pulsesRequired = "Tinkers' World", forced = true)
|
||||
public class TinkerThaumcraft
|
||||
{
|
||||
|
||||
@@ -16,6 +25,12 @@ public class TinkerThaumcraft
|
||||
public void init (FMLInitializationEvent event)
|
||||
{
|
||||
TConstruct.logger.info("Thaumcraft detected. Registering harvestables.");
|
||||
sendIMC();
|
||||
registerModifiers();
|
||||
}
|
||||
|
||||
private void sendIMC()
|
||||
{
|
||||
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 12));
|
||||
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 13));
|
||||
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 14));
|
||||
@@ -24,4 +39,12 @@ public class TinkerThaumcraft
|
||||
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13));
|
||||
}
|
||||
|
||||
private void registerModifiers()
|
||||
{
|
||||
ItemStack thaumometer = ItemApi.getItem("itemThaumometer", 0);
|
||||
if(thaumometer != null) {
|
||||
// Thaumometer Vision!
|
||||
ModifyBuilder.registerModifier(new AModThaumicVision(thaumometer));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers IC2 Compatibility", description = "Tinkers Construct compatibility for IndustrialCraft 2", modsRequired = "IC2")
|
||||
@Pulse(id = "Tinkers IC2 Compatibility", description = "Tinkers Construct compatibility for IndustrialCraft 2", modsRequired = "IC2", forced = true)
|
||||
public class TinkerIC2
|
||||
{
|
||||
private static final String IC2_UUM_FLUIDNAME = "ic2fluiduumatter";
|
||||
|
||||
@@ -7,7 +7,7 @@ import mantle.pulsar.pulse.*;
|
||||
import tconstruct.TConstruct;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2")
|
||||
@Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2", forced = true)
|
||||
public class TinkerAE2
|
||||
{
|
||||
private static List<String> spatialIOLogics = Arrays.asList("EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these?
|
||||
|
||||
@@ -9,7 +9,7 @@ import tconstruct.TConstruct;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers BuildCraft Compatibility", description = "Tinkers Construct compatibility for BC Transport", modsRequired = "BuildCraft|Transport")
|
||||
@Pulse(id = "Tinkers BuildCraft Compatibility", description = "Tinkers Construct compatibility for BC Transport", modsRequired = "BuildCraft|Transport", forced = true)
|
||||
public class TinkerBuildCraft
|
||||
{
|
||||
@Handler
|
||||
|
||||
@@ -6,7 +6,7 @@ import mantle.pulsar.pulse.*;
|
||||
import tconstruct.TConstruct;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers MFR Compatibility", description = "Tinkers Construct compatibility for MineFactory Reloaded", modsRequired = "MineFactoryReloaded")
|
||||
@Pulse(id = "Tinkers MFR Compatibility", description = "Tinkers Construct compatibility for MineFactory Reloaded", modsRequired = "MineFactoryReloaded", forced = true)
|
||||
public class TinkerMFR
|
||||
{
|
||||
@Handler
|
||||
|
||||
@@ -11,7 +11,7 @@ import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers TE4 Compatibility", description = "Tinkers Construct compatibility for Thermal Expansion", modsRequired = "ThermalExpansion")
|
||||
@Pulse(id = "Tinkers TE4 Compatibility", description = "Tinkers Construct compatibility for Thermal Expansion", modsRequired = "ThermalExpansion", forced = true)
|
||||
public class TinkerTE4
|
||||
{
|
||||
@Handler
|
||||
|
||||
@@ -6,7 +6,7 @@ import mantle.pulsar.pulse.*;
|
||||
import tconstruct.TConstruct;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers Waila Compatibility", description = "Tinkers Construct compatibility for Waila", modsRequired = "Waila")
|
||||
@Pulse(id = "Tinkers Waila Compatibility", description = "Tinkers Construct compatibility for Waila", modsRequired = "Waila", forced = true)
|
||||
public class TinkerWaila
|
||||
{
|
||||
@Handler
|
||||
|
||||
Reference in new issue
Block a user