forked from SteamWar/SteamWar
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e0314472b | ||
|
|
6209b86149 | ||
|
|
6f1403df9c | ||
|
|
0113788da2 |
+1
-1
@@ -46,7 +46,7 @@ public class ObserverTracerListener implements Listener {
|
|||||||
public ObserverTracerListener() {
|
public ObserverTracerListener() {
|
||||||
Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
|
Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
|
||||||
SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
|
SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
|
||||||
if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
|
if (pair.getSwPlayer().getPlayer().getGameMode() != GameMode.SPECTATOR) return;
|
||||||
pair.getComponent().show();
|
pair.getComponent().show();
|
||||||
});
|
});
|
||||||
}, 15L, 15L);
|
}, 15L, 15L);
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class NoClipCommand extends SWCommand implements Listener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onUnmount(SWPlayer player) {
|
public void onUnmount(SWPlayer player) {
|
||||||
player.setGameMode(GameMode.CREATIVE);
|
player.getPlayer().setGameMode(GameMode.CREATIVE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ package de.steamwar.core;
|
|||||||
|
|
||||||
import de.steamwar.message.Message;
|
import de.steamwar.message.Message;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import lombok.Getter;
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
import lombok.experimental.Delegate;
|
|
||||||
import net.md_5.bungee.api.ChatMessageType;
|
import net.md_5.bungee.api.ChatMessageType;
|
||||||
import net.md_5.bungee.api.chat.ClickEvent;
|
import net.md_5.bungee.api.chat.ClickEvent;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@@ -99,11 +99,11 @@ public class SWPlayer {
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
public static final class SWPlayerWithComponent<T extends Component> {
|
public static final class SWPlayerWithComponent<T extends Component> {
|
||||||
private final SWPlayer player;
|
private final SWPlayer swPlayer;
|
||||||
private final T component;
|
private final T component;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delegate
|
@Getter
|
||||||
private final Player player;
|
private final Player player;
|
||||||
private final Map<Class<? extends Component>, Component> components = new HashMap<>();
|
private final Map<Class<? extends Component>, Component> components = new HashMap<>();
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
package de.steamwar.core.worldedit;
|
package de.steamwar.core.worldedit;
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||||
|
import com.sk89q.worldedit.IncompleteRegionException;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||||
@@ -121,13 +122,7 @@ public class SteamEditWand implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setLocation(Location location) {
|
public void setLocation(Location location) {
|
||||||
float distance = (float) player.getLocation().distanceSquared(location);
|
|
||||||
wireframe.setPos1And2(location, location);
|
wireframe.setPos1And2(location, location);
|
||||||
float width = distance / 1600;
|
|
||||||
width = ((int) (width * 16)) / 16F;
|
|
||||||
width = Math.max(width, 1 / 16F);
|
|
||||||
width = Math.min(width, 1 / 2F);
|
|
||||||
wireframe.setWidth(width);
|
|
||||||
wireframe.setBlock(WorldEditRendererCUIEditor.Type.CURSOR.getMaterial(player).createBlockData());
|
wireframe.setBlock(WorldEditRendererCUIEditor.Type.CURSOR.getMaterial(player).createBlockData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -338,7 +333,11 @@ public class SteamEditWand implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void selectPos1(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos1) {
|
private void selectPos1(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos1) {
|
||||||
if (!pos1.equals(regionSelector.getPrimaryPosition())) {
|
try {
|
||||||
|
if (!pos1.equals(regionSelector.getPrimaryPosition())) {
|
||||||
|
SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
|
||||||
|
}
|
||||||
|
} catch (IncompleteRegionException e) {
|
||||||
SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
|
SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
|
||||||
}
|
}
|
||||||
regionSelector.selectPrimary(pos1, PermissiveSelectorLimits.getInstance());
|
regionSelector.selectPrimary(pos1, PermissiveSelectorLimits.getInstance());
|
||||||
@@ -362,7 +361,11 @@ public class SteamEditWand implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void selectPos2(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos2) {
|
private void selectPos2(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos2) {
|
||||||
if (regionSelector.getVertices().size() == 2 && !pos2.equals(regionSelector.getVertices().get(1))) {
|
try {
|
||||||
|
if (regionSelector.getVertices().size() == 2 && !pos2.equals(regionSelector.getVertices().get(1))) {
|
||||||
|
SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
|
||||||
|
}
|
||||||
|
} catch (IncompleteRegionException e) {
|
||||||
SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
|
SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
|
||||||
}
|
}
|
||||||
regionSelector.selectSecondary(pos2, PermissiveSelectorLimits.getInstance());
|
regionSelector.selectSecondary(pos2, PermissiveSelectorLimits.getInstance());
|
||||||
|
|||||||
@@ -287,6 +287,10 @@ public class TeamCommand extends SWCommand {
|
|||||||
|
|
||||||
@Register(value = "info", description = "TEAM_INFO_USAGE")
|
@Register(value = "info", description = "TEAM_INFO_USAGE")
|
||||||
public void info(Chatter sender, @ErrorMessage("UNKNOWN_TEAM") Team team) {
|
public void info(Chatter sender, @ErrorMessage("UNKNOWN_TEAM") Team team) {
|
||||||
|
if (team.getMembers().isEmpty()) {
|
||||||
|
sender.system("UNKNOWN_TEAM");
|
||||||
|
return;
|
||||||
|
}
|
||||||
List<SteamwarUser> users = team.getMembers().stream().map(SteamwarUser::byId).toList();
|
List<SteamwarUser> users = team.getMembers().stream().map(SteamwarUser::byId).toList();
|
||||||
|
|
||||||
sender.system("TEAM_INFO_TEAM", team.getTeamName(), team.getTeamColor(), team.getTeamKuerzel());
|
sender.system("TEAM_INFO_TEAM", team.getTeamName(), team.getTeamColor(), team.getTeamKuerzel());
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import net.kyori.adventure.text.Component;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
@Linked
|
//@Linked
|
||||||
public class FML2 extends BasicListener {
|
public class FML2 extends BasicListener {
|
||||||
// FML2: https://wiki.vg/Minecraft_Forge_Handshake#FML2_protocol_.281.13_-_Current.29
|
// FML2: https://wiki.vg/Minecraft_Forge_Handshake#FML2_protocol_.281.13_-_Current.29
|
||||||
// FML3: https://github.com/adde0109/Ambassador/tree/non-api/src/main/java/org/adde0109/ambassador/forge
|
// FML3: https://github.com/adde0109/Ambassador/tree/non-api/src/main/java/org/adde0109/ambassador/forge
|
||||||
|
|||||||
Reference in New Issue
Block a user