-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Scoreboard: Completely revamp the API
Adds mutability to Scoreboard.Score among these other changes: (added unless otherwise stated) Team: - getColor - setColor Scoreboard: - addLine - createTeam - removeIndex - removeScores Scoreboard.Score: - getName changed to return String. made to be more consistent with other CT Apis, though could change those instead to return TextComponents - getNumberFormat - getTeam - remove - reset - resetName - resetNumberFormat - resetPoints - resetTeam - setName - setNumberFormat - setPoints - setTeam
- Loading branch information
1 parent
5c35cb9
commit d3cad4e
Showing
11 changed files
with
400 additions
and
46 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
15 changes: 15 additions & 0 deletions
15
src/main/java/com/chattriggers/ctjs/internal/mixins/Scoreboard$1Accessor.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,15 @@ | ||
package com.chattriggers.ctjs.internal.mixins; | ||
|
||
import net.minecraft.scoreboard.ScoreHolder; | ||
import net.minecraft.scoreboard.ScoreboardScore; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.gen.Accessor; | ||
|
||
@Mixin(targets = "net.minecraft.scoreboard.Scoreboard$1") | ||
public interface Scoreboard$1Accessor { | ||
@Accessor("field_47543") | ||
ScoreboardScore getScore(); | ||
|
||
@Accessor("field_47547") | ||
ScoreHolder getHolder(); | ||
} |
19 changes: 19 additions & 0 deletions
19
src/main/java/com/chattriggers/ctjs/internal/mixins/ScoreboardObjectiveMixin.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,19 @@ | ||
package com.chattriggers.ctjs.internal.mixins; | ||
|
||
import com.chattriggers.ctjs.api.world.Scoreboard; | ||
import net.minecraft.scoreboard.ScoreboardObjective; | ||
import net.minecraft.text.Text; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
@Mixin(ScoreboardObjective.class) | ||
public class ScoreboardObjectiveMixin { | ||
@Inject(method = "setDisplayName", at = @At("HEAD"), cancellable = true) | ||
private void chattriggers$keepCustomName(Text name, CallbackInfo ci) { | ||
if (Scoreboard.INSTANCE.getCustomTitle$ctjs()) { | ||
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
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
Oops, something went wrong.