Adding first 1.15 support
Dieser Commit ist enthalten in:
Ursprung
66f615f228
Commit
feb21afa92
@ -10,7 +10,7 @@
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>BauSystem_14</artifactId>
|
||||
<artifactId>BauSystem_15</artifactId>
|
||||
<version>1.0</version>
|
||||
|
||||
<build>
|
||||
@ -30,7 +30,7 @@
|
||||
<dependency>
|
||||
<groupId>steamwar</groupId>
|
||||
<artifactId>Spigot</artifactId>
|
||||
<version>1.14</version>
|
||||
<version>1.15</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
@ -1,9 +1,9 @@
|
||||
package de.steamwar.bausystem.commands;
|
||||
|
||||
import net.minecraft.server.v1_14_R1.MinecraftServer;
|
||||
import net.minecraft.server.v1_15_R1.MinecraftServer;
|
||||
|
||||
public class CommandInfo_14 {
|
||||
private CommandInfo_14(){}
|
||||
public class CommandInfo_15 {
|
||||
private CommandInfo_15(){}
|
||||
|
||||
static double[] getTps(){
|
||||
return MinecraftServer.getServer().recentTps;
|
@ -4,8 +4,8 @@ import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
|
||||
class AutoLoader_14 {
|
||||
private AutoLoader_14(){}
|
||||
class AutoLoader_15 {
|
||||
private AutoLoader_15(){}
|
||||
|
||||
static boolean tntPlaceActionPerform(Location location){
|
||||
Material m = location.getBlock().getType();
|
@ -7,8 +7,8 @@ import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.math.transform.AffineTransform;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
public class Region_14 {
|
||||
private Region_14(){}
|
||||
public class Region_15 {
|
||||
private Region_15(){}
|
||||
|
||||
static void paste(Schematic schem, Vector v, AffineTransform aT){
|
||||
schem.paste(new BukkitWorld(Bukkit.getWorlds().get(0)), BlockVector3.at(v.getX(), v.getY(), v.getZ()), false, true, aT).flushQueue();
|
@ -9,8 +9,8 @@ import java.util.LinkedList;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
class TNTTracer_14 {
|
||||
private TNTTracer_14(){}
|
||||
class TNTTracer_15 {
|
||||
private TNTTracer_15(){}
|
||||
|
||||
static void remove(Map<TNTPrimed, LinkedList<Location>> locations, TNTPrimed tnt){
|
||||
Material material = tnt.getLocation().getBlock().getType();
|
@ -33,8 +33,8 @@ public class CommandInfo implements CommandExecutor {
|
||||
|
||||
double[] tps;
|
||||
switch(Core.getVersion()){
|
||||
case 14:
|
||||
tps = CommandInfo_14.getTps();
|
||||
case 15:
|
||||
tps = CommandInfo_15.getTps();
|
||||
break;
|
||||
default:
|
||||
tps = CommandInfo_12.getTps();
|
||||
|
@ -67,8 +67,8 @@ public class Region {
|
||||
|
||||
static void paste(Schematic schem, Vector v, AffineTransform aT){
|
||||
switch(Core.getVersion()){
|
||||
case 14:
|
||||
Region_14.paste(schem, v, aT);
|
||||
case 15:
|
||||
Region_15.paste(schem, v, aT);
|
||||
default:
|
||||
Region_12.paste(schem, v, aT);
|
||||
}
|
||||
|
@ -27,8 +27,8 @@ public class TNTTracer {
|
||||
|
||||
static void remove(TNTPrimed tnt){
|
||||
switch (Core.getVersion()){
|
||||
case 14:
|
||||
TNTTracer_14.remove(locations, tnt);
|
||||
case 15:
|
||||
TNTTracer_15.remove(locations, tnt);
|
||||
break;
|
||||
default:
|
||||
TNTTracer_12.remove(locations, tnt);
|
||||
@ -52,8 +52,8 @@ public class TNTTracer {
|
||||
status = Status.SHOW;
|
||||
|
||||
switch (Core.getVersion()){
|
||||
case 14:
|
||||
return TNTTracer_14.show(locations, printedLocs);
|
||||
case 15:
|
||||
return TNTTracer_15.show(locations, printedLocs);
|
||||
default:
|
||||
return TNTTracer_12.show(locations, printedLocs);
|
||||
}
|
||||
@ -74,8 +74,8 @@ public class TNTTracer {
|
||||
|
||||
private static boolean airOrBrick(Block block){
|
||||
switch(Core.getVersion()){
|
||||
case 14:
|
||||
return TNTTracer_14.airOrBrick(block);
|
||||
case 15:
|
||||
return TNTTracer_15.airOrBrick(block);
|
||||
default:
|
||||
return TNTTracer_12.airOrBrick(block);
|
||||
}
|
||||
|
2
pom.xml
2
pom.xml
@ -36,7 +36,7 @@
|
||||
|
||||
<modules>
|
||||
<module>BauSystem_12</module>
|
||||
<module>BauSystem_14</module>
|
||||
<module>BauSystem_15</module>
|
||||
<module>BauSystem_Main</module>
|
||||
<module>BauSystem_API</module>
|
||||
</modules>
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren