mirror of https://github.com/kami-blue/client
Update mappings
This commit is contained in:
parent
6631ea8a62
commit
289978e6dc
|
@ -6,4 +6,4 @@ modVersion=b9
|
||||||
modBaseName=kami
|
modBaseName=kami
|
||||||
forgeVersion=1.12.2-14.23.0.2531
|
forgeVersion=1.12.2-14.23.0.2531
|
||||||
#mcpVersion=snapshot_20170605
|
#mcpVersion=snapshot_20170605
|
||||||
mcpVersion=snapshot_20171003
|
mcpVersion=snapshot_20180814
|
|
@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
@Mixin(BlockSoulSand.class)
|
@Mixin(BlockSoulSand.class)
|
||||||
public class MixinBlockSoulSand {
|
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) {
|
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 noslowdown is on, just don't do anything else in this method (slow the player)
|
||||||
if (ModuleManager.isModuleEnabled("NoSlowDown")) info.cancel();
|
if (ModuleManager.isModuleEnabled("NoSlowDown")) info.cancel();
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class MixinMinecraft {
|
||||||
@Shadow
|
@Shadow
|
||||||
boolean skipRenderWorld;
|
boolean skipRenderWorld;
|
||||||
@Shadow
|
@Shadow
|
||||||
SoundHandler mcSoundHandler;
|
SoundHandler soundHandler;
|
||||||
|
|
||||||
@Inject(method = "displayGuiScreen", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "displayGuiScreen", at = @At("HEAD"), cancellable = true)
|
||||||
public void displayGuiScreen(GuiScreen guiScreenIn, CallbackInfo info) {
|
public void displayGuiScreen(GuiScreen guiScreenIn, CallbackInfo info) {
|
||||||
|
@ -96,7 +96,7 @@ public class MixinMinecraft {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.mcSoundHandler.resumeSounds();
|
this.soundHandler.resumeSounds();
|
||||||
Minecraft.getMinecraft().setIngameFocus();
|
Minecraft.getMinecraft().setIngameFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,9 +65,9 @@ public class ModuleManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void onWorldRender(RenderWorldLastEvent event) {
|
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.pushMatrix();
|
||||||
GlStateManager.disableTexture2D();
|
GlStateManager.disableTexture2D();
|
||||||
GlStateManager.enableBlend();
|
GlStateManager.enableBlend();
|
||||||
|
@ -81,15 +81,15 @@ public class ModuleManager {
|
||||||
|
|
||||||
RenderEvent e = new RenderEvent(KamiTessellator.INSTANCE, renderPos);
|
RenderEvent e = new RenderEvent(KamiTessellator.INSTANCE, renderPos);
|
||||||
e.resetTranslation();
|
e.resetTranslation();
|
||||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
Minecraft.getMinecraft().profiler.endSection();
|
||||||
|
|
||||||
modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(module -> {
|
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);
|
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.glLineWidth(1f);
|
||||||
|
|
||||||
GlStateManager.shadeModel(GL11.GL_FLAT);
|
GlStateManager.shadeModel(GL11.GL_FLAT);
|
||||||
|
@ -100,9 +100,9 @@ public class ModuleManager {
|
||||||
GlStateManager.enableCull();
|
GlStateManager.enableCull();
|
||||||
// GlStateManager.popMatrix();
|
// GlStateManager.popMatrix();
|
||||||
KamiTessellator.releaseGL();
|
KamiTessellator.releaseGL();
|
||||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
Minecraft.getMinecraft().profiler.endSection();
|
||||||
|
|
||||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
Minecraft.getMinecraft().profiler.endSection();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void onBind(int eventKey) {
|
public static void onBind(int eventKey) {
|
||||||
|
|
|
@ -309,7 +309,7 @@ public class CrystalAura extends Module {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static float getDamageMultiplied(float damage) {
|
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)));
|
return damage * (diff == 0 ? 0 : (diff == 2 ? 1 : (diff == 1 ? 0.5f : 1.5f)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,7 @@ public class EntitySpeed extends Module {
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isBorderingChunk(Entity entity, double motX, double motZ) {
|
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() {
|
public static float getOpacity() {
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class NoFall extends Module {
|
||||||
public void onUpdate() {
|
public void onUpdate() {
|
||||||
if (bucket.getValue() && mc.player.fallDistance >= distance.getValue() && !EntityUtil.isAboveWater(mc.player) && System.currentTimeMillis() - last > 100) {
|
if (bucket.getValue() && mc.player.fallDistance >= distance.getValue() && !EntityUtil.isAboveWater(mc.player) && System.currentTimeMillis() - last > 100) {
|
||||||
Vec3d posVec = mc.player.getPositionVector();
|
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) {
|
if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
|
||||||
EnumHand hand = EnumHand.MAIN_HAND;
|
EnumHand hand = EnumHand.MAIN_HAND;
|
||||||
if (mc.player.getHeldItemOffhand().getItem() == Items.WATER_BUCKET) hand = EnumHand.OFF_HAND;
|
if (mc.player.getHeldItemOffhand().getItem() == Items.WATER_BUCKET) hand = EnumHand.OFF_HAND;
|
||||||
|
|
|
@ -135,16 +135,16 @@ public class Scaffold extends Module {
|
||||||
|
|
||||||
// check if side is visible (facing away from player)
|
// check if side is visible (facing away from player)
|
||||||
if(eyesPos.squareDistanceTo(
|
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(
|
.squareDistanceTo(
|
||||||
new Vec3d(neighbor).addVector(0.5, 0.5, 0.5)))
|
new Vec3d(neighbor).add(0.5, 0.5, 0.5)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// check if neighbor can be right clicked
|
// check if neighbor can be right clicked
|
||||||
if(!canBeClicked(neighbor))
|
if(!canBeClicked(neighbor))
|
||||||
continue;
|
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));
|
.add(new Vec3d(side2.getDirectionVec()).scale(0.5));
|
||||||
|
|
||||||
// check if hitVec is within range (4.25 blocks)
|
// check if hitVec is within range (4.25 blocks)
|
||||||
|
|
|
@ -279,7 +279,7 @@ public class TrajectoryCalculator {
|
||||||
*/
|
*/
|
||||||
private void setThrowableHeading(Vec3d motion, float velocity) {
|
private void setThrowableHeading(Vec3d motion, float velocity) {
|
||||||
// Divide the current motion by the length of the vector
|
// 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
|
// Multiply by the velocity
|
||||||
this.motion = mult(this.motion, velocity);
|
this.motion = mult(this.motion, velocity);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue