From 289978e6dcc7a1326a88ef7b32343aa693ce5f89 Mon Sep 17 00:00:00 2001 From: Ridan Vandenbergh Date: Thu, 8 Aug 2019 19:59:04 +0200 Subject: [PATCH] Update mappings --- gradle.properties | 2 +- .../kami/mixin/client/MixinBlockSoulSand.java | 2 +- .../kami/mixin/client/MixinMinecraft.java | 4 ++-- .../zeroeightsix/kami/module/ModuleManager.java | 16 ++++++++-------- .../kami/module/modules/combat/CrystalAura.java | 2 +- .../module/modules/movement/EntitySpeed.java | 2 +- .../kami/module/modules/player/NoFall.java | 2 +- .../kami/module/modules/player/Scaffold.java | 6 +++--- .../kami/util/TrajectoryCalculator.java | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index e3d12e15b..d901cf016 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ modVersion=b9 modBaseName=kami forgeVersion=1.12.2-14.23.0.2531 #mcpVersion=snapshot_20170605 -mcpVersion=snapshot_20171003 \ No newline at end of file +mcpVersion=snapshot_20180814 \ No newline at end of file diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinBlockSoulSand.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinBlockSoulSand.java index 3ecda9353..0cd6e4ebc 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinBlockSoulSand.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinBlockSoulSand.java @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(BlockSoulSand.class) public class MixinBlockSoulSand { - @Inject(method = "onEntityCollidedWithBlock", at = @At("HEAD"), cancellable = true) + @Inject(method = "onEntityCollision", at = @At("HEAD"), cancellable = true) public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn, CallbackInfo info) { // If noslowdown is on, just don't do anything else in this method (slow the player) if (ModuleManager.isModuleEnabled("NoSlowDown")) info.cancel(); diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java index f3c6bb45a..6bc738a6b 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java @@ -39,7 +39,7 @@ public class MixinMinecraft { @Shadow boolean skipRenderWorld; @Shadow - SoundHandler mcSoundHandler; + SoundHandler soundHandler; @Inject(method = "displayGuiScreen", at = @At("HEAD"), cancellable = true) public void displayGuiScreen(GuiScreen guiScreenIn, CallbackInfo info) { @@ -96,7 +96,7 @@ public class MixinMinecraft { } else { - this.mcSoundHandler.resumeSounds(); + this.soundHandler.resumeSounds(); Minecraft.getMinecraft().setIngameFocus(); } diff --git a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java index a19d8ce16..782cfbef4 100644 --- a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java +++ b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java @@ -65,9 +65,9 @@ public class ModuleManager { } public static void onWorldRender(RenderWorldLastEvent event) { - Minecraft.getMinecraft().mcProfiler.startSection("kami"); + Minecraft.getMinecraft().profiler.startSection("kami"); - Minecraft.getMinecraft().mcProfiler.startSection("setup"); + Minecraft.getMinecraft().profiler.startSection("setup"); // GlStateManager.pushMatrix(); GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); @@ -81,15 +81,15 @@ public class ModuleManager { RenderEvent e = new RenderEvent(KamiTessellator.INSTANCE, renderPos); e.resetTranslation(); - Minecraft.getMinecraft().mcProfiler.endSection(); + Minecraft.getMinecraft().profiler.endSection(); modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(module -> { - Minecraft.getMinecraft().mcProfiler.startSection(module.getName()); + Minecraft.getMinecraft().profiler.startSection(module.getName()); module.onWorldRender(e); - Minecraft.getMinecraft().mcProfiler.endSection(); + Minecraft.getMinecraft().profiler.endSection(); }); - Minecraft.getMinecraft().mcProfiler.startSection("release"); + Minecraft.getMinecraft().profiler.startSection("release"); GlStateManager.glLineWidth(1f); GlStateManager.shadeModel(GL11.GL_FLAT); @@ -100,9 +100,9 @@ public class ModuleManager { GlStateManager.enableCull(); // GlStateManager.popMatrix(); KamiTessellator.releaseGL(); - Minecraft.getMinecraft().mcProfiler.endSection(); + Minecraft.getMinecraft().profiler.endSection(); - Minecraft.getMinecraft().mcProfiler.endSection(); + Minecraft.getMinecraft().profiler.endSection(); } public static void onBind(int eventKey) { diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java index efe488bdb..4b297c907 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java @@ -309,7 +309,7 @@ public class CrystalAura extends Module { } private static float getDamageMultiplied(float damage) { - int diff = mc.world.getDifficulty().getDifficultyId(); + int diff = mc.world.getDifficulty().getId(); return damage * (diff == 0 ? 0 : (diff == 2 ? 1 : (diff == 1 ? 0.5f : 1.5f))); } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/EntitySpeed.java b/src/main/java/me/zeroeightsix/kami/module/modules/movement/EntitySpeed.java index 2b62a9334..57a6e2e00 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/EntitySpeed.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/EntitySpeed.java @@ -144,7 +144,7 @@ public class EntitySpeed extends Module { } private boolean isBorderingChunk(Entity entity, double motX, double motZ) { - return antiStuck.getValue() && mc.world.getChunkFromChunkCoords((int) (entity.posX + motX) >> 4, (int) (entity.posZ + motZ) >> 4) instanceof EmptyChunk; + return antiStuck.getValue() && mc.world.getChunk((int) (entity.posX + motX) >> 4, (int) (entity.posZ + motZ) >> 4) instanceof EmptyChunk; } public static float getOpacity() { diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java index 134fe80e9..fd34b9d90 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java @@ -36,7 +36,7 @@ public class NoFall extends Module { public void onUpdate() { if (bucket.getValue() && mc.player.fallDistance >= distance.getValue() && !EntityUtil.isAboveWater(mc.player) && System.currentTimeMillis() - last > 100) { Vec3d posVec = mc.player.getPositionVector(); - RayTraceResult result = mc.world.rayTraceBlocks(posVec, posVec.addVector(0, -5.33f, 0), true, true, false); + RayTraceResult result = mc.world.rayTraceBlocks(posVec, posVec.add(0, -5.33f, 0), true, true, false); if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) { EnumHand hand = EnumHand.MAIN_HAND; if (mc.player.getHeldItemOffhand().getItem() == Items.WATER_BUCKET) hand = EnumHand.OFF_HAND; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/Scaffold.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/Scaffold.java index 4b85f9f56..879ab0ac0 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/Scaffold.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/Scaffold.java @@ -135,16 +135,16 @@ public class Scaffold extends Module { // check if side is visible (facing away from player) if(eyesPos.squareDistanceTo( - new Vec3d(pos).addVector(0.5, 0.5, 0.5)) >= eyesPos + new Vec3d(pos).add(0.5, 0.5, 0.5)) >= eyesPos .squareDistanceTo( - new Vec3d(neighbor).addVector(0.5, 0.5, 0.5))) + new Vec3d(neighbor).add(0.5, 0.5, 0.5))) continue; // check if neighbor can be right clicked if(!canBeClicked(neighbor)) continue; - Vec3d hitVec = new Vec3d(neighbor).addVector(0.5, 0.5, 0.5) + Vec3d hitVec = new Vec3d(neighbor).add(0.5, 0.5, 0.5) .add(new Vec3d(side2.getDirectionVec()).scale(0.5)); // check if hitVec is within range (4.25 blocks) diff --git a/src/main/java/me/zeroeightsix/kami/util/TrajectoryCalculator.java b/src/main/java/me/zeroeightsix/kami/util/TrajectoryCalculator.java index e5e1075ed..4531ee69b 100644 --- a/src/main/java/me/zeroeightsix/kami/util/TrajectoryCalculator.java +++ b/src/main/java/me/zeroeightsix/kami/util/TrajectoryCalculator.java @@ -279,7 +279,7 @@ public class TrajectoryCalculator { */ private void setThrowableHeading(Vec3d motion, float velocity) { // Divide the current motion by the length of the vector - this.motion = div(motion, (float) motion.lengthVector()); + this.motion = div(motion, (float) motion.length()); // Multiply by the velocity this.motion = mult(this.motion, velocity); }