Skip to content

Commit

Permalink
Removing anything to do with capes, adding back the NEI, and IMC plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Behrhof committed Aug 2, 2014
1 parent f58e804 commit 316dddb
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 182 deletions.
6 changes: 6 additions & 0 deletions src/main/java/tconstruct/TConstruct.java
Expand Up @@ -21,6 +21,9 @@
import tconstruct.mechworks.TinkerMechworks;
import tconstruct.mechworks.landmine.behavior.Behavior;
import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler;
import tconstruct.plugins.imc.TinkerBuildcraft;
import tconstruct.plugins.imc.TinkerThaumcraft;
import tconstruct.plugins.nei.TinkerNEI;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.tools.TinkerTools;
import tconstruct.util.EnvironmentChecks;
Expand Down Expand Up @@ -107,6 +110,9 @@ public void preInit (FMLPreInitializationEvent event)
pulsar.registerPulse(new TinkerSmeltery());
pulsar.registerPulse(new TinkerMechworks());
pulsar.registerPulse(new TinkerArmor());
pulsar.registerPulse(new TinkerNEI());
pulsar.registerPulse(new TinkerThaumcraft());
pulsar.registerPulse(new TinkerBuildcraft());
/*pulsar.registerPulse(new TinkerPrayers());
pulsar.registerPulse(new TinkerCropify());*/

Expand Down
8 changes: 1 addition & 7 deletions src/main/java/tconstruct/client/TControls.java
Expand Up @@ -13,7 +13,6 @@
import tconstruct.armor.ArmorProxyCommon;
import tconstruct.armor.PlayerAbilityHelper;
import tconstruct.armor.items.TravelGear;
import tconstruct.client.event.EventCloakRender;
import tconstruct.client.tabs.TabRegistry;
import tconstruct.util.network.AccessoryInventoryPacket;
import tconstruct.util.network.BeltPacket;
Expand All @@ -25,7 +24,6 @@ public class TControls extends TKeyHandler
{
public static final String keybindCategory = "tconstruct.keybindings";
public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24, keybindCategory);
public static KeyBinding refreshCapes = new KeyBinding("key.tcapes.reload", 88, keybindCategory);
public static KeyBinding toggleGoggles = new KeyBinding("key.tgoggles", 34, keybindCategory);
public static KeyBinding beltSwap = new KeyBinding("key.tbelt", 48, keybindCategory);
public static KeyBinding zoomKey = new KeyBinding("key.tzoom", 44, keybindCategory); //TODO: Make this hold, not toggle
Expand All @@ -46,7 +44,7 @@ public class TControls extends TKeyHandler

public TControls()
{
super(new KeyBinding[] { armorKey, refreshCapes, toggleGoggles, beltSwap, zoomKey }, new boolean[] { false, false, false, false, false }, getVanillaKeyBindings(), new boolean[] { false, false });
super(new KeyBinding[] { armorKey, toggleGoggles, beltSwap, zoomKey }, new boolean[] { false, false, false, false }, getVanillaKeyBindings(), new boolean[] { false, false });
/*ClientRegistry.registerKeyBinding(armorKey);
ClientRegistry.registerKeyBinding(refreshCapes);
ClientRegistry.registerKeyBinding(toggleGoggles);
Expand Down Expand Up @@ -76,10 +74,6 @@ public void keyDown (Type types, KeyBinding kb, boolean tickEnd, boolean isRepea
{
TabRegistry.addTabsToInventory((GuiContainer) mc.currentScreen);
}
if (kb == refreshCapes && mc.currentScreen == null)
{
EventCloakRender.instance.refreshCapes();
}
if (kb == jumpKey) // Double jump
{
if (mc.thePlayer.capabilities.isCreativeMode)
Expand Down
175 changes: 0 additions & 175 deletions src/main/java/tconstruct/client/event/EventCloakRender.java

This file was deleted.

37 changes: 37 additions & 0 deletions src/main/java/tconstruct/plugins/imc/TinkerBuildcraft.java
@@ -0,0 +1,37 @@
package tconstruct.plugins.imc;

import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
import tconstruct.smeltery.TinkerSmeltery;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;

@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Buildcraft addon", description = "The Builcraft addon for Tinkers.", modsRequired = "BuildCraft|Transport", forced = true)
public class TinkerBuildcraft {

@Handler
public void init (FMLInitializationEvent event)
{
TConstruct.logger.info("[BC|Transport] Registering facades.");
// Smeltery Blocks
addFacade(TinkerSmeltery.smeltery, 2);
for (int sc = 4; sc < 11; sc++)
{
addFacade(TinkerSmeltery.smeltery, sc);
}

addFacade(TinkerSmeltery.searedBlock, 0);
addFacade(TinkerSmeltery.searedBlockNether, 0);
}

private void addFacade (Block b, int meta)
{
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", new ItemStack(b, 1, meta));
}

}
30 changes: 30 additions & 0 deletions src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java
@@ -0,0 +1,30 @@
package tconstruct.plugins.imc;

import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.world.TinkerWorld;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;

@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Thaumcraft addon", description = "The Thaumcraft addon for Tinkers.", modsRequired = "Thaumcraft", forced = true)
public class TinkerThaumcraft {

@Handler
public void init(FMLInitializationEvent event)
{
TConstruct.logger.info("[Thaumcraft] Registering harvestables.");
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));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 15));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13));
}

}
28 changes: 28 additions & 0 deletions src/main/java/tconstruct/plugins/nei/TinkerNEI.java
@@ -0,0 +1,28 @@
package tconstruct.plugins.nei;

import codechicken.nei.api.API;
import codechicken.nei.recipe.DefaultOverlayHandler;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
import tconstruct.tools.gui.CraftingStationGui;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import cpw.mods.fml.relauncher.Side;

@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers Not Enough Items Addon", description = "The NEI addon for Tinkers.", modsRequired = "NotEnoughItems", forced = true)
public class TinkerNEI {

@Handler
public void init (FMLInitializationEvent event)
{
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
{
API.registerGuiOverlay(CraftingStationGui.class, "crafting");
API.registerGuiOverlayHandler(CraftingStationGui.class, new DefaultOverlayHandler(), "crafting");
}
}

}

0 comments on commit 316dddb

Please sign in to comment.