fix item registration+implement WCT keybind

This commit is contained in:
p455w0rd committed 2016-04-27 15:32:38 -04:00
1 parent c920b72862
commit 808a54140d
3 files changed
+11 -13

No files matched your search

@@ -46,13 +46,13 @@ public class WirelessCraftingTerminal {
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
if (!Loader.isModLoaded("wct-core")) {
proxy.missingCoreMod();
WirelessCraftingTerminal.proxy.missingCoreMod();
}
long stopwatch = WCTLog.beginSection("PreInit");
WirelessCraftingTerminal.WCTState = LoaderState.PREINITIALIZATION;
WirelessCraftingTerminal.INSTANCE = this;
creativeTab = new CreativeTabWCT(CreativeTabs.getNextID(), Reference.MODID).setNoScrollbar();
proxy.registerItems();
WirelessCraftingTerminal.proxy.registerItems();
ConfigHandler.init(new File(event.getModConfigurationDirectory(), Reference.CONFIG_FILE));
FMLCommonHandler.instance().bus().register(proxy);
AEApi.instance().registries().wireless().registerWirelessHandler((IWirelessTermHandler) ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem());
@@ -76,7 +76,7 @@ public class WirelessCraftingTerminal {
FMLCommonHandler.instance().registerCrashCallable(new IntegrationCrashEnhancement());
NetworkRegistry.INSTANCE.registerGuiHandler(this.INSTANCE, new WCTGuiHandler());
NetworkHandler.instance = new NetworkHandler("WCT");
proxy.removeItemsFromNEI();
WirelessCraftingTerminal.proxy.removeItemsFromNEI();
WCTLog.endSection("PostInit", stopwatch);
}
@@ -330,8 +330,6 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon
for (int x = 0; x < 9; x++) {
ic.setInventorySlotContents(x, this.craftMatrixSlot[x].getStack());
}
//this.output.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(ic, worldObj));
this.craftingSlot.putStack(CraftingManager.getInstance().findMatchingRecipe(ic, this.worldObj));
writeToNBT("crafting");
}
@@ -750,12 +748,12 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon
this.sendCustomName();
if (Platform.isSameItem(this.civ.getItemStack(), this.getPlayerInv().getCurrentItem())) {
this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.civ.getItemStack());
}
else {
this.setValidContainer(false);
}
//if (Platform.isSameItem(this.civ.getItemStack(), this.getPlayerInv().getCurrentItem())) {
// this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.civ.getItemStack());
//}
//else {
//this.setValidContainer(false);
//}
// drain 1 ae t
this.ticks++;
@@ -28,9 +28,9 @@ public class ClientProxy extends CommonProxy {
}
}
public void registerItems() {
//public void registerItems() {
// =]
}
//}
public void registerRenderers() {
// No renderers...yet =]