Meduris/CraftingKeys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
0xSeb
2015-06-26 18:40:11 +02:00
parent 1a356ec6bf a0d280d55d
commit 010649f323
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/skate702/craftingkeys/CraftingKeys.java
+10 -10
View File
@@ -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 net.minecraftforge.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod; import cpw.mods.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy; import cpw.mods.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent;
import de.skate702.craftingkeys.proxies.CraftingKeysProxy; import de.skate702.craftingkeys.proxies.CraftingKeysProxy;
/** /**
src/main/java/de/skate702/craftingkeys/Helper.java
+1 -1
View File
@@ -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 net.minecraftforge.fml.client.FMLClientHandler; import cpw.mods.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;
src/main/java/de/skate702/craftingkeys/Settings.java
-1
View File
@@ -3,4 +3,3 @@ package de.skate702.craftingkeys;
public class Settings { public class Settings {
} }
src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
+2 -2
View File
@@ -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 net.minecraftforge.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
/** /**
* The common proxy. * The common proxy.