Update to 1.7.2

Add language file for the key description

Author: LaysDragon

README.md

@@ -3,10 +3,15 @@ ShoulderSurfing
 
 Mod for Minecraft that changes the F5 third-person camera into an over-the-shoulder view
 
-This source code is provided _as-is_ and is _no longer maintained by me_.
-
 Nearly all the source is dependent on the Forge API.
 
+Change
+========
+
+*Update to 1.7.2 by LaysDragon
+*Add language file for the key description
+
+
 Features
 ========
 
@@ -20,7 +25,7 @@ Download
 ========
 Required: Forge universal files for your minecraft version (http://files.minecraftforge.net/)
 The Forge files go into your minecraft jar.
-Tested with Forge 9.10.0.828
+Tested with Forge 10.12.2.1121
 
 Compatibility
 =============
@@ -36,6 +41,3 @@ Open the zip file
 
 The JAR file needs to go into the MODS folder under Minecraft. Make sure to remove any previous versions from the COREMODS and MODS folder. This mod will not work if placed anywhere but the MODS folder!
 
-Issues
-======
-* Prevent camera from clipping into walls in tight spaces (fix behind-head raytrace)

src/build.gradle

@@ -0,0 +1,39 @@
+buildscript {
+repositories
+{
+mavenCentral()
+maven {
+name = "forge"
+url = "http://files.minecraftforge.net/maven"
+}
+maven {
+name = "sonatype"
+url = "https://oss.sonatype.org/content/repositories/snapshots/"
+}
+}
+dependencies
+{
+classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
+}
+}
+
+apply plugin: "forge"
+jar {
+	manifest {
+        attributes 'FMLCorePlugin': 'com.teamderpy.shouldersurfing.asm.ShoulderPlugin'
+        attributes 'FMLCorePluginContainsFMLMod': 'true'
+
+    }
+}
+sourceSets
+{
+main
+{
+java { srcDirs = ["$projectDir/java"] }
+resources { srcDirs = ["$projectDir/resources"] }
+}
+}
+
+archivesBaseName = "shouldersurfing"
+version = "1.7.2"
+minecraft.version = "1.7.2-10.12.2.1121"

src/r120_r121__mc1_4_7/src/minecraft/com/teamderpy/shouldersurfing/ShoulderCamera.java renamed to src/java/com/teamderpy/shouldersurfing/ShoulderCamera.java

@@ -10,13 +10,14 @@
 import net.minecraftforge.client.GuiIngameForge;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
-import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.item.ItemTossEvent;
 
 import com.google.common.eventbus.Subscribe;
 import com.teamderpy.shouldersurfing.asm.InjectionDelegation;
 import com.teamderpy.shouldersurfing.renderer.ShoulderRenderBin;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
 /**
  * @author      Joshua Powers <[email protected]>
  * @version     1.2
@@ -29,14 +30,14 @@ public class ShoulderEvents {
     private static float lastX = 0.0F;
     private static float lastY = 0.0F;
 
-	@ForgeSubscribe
+    @SubscribeEvent
     public void postRenderCrosshairs(RenderGameOverlayEvent.Post event){		
 		if(event.type == RenderGameOverlayEvent.ElementType.CROSSHAIRS){
 
 		}
     }
 
-	@ForgeSubscribe
+    @SubscribeEvent
 	public void preRenderPlayer(RenderPlayerEvent.Pre event){
 		if(ShoulderRenderBin.skipPlayerRender){
 			if(event.isCancelable()){
@@ -45,7 +46,7 @@ public void preRenderPlayer(RenderPlayerEvent.Pre event){
 		}
 	}
 
-	@ForgeSubscribe
+    @SubscribeEvent
     public void preRenderCrosshairs(RenderGameOverlayEvent.Pre event){		
 		if(event.type == RenderGameOverlayEvent.ElementType.CROSSHAIRS){
 			if(!ShoulderSettings.IS_DYNAMIC_CROSSHAIR_ENABLED){

src/r164__mc1_6_4/src/minecraft/com/teamderpy/shouldersurfing/ShoulderEvents.java renamed to src/java/com/teamderpy/shouldersurfing/ShoulderEvents.java

@@ -0,0 +1,49 @@
+package com.teamderpy.shouldersurfing;
+
+import java.util.EnumSet;
+
+import org.lwjgl.input.Keyboard;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.InputEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+import cpw.mods.fml.relauncher.Side;
+
+import com.teamderpy.shouldersurfing.ShoulderKeybindings;
+
+/**
+ * @author      Joshua Powers <[email protected]>
+ * @version     1.1
+ * @since       2013-01-14
+ */
+public class ShoulderKeyHandler {	
+	
+		ShoulderKeyHandler(){}
+		
+		@SubscribeEvent
+		public void tickStart(ClientTickEvent event) {
+		/* minecraft ought to be running and with no gui up */
+		if((event.side==Side.CLIENT)&&(event.phase==Phase.START)){
+			if(ShoulderLoader.mc != null && ShoulderLoader.mc.currentScreen == null){
+				if (ShoulderLoader.mc.gameSettings.thirdPersonView == 1){
+					if(ShoulderKeybindings.KEYBIND_ROTATE_CAMERA_LEFT.getIsKeyPressed()){
+						ShoulderCamera.adjustCameraLeft();
+					}
+					else if(ShoulderKeybindings.KEYBIND_ROTATE_CAMERA_RIGHT.getIsKeyPressed()){
+						ShoulderCamera.adjustCameraRight();
+					}
+					else if(ShoulderKeybindings.KEYBIND_ZOOM_CAMERA_IN.getIsKeyPressed()){
+						ShoulderCamera.adjustCameraIn();
+					}
+					else if(ShoulderKeybindings.KEYBIND_ZOOM_CAMERA_OUT.getIsKeyPressed()){
+						ShoulderCamera.adjustCameraOut();
+					}
+				
+					ShoulderSurfing.writeConfig();
+				}
+			}
+		}
+	}
+
+}

src/java/com/teamderpy/shouldersurfing/ShoulderKeyHandler.java

@@ -4,8 +4,8 @@
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.vector.Vector2f;
-
-import cpw.mods.fml.client.registry.KeyBindingRegistry;
+import cpw.mods.fml.client.registry.ClientRegistry;
+//import cpw.mods.fml.client.registry.KeyBindingRegistry;
 
 /**
  * @author      Joshua Powers <[email protected]>
@@ -16,35 +16,28 @@ public class ShoulderKeybindings {
 	/**
 	 * Minecraft keybindings for camera functions
 	 */
-	public static final KeyBinding KEYBIND_ROTATE_CAMERA_LEFT  = new KeyBinding("Camera adj left"    , Keyboard.KEY_J);
-	public static final KeyBinding KEYBIND_ROTATE_CAMERA_RIGHT = new KeyBinding("Camera adj right"   , Keyboard.KEY_L); 
-	public static final KeyBinding KEYBIND_ZOOM_CAMERA_OUT     = new KeyBinding("Camera adj closer"  , Keyboard.KEY_I); 
-	public static final KeyBinding KEYBIND_ZOOM_CAMERA_IN      = new KeyBinding("Camera adj farther" , Keyboard.KEY_K); 
+	public static final KeyBinding KEYBIND_ROTATE_CAMERA_LEFT  = new KeyBinding("ShoulderSurfing.key.cameraMoveLeft"   , Keyboard.KEY_J, "ShoulderSurfing.keyCategory");
+	public static final KeyBinding KEYBIND_ROTATE_CAMERA_RIGHT = new KeyBinding("ShoulderSurfing.key.cameraMoveRight"  , Keyboard.KEY_L, "ShoulderSurfing.keyCategory"); 
+	public static final KeyBinding KEYBIND_ZOOM_CAMERA_OUT     = new KeyBinding("ShoulderSurfing.key.cameraMoveCloser" , Keyboard.KEY_I, "ShoulderSurfing.keyCategory"); 
+	public static final KeyBinding KEYBIND_ZOOM_CAMERA_IN      = new KeyBinding("ShoulderSurfing.key.cameraMoveFarther", Keyboard.KEY_K, "ShoulderSurfing.keyCategory"); 
 
 	private static KeyBinding[] keyBindings = {
 			KEYBIND_ROTATE_CAMERA_LEFT, 
 			KEYBIND_ROTATE_CAMERA_RIGHT,
 			KEYBIND_ZOOM_CAMERA_OUT,
 			KEYBIND_ZOOM_CAMERA_IN};
 
-	/**
-	 * Whether or not each keybinding repeats
-	 */
-	private static boolean[] isKeyBindingRepeat = {
-			true, 
-			true, 
-			true, 
-			true};
-	
 	/**
 	 * Registers the ShoulderSurfing keybindings with minecraft.
 	 * Should only be called once!
 	 * 
 	 * @return Returns a {@link ShoulderKeyHandler} 
 	 */
 	public static ShoulderKeyHandler registerKeybindings(){
-		ShoulderKeyHandler skh = new ShoulderKeyHandler(keyBindings, isKeyBindingRepeat);
-		KeyBindingRegistry.registerKeyBinding(skh);
+		ShoulderKeyHandler skh = new ShoulderKeyHandler();
+		for(KeyBinding keybinding:keyBindings){
+		ClientRegistry.registerKeyBinding(keybinding);
+		}
 		return skh;
 	}
 }

src/r120_r121__mc1_4_7/src/minecraft/com/teamderpy/shouldersurfing/ShoulderKeybindings.java renamed to src/java/com/teamderpy/shouldersurfing/ShoulderKeybindings.java

@@ -1,7 +1,6 @@
 package com.teamderpy.shouldersurfing;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.src.ModLoader;
 
 public class ShoulderLoader {
 	/**
@@ -10,6 +9,6 @@ public class ShoulderLoader {
     public static Minecraft mc;
 
 	public void load(){
-		ShoulderLoader.mc = ModLoader.getMinecraftInstance();
+		ShoulderLoader.mc = Minecraft.getMinecraft();
 	}
 }