Finally fixed GIT (Thanks to Kombustor) and updatet Forge-Imports.

This commit is contained in:
0xSeb
2015-06-26 18:50:54 +02:00
parent 010649f323
commit 39e2c9cdcb
3 changed files with 13 additions and 13 deletions
@@ -5,16 +5,16 @@ import org.lwjgl.input.Keyboard;
import net.minecraft.client.gui.inventory.GuiCrafting; import net.minecraft.client.gui.inventory.GuiCrafting;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentText;
import cpw.mods.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance; import net.minecraftforge.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy; import net.minecraftforge.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent;
import de.skate702.craftingkeys.proxies.CraftingKeysProxy; import de.skate702.craftingkeys.proxies.CraftingKeysProxy;
/** /**
@@ -3,7 +3,7 @@ package de.skate702.craftingkeys;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import cpw.mods.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
@@ -2,8 +2,8 @@ package de.skate702.craftingkeys.proxies;
import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.multiplayer.PlayerControllerMP;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
/** /**
* The common proxy. * The common proxy.