diff --git a/src/build.gradle b/src/build.gradle index 0046755..29badd1 100644 --- a/src/build.gradle +++ b/src/build.gradle @@ -35,5 +35,5 @@ resources { srcDirs = ["$projectDir/resources"] } } archivesBaseName = "shouldersurfing" -version = "1.7.2" -minecraft.version = "1.7.2-10.12.2.1121" +version = "1.7.10" +minecraft.version = "1.7.10-10.13.2.1230" diff --git a/src/java/com/teamderpy/shouldersurfing/ShoulderEvents.java b/src/java/com/teamderpy/shouldersurfing/ShoulderEvents.java index 1ac414f..b8f9916 100644 --- a/src/java/com/teamderpy/shouldersurfing/ShoulderEvents.java +++ b/src/java/com/teamderpy/shouldersurfing/ShoulderEvents.java @@ -57,7 +57,7 @@ public void preRenderCrosshairs(RenderGameOverlayEvent.Pre event){ float tick = event.partialTicks; GuiIngame g = ShoulderLoader.mc.ingameGUI; - ScaledResolution sr = new ScaledResolution(ShoulderLoader.mc.gameSettings, ShoulderLoader.mc.displayWidth, ShoulderLoader.mc.displayHeight); + ScaledResolution sr = new ScaledResolution(ShoulderLoader.mc, ShoulderLoader.mc.displayWidth, ShoulderLoader.mc.displayHeight); if(ShoulderLoader.mc.gameSettings.thirdPersonView == 0){ lastX = sr.getScaledWidth()*sr.getScaleFactor()/2;; diff --git a/src/java/com/teamderpy/shouldersurfing/asm/InjectionDelegation.java b/src/java/com/teamderpy/shouldersurfing/asm/InjectionDelegation.java index 0d53420..ae20869 100644 --- a/src/java/com/teamderpy/shouldersurfing/asm/InjectionDelegation.java +++ b/src/java/com/teamderpy/shouldersurfing/asm/InjectionDelegation.java @@ -70,7 +70,7 @@ public static void calculateRayTraceProjection(){ */ @Deprecated public static void drawCrosshairs(net.minecraft.client.gui.Gui g, float tick){ - ScaledResolution sr = new ScaledResolution(ShoulderLoader.mc.gameSettings, ShoulderLoader.mc.displayWidth, ShoulderLoader.mc.displayHeight); + ScaledResolution sr = new ScaledResolution(ShoulderLoader.mc, ShoulderLoader.mc.displayWidth, ShoulderLoader.mc.displayHeight); if(ShoulderLoader.mc.gameSettings.thirdPersonView == 0){ lastX = sr.getScaledWidth()*sr.getScaleFactor()/2;; diff --git a/src/java/com/teamderpy/shouldersurfing/asm/ShoulderTransformations.java b/src/java/com/teamderpy/shouldersurfing/asm/ShoulderTransformations.java index 2745bb1..66b0c2e 100644 --- a/src/java/com/teamderpy/shouldersurfing/asm/ShoulderTransformations.java +++ b/src/java/com/teamderpy/shouldersurfing/asm/ShoulderTransformations.java @@ -55,13 +55,13 @@ public ShoulderTransformations() * MD: ban/g (F)V net/minecraft/src/EntityRenderer/func_78467_g (F)V */ - registerMapping("EntityRendererClass", "net.minecraft.client.renderer.EntityRenderer", "bll"); - registerMapping("EntityRendererJavaClass", "net/minecraft/client/renderer/EntityRenderer", "bll"); - registerMapping("EntityLivingJavaClass", "net/minecraft/entity/EntityLivingBase" , "rh"); - registerMapping("EntityJavaClass", "net/minecraft/entity/Entity" , "qn"); - registerMapping("orientCameraMethod", "orientCamera" , "g"); - registerMapping("rotationYawField", "rotationYaw" , "z"); - registerMapping("rotationPitchField", "rotationPitch" , "A"); + registerMapping("EntityRendererClass", "net.minecraft.client.renderer.EntityRenderer", "blt"); + registerMapping("EntityRendererJavaClass", "net/minecraft/client/renderer/EntityRenderer", "blt"); + registerMapping("EntityLivingJavaClass", "net/minecraft/entity/EntityLivingBase" , "sv"); + registerMapping("EntityJavaClass", "net/minecraft/entity/Entity" , "sa"); + registerMapping("orientCameraMethod", "orientCamera" , "h"); + registerMapping("rotationYawField", "rotationYaw" , "y"); + registerMapping("rotationPitchField", "rotationPitch" , "z"); registerMapping("SHOULDER_ROTATIONField", "SHOULDER_ROTATION" , "SHOULDER_ROTATION"); registerMapping("SHOULDER_ZOOM_MODField", "SHOULDER_ZOOM_MOD" , "SHOULDER_ZOOM_MOD"); @@ -73,8 +73,8 @@ public ShoulderTransformations() */ registerMapping("renderWorldMethod", "renderWorld" , "a"); - registerMapping("clippingHelperImplJavaClass", "net/minecraft/client/renderer/culling/ClippingHelperImpl", "bmo"); - registerMapping("clippingHelperJavaClass", "net/minecraft/client/renderer/culling/ClippingHelper" , "bmq"); + registerMapping("clippingHelperImplJavaClass", "net/minecraft/client/renderer/culling/ClippingHelperImpl", "bmw"); + registerMapping("clippingHelperJavaClass", "net/minecraft/client/renderer/culling/ClippingHelper" , "bmy"); registerMapping("clippingHelperGetInstanceMethod", "getInstance" , "a"); /* net.minecraft.client.gui.GuiIngame renderGameOverlay diff --git a/src/java/com/teamderpy/shouldersurfing/math/RayTracer.java b/src/java/com/teamderpy/shouldersurfing/math/RayTracer.java index 541334c..9d8ab13 100644 --- a/src/java/com/teamderpy/shouldersurfing/math/RayTracer.java +++ b/src/java/com/teamderpy/shouldersurfing/math/RayTracer.java @@ -43,7 +43,7 @@ public static void traceFromEyes(final float tick) if(omo != null){ ShoulderRenderBin.rayTraceHit = omo.hitVec; - blockDist = omo.hitVec.distanceTo(ShoulderLoader.mc.theWorld.getWorldVec3Pool().getVecFromPool(ShoulderLoader.mc.renderViewEntity.posX, ShoulderLoader.mc.renderViewEntity.posY, ShoulderLoader.mc.renderViewEntity.posZ)); + blockDist = omo.hitVec.distanceTo(Vec3.createVectorHelper(ShoulderLoader.mc.renderViewEntity.posX, ShoulderLoader.mc.renderViewEntity.posY, ShoulderLoader.mc.renderViewEntity.posZ)); //System.out.println("block dist: " + blockDist); if(blockDist <= (double)ShoulderLoader.mc.playerController.getBlockReachDistance()){ ShoulderRenderBin.rayTraceInReach = true; @@ -74,7 +74,7 @@ public static void traceFromEyes(final float tick) MovingObjectPosition potentialIntercept = aabb.calculateIntercept(renderViewPos, sightRay); if (potentialIntercept != null){ - double entityDist = potentialIntercept.hitVec.distanceTo(ShoulderLoader.mc.theWorld.getWorldVec3Pool().getVecFromPool(ShoulderLoader.mc.renderViewEntity.posX, ShoulderLoader.mc.renderViewEntity.posY, ShoulderLoader.mc.renderViewEntity.posZ)); + double entityDist = potentialIntercept.hitVec.distanceTo(Vec3.createVectorHelper(ShoulderLoader.mc.renderViewEntity.posX, ShoulderLoader.mc.renderViewEntity.posY, ShoulderLoader.mc.renderViewEntity.posZ)); if(entityDist < blockDist){ ShoulderRenderBin.rayTraceHit = potentialIntercept.hitVec; diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 6f55146..b0c86c7 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -2,9 +2,9 @@ { "modid": "shouldersurfing", "name": "ShoulderSurfing", - "description": "Changes the vanilla third person camera to an over-the-shoulder camera, as made popular by Capcom's \"Resident Evil 4\". Includes keybindings for adjusting the camera, along with various settings in the config file. Must be installed as a Forge coremod. Code injection may fail if using mods that mess with the base files.\n\nUpdate to 1.7.2 by LaysDragon", - "version": "1.7.2-v1", - "mcversion": "1.7.2", + "description": "Changes the vanilla third person camera to an over-the-shoulder camera, as made popular by Capcom's \"Resident Evil 4\". Includes keybindings for adjusting the camera, along with various settings in the config file. Must be installed as a Forge coremod. Code injection may fail if using mods that mess with the base files.\n\nUpdate to 1.7.10 by LaysDragon", + "version": "1.7.10-v1", + "mcversion": "1.7.10", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1287308-shoulder-surfing-modded-third-person-camera", "updateUrl": "", "authorList": ["Joshua Powers"],