Merge remote-tracking branch 'upstream/master'

This commit is contained in:
rafern 2021-08-31 13:57:01 +01:00
commit d541d3958d
No known key found for this signature in database
GPG Key ID: FE8BE3E64992D5CF
2 changed files with 8 additions and 4 deletions

View File

@ -36,7 +36,7 @@ import team.stiff.pomelo.impl.annotated.handler.annotation.Listener;
*/
public final class NoLagModule extends Module {
public final Value<Boolean> light = new Value<Boolean>("Light", new String[]{"Lit", "l"}, "Choose to enable the lighting lag fix. Disables lighting updates.", true);
public final Value<Boolean> light = new Value<Boolean>("Light", new String[]{"Lit", "l"}, "Choose to enable the lighting lag fix. Disables lighting updates.", false);
public final Value<Boolean> signs = new Value<Boolean>("Signs", new String[]{"Sign", "si"}, "Choose to enable the sign lag fix. Disables the rendering of sign text.", false);
public final Value<Boolean> sounds = new Value<Boolean>("Sounds", new String[]{"Sound", "s"}, "Choose to enable the sound lag fix. Disable entity swap-item/equip sound.", true);
public final Value<Boolean> fluids = new Value<Boolean>("Fluids", new String[]{"Fluid", "f", "Liquids", "liq", "Water", "Lava"}, "Disables the rendering of all fluids.", false);

View File

@ -26,6 +26,8 @@ import team.stiff.pomelo.impl.annotated.handler.annotation.Listener;
public final class AutoFarmModule extends Module {
public final Value<Mode> mode = new Value<Mode>("Mode", new String[]{"Mode", "m"}, "The current farming mode.", Mode.HARVEST);
public final Value<Boolean> modeHarvestRClick = new Value<Boolean>("ModeHarvestRClick", new String[]{"HarvestRightClick", "HarvestRClick", "hrc", "mhrc"}, "Should we right click instead of breaking when harvesting? (Modpacks)", false);
public final Value<Float> range = new Value<Float>("Range", new String[]{"Range", "Reach", "r"}, "The range in blocks your player should reach to farm.", 4.0f, 1.0f, 9.0f, 0.1f);
public final Value<Boolean> rotate = new Value<Boolean>("Rotate", new String[]{"rot"}, "Should we rotate the player's head when Auto-Farming?", true);
@ -92,10 +94,12 @@ public final class AutoFarmModule extends Module {
private void doFarming(final Minecraft mc) {
switch (mode.getValue()) {
case HARVEST:
if (mc.playerController.onPlayerDamageBlock(currentBlockPos, EntityUtil.getFacingDirectionToPosition(currentBlockPos))) {
mc.player.swingArm(EnumHand.MAIN_HAND);
if (!this.modeHarvestRClick.getValue()) { // if false: break to harvest (vanilla)
if (mc.playerController.onPlayerDamageBlock(currentBlockPos, EntityUtil.getFacingDirectionToPosition(currentBlockPos))) {
mc.player.swingArm(EnumHand.MAIN_HAND);
}
break;
}
break;
case PLANT:
case HOE:
case BONEMEAL: