-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
= Fix for 'Your spawnpoint is obstructed!' Pet Swapper: = Fixes Pests Destroyer: = Small tweaks Game State: = Always hold W in water fixes Others: + Added Patcher's mixin for removing log spam in console + Added timer on top of the screen for the next tp (in case of pests destroyer 'You can't travel while in combat' etc) = Spawn and rewarp points' visibility is based on distance and doesn't draw if further than 50 blocks. Small performance tweak
- Loading branch information
Showing
8 changed files
with
131 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
src/main/java/com/jelly/farmhelperv2/mixin/client/MixinScoreboard.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package com.jelly.farmhelperv2.mixin.client; | ||
|
|
||
| import net.minecraft.scoreboard.ScoreObjective; | ||
| import net.minecraft.scoreboard.ScorePlayerTeam; | ||
| import net.minecraft.scoreboard.Scoreboard; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| // Patcher's fix for the scoreboard log spam | ||
|
|
||
| @Mixin(Scoreboard.class) | ||
| public abstract class MixinScoreboard { | ||
| @Shadow | ||
| public abstract ScorePlayerTeam getTeam(String p_96508_1_); | ||
|
|
||
| @Inject(method = "removeTeam", at = @At("HEAD"), cancellable = true) | ||
| private void patcher$checkIfTeamIsNull(ScorePlayerTeam team, CallbackInfo ci) { | ||
| if (team == null) ci.cancel(); | ||
| } | ||
|
|
||
| @Redirect(method = "removeTeam", at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;", ordinal = 0, remap = false)) | ||
| private <K, V> V patcher$checkIfRegisteredNameIsNull(Map<K, V> instance, K o) { | ||
| if (o != null) return instance.remove(o); | ||
| return null; | ||
| } | ||
|
|
||
| @Inject(method = "removeObjective", at = @At("HEAD"), cancellable = true) | ||
| private void patcher$checkIfObjectiveIsNull(ScoreObjective objective, CallbackInfo ci) { | ||
| if (objective == null) ci.cancel(); | ||
| } | ||
|
|
||
| @Redirect(method = "removeObjective", at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;", ordinal = 0, remap = false)) | ||
| private <K, V> V patcher$checkIfNameIsNull(Map<K, V> instance, K o) { | ||
| if (o != null) return instance.remove(o); | ||
| return null; | ||
| } | ||
|
|
||
| @Inject(method = "createTeam", at = @At(value = "CONSTANT", args = "stringValue=A team with the name '"), cancellable = true) | ||
| private void patcher$returnExistingTeam(String name, CallbackInfoReturnable<ScorePlayerTeam> cir) { | ||
| cir.setReturnValue(this.getTeam(name)); | ||
| } | ||
|
|
||
| @Inject(method = "removePlayerFromTeam", at = @At(value = "CONSTANT", args = "stringValue=Player is either on another team or not on any team. Cannot remove from team '"), cancellable = true) | ||
| private void patcher$silenceException(CallbackInfo ci) { | ||
| ci.cancel(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters