Skip to content

Commit 714f869

Browse files
authored
Small fixes, thanks Mqtze!
S-Shape Mushroom SDS farm: = Removed a weird rotation Auto Pest Exchange: = Updated Phillip's pest message
2 parents 76d99e5 + 451352b commit 714f869

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
44
mcVersion=1.8.9
55
modid=farmhelperv2
66
modName=FarmHelper
7-
version=2.9.7-pre4
7+
version=2.9.7-pre5
88
shouldRelease=true

src/main/java/com/jelly/farmhelperv2/feature/impl/AutoPestExchange.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ private Entity getPhillip() {
465465
@SubscribeEvent(receiveCanceled = true)
466466
public void onChatMessageReceived(ClientChatReceivedEvent event) {
467467
if (enabled && event.type == 0 && event.message != null && newState == NewState.WAIT_FOR_VACUUM) {
468-
if (event.message.getFormattedText().contains("§e[NPC] §6Phillip§f: Thanks for the §6Pests§f,"))
468+
if (event.message.getFormattedText().contains("§e[NPC] §6Phillip§f: Thanks for the §2ൠ Pests§f,"))
469469
LogUtils.sendSuccess("[Auto Pest Exchange] Successfully emptied the vacuum!");
470470
else {
471471
if (event.message.getUnformattedText().startsWith("You've exchanged enough Pests recently! Try emptying your Vacuum Bag later!")) {

src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMushroomSDSMacro.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ public void onEnable() {
3030

3131
if (MacroHandler.getInstance().isTeleporting()) return;
3232
setRestoredState(false);
33-
Rotation newRotation = new Rotation((float) (getClosest90Deg().orElse(AngleUtils.getClosest()) + -16 + (Math.random() * 1 - 0.5)), getPitch());
34-
setYaw(newRotation.getYaw());
3533
if (FarmHelperConfig.dontFixAfterWarping && Math.abs(getYaw() - AngleUtils.get360RotationYaw()) < 0.1) return;
3634
getRotation().easeTo(
3735
new RotationConfiguration(
38-
newRotation,
36+
new Rotation(getYaw(), getPitch()),
3937
FarmHelperConfig.getRandomRotationTime(), null
4038
).easeOutBack(!MacroHandler.getInstance().isResume())
4139
);

0 commit comments

Comments
 (0)