Skip to content

Refactor basic weapons #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sysnote8main merged 8 commits into from
Jan 25, 2026
Merged

Refactor basic weapons #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9e3f49
feat: split Brush.java
sysnote8main Jan 24, 2026
1afeee5
feat: split Blaster.java
sysnote8main Jan 24, 2026
edd9ff7
chore: format
sysnote8main Jan 24, 2026
4572726
feat: split Bucket.java
sysnote8main Jan 24, 2026
a2ed698
chore: format
sysnote8main Jan 24, 2026
30970b4
fix: forget to change target task of build action
sysnote8main Jan 24, 2026
0ec28e0
fix: npc skip handling
sysnote8main Jan 24, 2026
c21b1ee
chore: temp commit before sleep
sysnote8main Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: wget -O ./libs/ProtocolLib.jar "https://github.com/dmulloy2/ProtocolLib/releases/download/4.8.0/ProtocolLib.jar"

- name: Build with Gradle
run: ./gradlew build
run: ./gradlew shadowJar

- name: Upload a Build Artifact
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/be4rjp/sclat/api/IOwnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package be4rjp.sclat.api;

import org.bukkit.entity.Player;

public interface IOwnable {
Player getOwner();
}
8 changes: 7 additions & 1 deletion src/main/java/be4rjp/sclat/data/KasaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

package be4rjp.sclat.data;

import be4rjp.sclat.api.IOwnable;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Player;

Expand All @@ -11,7 +12,7 @@
*
* @author Be4rJP
*/
public class KasaData {
public class KasaData implements IOwnable {

private List<ArmorStand> list = new ArrayList<>();
private Player player;
Expand Down Expand Up @@ -40,4 +41,9 @@ public void setDamage(double damage) {
public void setArmorStandList(List<ArmorStand> list) {
this.list = list;
}

@Override
public Player getOwner() {
return player;
}
}
7 changes: 6 additions & 1 deletion src/main/java/be4rjp/sclat/data/SplashShieldData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

package be4rjp.sclat.data;

import be4rjp.sclat.api.IOwnable;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
Expand All @@ -12,7 +13,7 @@
*
* @author Be4rJP
*/
public class SplashShieldData {
public class SplashShieldData implements IOwnable {
private BukkitRunnable task;
private List<ArmorStand> list = new ArrayList<>();
private Player player;
Expand Down Expand Up @@ -59,4 +60,8 @@ public void setIsDeploy(boolean isdep) {
this.IsDeploy = isdep;
}

@Override
public Player getOwner() {
return player;
}
}
6 changes: 3 additions & 3 deletions src/main/java/be4rjp/sclat/gui/ClickListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
import be4rjp.sclat.manager.SuperJumpMgr;
import be4rjp.sclat.manager.WeaponClassMgr;
import be4rjp.sclat.tutorial.Tutorial;
import be4rjp.sclat.weapon.Brush;
import be4rjp.sclat.weapon.Bucket;
import be4rjp.sclat.weapon.Buckler;
import be4rjp.sclat.weapon.Charger;
import be4rjp.sclat.weapon.Decoy;
import be4rjp.sclat.weapon.Funnel;
Expand All @@ -37,6 +34,9 @@
import be4rjp.sclat.weapon.Shooter;
import be4rjp.sclat.weapon.Spinner;
import be4rjp.sclat.weapon.Swapper;
import be4rjp.sclat.weapon.brush.Brush;
import be4rjp.sclat.weapon.bucket.Bucket;
import be4rjp.sclat.weapon.buckler.Buckler;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/be4rjp/sclat/manager/FakePlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package be4rjp.sclat.manager;

import com.mojang.authlib.GameProfile;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.MinecraftServer;
import net.minecraft.server.v1_15_R1.PlayerInteractManager;
import net.minecraft.server.v1_15_R1.WorldServer;

public class FakePlayer extends EntityPlayer {
public FakePlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile,
PlayerInteractManager playerinteractmanager) {
super(minecraftserver, worldserver, gameprofile, playerinteractmanager);
}

public void setBQ(byte value) {
getDataWatcher().set(bq, value);
}
}
6 changes: 3 additions & 3 deletions src/main/java/be4rjp/sclat/manager/GameMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
import be4rjp.sclat.lobby.LobbyScoreboardRunnable;
import be4rjp.sclat.packet.PacketHandler;
import be4rjp.sclat.tutorial.Tutorial;
import be4rjp.sclat.weapon.Brush;
import be4rjp.sclat.weapon.Bucket;
import be4rjp.sclat.weapon.Buckler;
import be4rjp.sclat.weapon.Charger;
import be4rjp.sclat.weapon.Decoy;
import be4rjp.sclat.weapon.Funnel;
Expand All @@ -35,6 +32,9 @@
import be4rjp.sclat.weapon.Shooter;
import be4rjp.sclat.weapon.Spinner;
import be4rjp.sclat.weapon.Swapper;
import be4rjp.sclat.weapon.brush.Brush;
import be4rjp.sclat.weapon.bucket.Bucket;
import be4rjp.sclat.weapon.buckler.Buckler;
import io.netty.channel.Channel;
import io.netty.channel.ChannelPipeline;
import net.md_5.bungee.api.chat.ClickEvent;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/be4rjp/sclat/manager/MainWeaponMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import be4rjp.sclat.api.player.PlayerData;
import be4rjp.sclat.data.DataMgr;
import be4rjp.sclat.data.MainWeapon;
import be4rjp.sclat.weapon.Blaster;
import be4rjp.sclat.weapon.Brush;
import be4rjp.sclat.weapon.Bucket;
import be4rjp.sclat.weapon.Burst;
import be4rjp.sclat.weapon.Kasa;
import be4rjp.sclat.weapon.Roller;
import be4rjp.sclat.weapon.Slosher;
import be4rjp.sclat.weapon.blaster.Blaster;
import be4rjp.sclat.weapon.brush.Brush;
import be4rjp.sclat.weapon.bucket.Bucket;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/be4rjp/sclat/manager/MatchMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
import be4rjp.sclat.data.Path;
import be4rjp.sclat.data.WeaponClass;
import be4rjp.sclat.gui.OpenGUI;
import be4rjp.sclat.weapon.Brush;
import be4rjp.sclat.weapon.Bucket;
import be4rjp.sclat.weapon.Buckler;
import be4rjp.sclat.weapon.Charger;
import be4rjp.sclat.weapon.Decoy;
import be4rjp.sclat.weapon.Funnel;
Expand All @@ -43,6 +40,9 @@
import be4rjp.sclat.weapon.Shooter;
import be4rjp.sclat.weapon.Spinner;
import be4rjp.sclat.weapon.Swapper;
import be4rjp.sclat.weapon.brush.Brush;
import be4rjp.sclat.weapon.bucket.Bucket;
import be4rjp.sclat.weapon.buckler.Buckler;
import be4rjp.sclat.weapon.spweapon.SuperArmor;
import com.xxmicloxx.NoteBlockAPI.model.Song;
import com.xxmicloxx.NoteBlockAPI.songplayer.RadioSongPlayer;
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/be4rjp/sclat/manager/NPCMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import be4rjp.sclat.Sclat;
import be4rjp.sclat.data.DataMgr;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.v1_15_R1.DataWatcherRegistry;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.EnumItemSlot;
import net.minecraft.server.v1_15_R1.MinecraftServer;
import net.minecraft.server.v1_15_R1.PacketPlayOutAnimation;
Expand All @@ -31,7 +29,7 @@ public class NPCMgr {

public static void createNPC(Player player1, String npcName1, Location location1) {
BukkitRunnable task = new BukkitRunnable() {
EntityPlayer npc;
FakePlayer npc;

int s = 0;

Expand All @@ -46,13 +44,13 @@ public void run() {

MinecraftServer nmsServer = ((CraftServer) Bukkit.getServer()).getServer();
WorldServer nmsWorld = ((CraftWorld) location.getWorld()).getHandle();
GameProfile gameProfile = new GameProfile(player.getUniqueId(), npcName);
GameProfile gameProfile = ((CraftPlayer) player).getHandle().getProfile();

npc = new EntityPlayer(nmsServer, nmsWorld, gameProfile, new PlayerInteractManager(nmsWorld));
npc = new FakePlayer(nmsServer, nmsWorld, gameProfile, new PlayerInteractManager(nmsWorld));

// 見えないところにスポーンさせて、クライアントにスキンを先に読み込ませる
npc.setLocation(location.getX(), location.getY() - 20, location.getZ(), location.getYaw(), 0);
npc.getDataWatcher().set(DataWatcherRegistry.a.a(15), (byte) 127);
npc.setBQ((byte) 127);

for (Player p : Sclat.getPlugin(Sclat.class).getServer().getOnlinePlayers()) {
PlayerConnection connection = ((CraftPlayer) p).getHandle().playerConnection;
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/be4rjp/sclat/manager/PlayerStatusMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import be4rjp.sclat.Sclat;
import be4rjp.sclat.api.rank.Ratings;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.v1_15_R1.DataWatcherRegistry;
import net.minecraft.server.v1_15_R1.EntityArmorStand;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.MinecraftServer;
import net.minecraft.server.v1_15_R1.PacketPlayOutAnimation;
import net.minecraft.server.v1_15_R1.PacketPlayOutEntityDestroy;
Expand Down Expand Up @@ -88,11 +86,11 @@ public static void sendHologram(Player player) {

MinecraftServer nmsServer = ((CraftServer) Bukkit.getServer()).getServer();
WorldServer nmsWorld = ((CraftWorld) location.getWorld()).getHandle();
GameProfile gameProfile = new GameProfile(player.getUniqueId(), player.getName());
GameProfile gameProfile = ((CraftPlayer) player).getHandle().getProfile();

EntityPlayer npc = new EntityPlayer(nmsServer, nmsWorld, gameProfile, new PlayerInteractManager(nmsWorld));
FakePlayer npc = new FakePlayer(nmsServer, nmsWorld, gameProfile, new PlayerInteractManager(nmsWorld));
npc.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), 0);
npc.getDataWatcher().set(DataWatcherRegistry.a.a(15), (byte) 127);
npc.setBQ((byte) 127);

PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection;
connection
Expand Down
Loading