Skip to content

Commit eb2d612

Browse files
davboeckidavboecki
committed
Update to CB 1.5.2
1 parent 8235be3 commit eb2d612

8 files changed

+373
-71
lines changed

‎pom.xml

+55-19
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,61 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<groupId>davboecki</groupId>
6-
<artifactId>signcodepad</artifactId>
7-
<version>2.2.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
6+
<groupId>davboecki</groupId>
7+
<artifactId>signcodepad</artifactId>
8+
<version>2.2.0-SNAPSHOT</version>
9+
<packaging>jar</packaging>
910

10-
<name>signcodepad</name>
11-
<url>http://maven.apache.org</url>
11+
<name>signcodepad</name>
12+
<url>http://maven.apache.org</url>
1213

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
</properties>
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
</properties>
17+
18+
<repositories>
19+
<repository>
20+
<id>bukkit</id>
21+
<url>http://repo.bukkit.org/content/repositories/releases</url>
22+
</repository>
23+
</repositories>
24+
25+
<dependencies>
26+
<dependency>
27+
<groupId>junit</groupId>
28+
<artifactId>junit</artifactId>
29+
<version>3.8.1</version>
30+
<scope>test</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.bukkit</groupId>
34+
<artifactId>craftbukkit</artifactId>
35+
<version>1.5.2-R0.1</version>
36+
</dependency>
37+
</dependencies>
38+
39+
<build>
40+
<resources>
41+
<resource>
42+
<directory>src/main/java</directory>
43+
<filtering>true</filtering>
44+
<targetPath>../filtered-sources/java</targetPath>
45+
</resource>
46+
<resource>
47+
<directory>src/main/resources</directory>
48+
<filtering>true</filtering>
49+
</resource>
50+
</resources>
51+
<sourceDirectory>target/filtered-sources/java</sourceDirectory>
52+
<plugins>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-jar-plugin</artifactId>
56+
<version>2.1</version>
57+
</plugin>
58+
</plugins>
59+
</build>
1660

17-
<dependencies>
18-
<dependency>
19-
<groupId>junit</groupId>
20-
<artifactId>junit</artifactId>
21-
<version>3.8.1</version>
22-
<scope>test</scope>
23-
</dependency>
24-
</dependencies>
2561
</project>

‎src/main/java/de/davboecki/signcodepad/BlockChangerTask.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55

66
import org.bukkit.Material;
77
import org.bukkit.block.Block;
8-
import org.bukkit.craftbukkit.CraftWorld;
98

10-
public class BlockChangerTask implements Callable{
9+
public class BlockChangerTask implements Callable {
1110

1211
public static ArrayList <Block> Blocks = new ArrayList<Block>();
13-
14-
@Override
15-
public Object call() {
12+
public Object call() throws Exception {
1613
if(Blocks.size()>0){
1714
for(Block block:Blocks.toArray(new Block[Blocks.size()])){
1815
try{

‎src/main/java/de/davboecki/signcodepad/CodePadPlayerListener.java

+12-23
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,21 @@
33
import java.util.ArrayList;
44
import java.util.HashMap;
55

6-
import de.davboecki.signcodepad.event.CalSaver;
7-
8-
import net.minecraft.server.EntityPlayer;
9-
import net.minecraft.server.Packet100OpenWindow;
10-
import net.minecraft.server.TileEntity;
11-
import net.minecraft.server.TileEntitySign;
12-
136
import org.bukkit.ChatColor;
147
import org.bukkit.Location;
158
import org.bukkit.Material;
169
import org.bukkit.block.Block;
17-
import org.bukkit.block.BlockFace;
18-
import org.bukkit.block.Chest;
1910
import org.bukkit.block.Sign;
20-
import org.bukkit.craftbukkit.CraftWorld;
21-
import org.bukkit.craftbukkit.block.CraftChest;
22-
import org.bukkit.craftbukkit.block.CraftSign;
23-
import org.bukkit.craftbukkit.entity.CraftPlayer;
2411
import org.bukkit.entity.Player;
12+
import org.bukkit.event.EventHandler;
13+
import org.bukkit.event.Listener;
2514
import org.bukkit.event.block.Action;
2615
import org.bukkit.event.player.PlayerInteractEvent;
2716
import org.bukkit.event.player.PlayerJoinEvent;
28-
import org.bukkit.event.Listener;
29-
import org.bukkit.event.EventHandler;
30-
import org.bukkit.event.EventPriority;
3117
import org.bukkit.inventory.ItemStack;
3218

19+
import de.davboecki.signcodepad.event.CalSaver;
20+
3321

3422
public class CodePadPlayerListener implements Listener {
3523
SignCodePad plugin;
@@ -78,7 +66,7 @@ private double getXpos(Player player, Sign sign, Location signloc) {
7866

7967
break;
8068

81-
//Süden
69+
//S�den
8270
case 4:
8371
x = signloc.getX() - playerloc.getX() + 1;
8472
z = playerloc.getZ() - signloc.getZ();
@@ -112,7 +100,7 @@ private double getXposSuba(double Yaw, int value) {
112100

113101
break;
114102

115-
//Süden
103+
//S�den
116104
case 4:
117105
Yaw -= 270;
118106

@@ -155,7 +143,7 @@ private double getYpos(Player player, Sign sign, Location signloc) {
155143

156144
break;
157145

158-
//Süden
146+
//S�den
159147
case 4:
160148
x = signloc.getX() - playerloc.getX() + 1;
161149
y = playerloc.getY() - signloc.getY();
@@ -208,7 +196,7 @@ private void Sternchen(String Code, Sign sign) {
208196
}
209197

210198
private void setError(Sign sign, Player player, String Type) {
211-
sign.setLine(0, "1 2 3 | §cErr ");
199+
sign.setLine(0, "1 2 3 | �cErr ");
212200
sign.update();
213201
new ErrorReset(sign, player).start();
214202

@@ -614,7 +602,7 @@ private void HandleTorchPad(PlayerInteractEvent event) {
614602
}
615603

616604
Sign sign = (Sign) event.getClickedBlock().getState();
617-
sign.setLine(0, "1 2 3 | §aOK ");
605+
sign.setLine(0, "1 2 3 | �aOK ");
618606
sign.update();
619607

620608
try {
@@ -641,7 +629,8 @@ private void HandleBlockPad(PlayerInteractEvent event) {
641629
try {
642630
plugin.getServer().getPluginManager().callEvent(interactevent);
643631
if(!interactevent.isCancelled()) {
644-
net.minecraft.server.Block.byId[block.getTypeId()].interact(((CraftWorld)block.getWorld()).getHandle(), block.getX(), block.getY(), block.getZ(), ((CraftPlayer)event.getPlayer()).getHandle());
632+
SignCodePad.getInstance().bridge.interactOnBlock(block.getX(), block.getY(), block.getZ(), block.getWorld(), event.getPlayer(), block.getTypeId());
633+
//net.minecraft.server.Block.byId[block.getTypeId()].interact(((CraftWorld)block.getWorld()).getHandle(), block.getX(), block.getY(), block.getZ(), ((CraftPlayer)event.getPlayer()).getHandle());
645634
}
646635
} catch(Exception e) {
647636
event.getPlayer().sendMessage(ChatColor.RED+"Couldn't automaticly interact locked block. Please report this problem.");
@@ -652,7 +641,7 @@ private void HandleBlockPad(PlayerInteractEvent event) {
652641
//event.getClickedBlock().setData(data);
653642

654643
//sign = (Sign) event.getClickedBlock().getState();
655-
sign.setLine(0, "1 2 3 | §aOK ");
644+
sign.setLine(0, "1 2 3 | �aOK ");
656645
sign.setLine(1, "4 5 6 | ----");
657646
sign.setLine(2, "7 8 9 | <<- ");
658647
sign.setLine(3, "* 0 # | OK ");

0 commit comments

Comments
 (0)