mirror of https://github.com/Ste3et/furniture.git
Add world Check for DistanceSquared & fix Guillotine
This commit is contained in:
Ste3et_C0st
parent
39d1d58ade
commit
188cf2ab8e
4
pom.xml
4
pom.xml
|
|
@ -2,7 +2,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.Ste3et_C0st.furniture</groupId>
|
||||
<artifactId>DiceFurniture</artifactId>
|
||||
<version>3.4.1</version>
|
||||
<version>3.4.2</version>
|
||||
<build>
|
||||
<defaultGoal>clean package install</defaultGoal>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
<dependency>
|
||||
<groupId>com.github.Ste3et</groupId>
|
||||
<artifactId>FurnitureLib</artifactId>
|
||||
<version>3304c836e7</version>
|
||||
<version>0bfb20fa81</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -52,49 +52,51 @@ public class FurnitureHook extends FurniturePlugin{
|
|||
String modelFolder = FurnitureHook.isNewVersion() ? "Models113/" : "Models109/";
|
||||
String ending = FurnitureHook.isNewVersion() ? ".dModel" : ".yml";
|
||||
|
||||
new Project("Catapult", getPlugin(), getResource(modelFolder + "Catapult" + ending), Catapult.class).setSize(3, 2, 3, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("HumanSkeleton", getPlugin(), getResource(modelFolder + "HumanSkeleton" + ending)).setSize(3, 1, 2, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("CandyCane", getPlugin(), getResource(modelFolder + "CandyCane" + ending)).setSize(3, 4, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("SnowGolem", getPlugin(), getResource(modelFolder + "SnowGolem" + ending)).setSize(1, 2, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("TV", getPlugin(), getResource(modelFolder + "TV" + ending)).setSize(1, 2, 3, CenterType.CENTER).setEditorProject(false);
|
||||
new Project("Chair", getPlugin(), getResource(modelFolder + "Chair" + ending)).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("CampChair", getPlugin(), getResource(modelFolder + "CampChair" + ending)).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("CactusPlant", getPlugin(), getResource(modelFolder + "CactusPlant" + ending)).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("SleepingBag", getPlugin(), getResource(modelFolder + "SleepingBag" + ending)).setSize(1, 1, 2, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("ChristmasTree", getPlugin(), getResource(modelFolder + "ChristmasTree" + ending)).setSize(1, 1, 2, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Table", getPlugin(), getResource(modelFolder + "Table" + ending)).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("SchoolChair", getPlugin(), getResource(modelFolder + "SchoolChair" + ending)).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("SchoolTable", getPlugin(), getResource(modelFolder + "SchoolTable" + ending)).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("BlackBoard", getPlugin(), getResource(modelFolder + "BlackBoard" + ending)).setPlaceableSide(PlaceableSide.SIDE).setSize(1, 2, 3, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Barrels", getPlugin(), getResource(modelFolder + "Barrels" + ending), barrels.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("WaxCandle", getPlugin(), getResource(modelFolder + "WaxCandle" + ending), WaxCandle.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Lantern", getPlugin(), getResource(modelFolder + "Lantern" + ending), WaxCandle.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("MailBox", getPlugin(), getResource(modelFolder + "MailBox" + ending)).setSize(1, 2, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Fence", getPlugin(), getResource(modelFolder + "Fence" + ending), fance.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Trunk", getPlugin(), getResource(modelFolder + "Trunk" + ending), Trunk.class).setSize(1, 1, 4, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Sunshade", getPlugin(), getResource(modelFolder + "Sunshade" + ending), sunshade.class).setSize(1, 3, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Hammock", getPlugin(), getResource(modelFolder + "Hammock" + ending), hammock.class).setSize(1, 2, 7, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Crossbow", getPlugin(), getResource(modelFolder + "Crossbow" + ending), Crossbow.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Tent1", getPlugin(),getResource(modelFolder + "Tent1" + ending), tent_1.class).setSize(4, 3, 5, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("GraveStone", getPlugin(),getResource(modelFolder + "GraveStone" + ending), graveStone.class).setSize(1, 2, 3, CenterType.CENTER).setEditorProject(false);
|
||||
new Project("Camera", getPlugin(), getResource(modelFolder + "Camera" + ending), camera.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Sofa", getPlugin(), getResource(modelFolder + "Sofa" + ending)).setSize(1, 1, 3, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Log", getPlugin(), getResource(modelFolder + "Log" + ending), log.class).setSize(1, 1, 1, CenterType.CENTER).setEditorProject(false);
|
||||
new Project("LargeTable", getPlugin(),getResource(modelFolder + "LargeTable" + ending),PlaceableSide.TOP, largeTable.class).setSize(2, 1, 2, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Campfire1", getPlugin(),getResource(modelFolder + "Campfire1" + ending),PlaceableSide.TOP, campfire_1.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Campfire2", getPlugin(),getResource(modelFolder + "Campfire2" + ending),PlaceableSide.TOP, campfire_2.class).setSize(2, 1, 2, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Tent2", getPlugin(),getResource(modelFolder + "Tent2" + ending),PlaceableSide.TOP, tent_2.class).setSize(6, 3, 5, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Tent3", getPlugin(),getResource(modelFolder + "Tent3" + ending),PlaceableSide.TOP, tent_3.class).setSize(3, 2, 3, CenterType.CENTER).setEditorProject(false);
|
||||
new Project("Streetlamp", getPlugin(), getResource(modelFolder + "Streetlamp" + ending),PlaceableSide.TOP, streetlamp.class).setSize(2, 4, 1, CenterType.FRONT).setEditorProject(false);
|
||||
new Project("Billboard", getPlugin(), getResource(modelFolder + "Billboard" + ending),PlaceableSide.TOP, billboard.class).setSize(1, 3, 3, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("WeaponStand", getPlugin(), getResource(modelFolder + "WeaponStand" + ending),PlaceableSide.TOP, weaponStand.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Guillotine", getPlugin(), getResource(modelFolder + "Guillotine" + ending),PlaceableSide.TOP, Guillotine.class).setSize(1, 5, 2, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("FlowerPot", getPlugin(), getResource(modelFolder + "FlowerPot" + ending),PlaceableSide.BOTTOM, TFlowerPot.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("BearTrap", getPlugin(), getResource(modelFolder + "BearTrap" + ending), PlaceableSide.TOP, BearTrap.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("TrashCan", getPlugin(), getResource(modelFolder + "TrashCan" + ending), PlaceableSide.TOP, TrashCan.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("Flag", getPlugin(), getResource(modelFolder + "Flag" + ending), PlaceableSide.TOP, flag.class).setSize(1, 3, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("AdventCalender", getPlugin(), getResource(modelFolder + "AdventCalender" + ending), PlaceableSide.TOP, AdventCalender.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false);
|
||||
new Project("FireworkLauncher", getPlugin(), getResource(modelFolder + "FireworkLauncher" + ending), PlaceableSide.TOP, FireworkLauncher.class).setSize(1, 1, 1, CenterType.CENTER).setEditorProject(false);
|
||||
new Project("Catapult", getPlugin(), getResource(modelFolder + "Catapult" + ending), Catapult.class).setSize(3, 2, 3, CenterType.RIGHT);
|
||||
new Project("HumanSkeleton", getPlugin(), getResource(modelFolder + "HumanSkeleton" + ending)).setSize(3, 1, 2, CenterType.RIGHT);
|
||||
new Project("CandyCane", getPlugin(), getResource(modelFolder + "CandyCane" + ending)).setSize(3, 4, 1, CenterType.RIGHT);
|
||||
new Project("SnowGolem", getPlugin(), getResource(modelFolder + "SnowGolem" + ending)).setSize(1, 2, 1, CenterType.RIGHT);
|
||||
new Project("TV", getPlugin(), getResource(modelFolder + "TV" + ending)).setSize(1, 2, 3, CenterType.CENTER);
|
||||
new Project("Chair", getPlugin(), getResource(modelFolder + "Chair" + ending)).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("CampChair", getPlugin(), getResource(modelFolder + "CampChair" + ending)).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("CactusPlant", getPlugin(), getResource(modelFolder + "CactusPlant" + ending)).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("SleepingBag", getPlugin(), getResource(modelFolder + "SleepingBag" + ending)).setSize(1, 1, 2, CenterType.RIGHT);
|
||||
new Project("ChristmasTree", getPlugin(), getResource(modelFolder + "ChristmasTree" + ending)).setSize(1, 1, 2, CenterType.RIGHT);
|
||||
new Project("Table", getPlugin(), getResource(modelFolder + "Table" + ending)).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("SchoolChair", getPlugin(), getResource(modelFolder + "SchoolChair" + ending)).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("SchoolTable", getPlugin(), getResource(modelFolder + "SchoolTable" + ending)).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("BlackBoard", getPlugin(), getResource(modelFolder + "BlackBoard" + ending)).setPlaceableSide(PlaceableSide.SIDE).setSize(1, 2, 3, CenterType.RIGHT);
|
||||
new Project("Barrels", getPlugin(), getResource(modelFolder + "Barrels" + ending), barrels.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("WaxCandle", getPlugin(), getResource(modelFolder + "WaxCandle" + ending), WaxCandle.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Lantern", getPlugin(), getResource(modelFolder + "Lantern" + ending), WaxCandle.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("MailBox", getPlugin(), getResource(modelFolder + "MailBox" + ending)).setSize(1, 2, 1, CenterType.RIGHT);
|
||||
new Project("Fence", getPlugin(), getResource(modelFolder + "Fence" + ending), fance.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Trunk", getPlugin(), getResource(modelFolder + "Trunk" + ending), Trunk.class).setSize(1, 1, 4, CenterType.RIGHT);
|
||||
new Project("Sunshade", getPlugin(), getResource(modelFolder + "Sunshade" + ending), sunshade.class).setSize(1, 3, 1, CenterType.RIGHT);
|
||||
new Project("Hammock", getPlugin(), getResource(modelFolder + "Hammock" + ending), hammock.class).setSize(1, 2, 7, CenterType.RIGHT);
|
||||
new Project("Crossbow", getPlugin(), getResource(modelFolder + "Crossbow" + ending), Crossbow.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Tent1", getPlugin(),getResource(modelFolder + "Tent1" + ending), tent_1.class).setSize(4, 3, 5, CenterType.RIGHT);
|
||||
new Project("GraveStone", getPlugin(),getResource(modelFolder + "GraveStone" + ending), graveStone.class).setSize(1, 2, 3, CenterType.CENTER);
|
||||
new Project("Camera", getPlugin(), getResource(modelFolder + "Camera" + ending), camera.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Sofa", getPlugin(), getResource(modelFolder + "Sofa" + ending)).setSize(1, 1, 3, CenterType.RIGHT);
|
||||
new Project("Log", getPlugin(), getResource(modelFolder + "Log" + ending), log.class).setSize(1, 1, 1, CenterType.CENTER);
|
||||
new Project("LargeTable", getPlugin(),getResource(modelFolder + "LargeTable" + ending),PlaceableSide.TOP, largeTable.class).setSize(2, 1, 2, CenterType.RIGHT);
|
||||
new Project("Campfire1", getPlugin(),getResource(modelFolder + "Campfire1" + ending),PlaceableSide.TOP, campfire_1.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Campfire2", getPlugin(),getResource(modelFolder + "Campfire2" + ending),PlaceableSide.TOP, campfire_2.class).setSize(2, 1, 2, CenterType.RIGHT);
|
||||
new Project("Tent2", getPlugin(),getResource(modelFolder + "Tent2" + ending),PlaceableSide.TOP, tent_2.class).setSize(6, 3, 5, CenterType.RIGHT);
|
||||
new Project("Tent3", getPlugin(),getResource(modelFolder + "Tent3" + ending),PlaceableSide.TOP, tent_3.class).setSize(3, 2, 3, CenterType.CENTER);
|
||||
new Project("Streetlamp", getPlugin(), getResource(modelFolder + "Streetlamp" + ending),PlaceableSide.TOP, streetlamp.class).setSize(2, 4, 1, CenterType.FRONT);
|
||||
new Project("Billboard", getPlugin(), getResource(modelFolder + "Billboard" + ending),PlaceableSide.TOP, billboard.class).setSize(1, 3, 3, CenterType.RIGHT);
|
||||
new Project("WeaponStand", getPlugin(), getResource(modelFolder + "WeaponStand" + ending),PlaceableSide.TOP, weaponStand.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Guillotine", getPlugin(), getResource(modelFolder + "Guillotine" + ending),PlaceableSide.TOP, Guillotine.class).setSize(1, 5, 2, CenterType.RIGHT);
|
||||
new Project("FlowerPot", getPlugin(), getResource(modelFolder + "FlowerPot" + ending),PlaceableSide.BOTTOM, TFlowerPot.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("BearTrap", getPlugin(), getResource(modelFolder + "BearTrap" + ending), PlaceableSide.TOP, BearTrap.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("TrashCan", getPlugin(), getResource(modelFolder + "TrashCan" + ending), PlaceableSide.TOP, TrashCan.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("Flag", getPlugin(), getResource(modelFolder + "Flag" + ending), PlaceableSide.TOP, flag.class).setSize(1, 3, 1, CenterType.RIGHT);
|
||||
new Project("AdventCalender", getPlugin(), getResource(modelFolder + "AdventCalender" + ending), PlaceableSide.TOP, AdventCalender.class).setSize(1, 1, 1, CenterType.RIGHT);
|
||||
new Project("FireworkLauncher", getPlugin(), getResource(modelFolder + "FireworkLauncher" + ending), PlaceableSide.TOP, FireworkLauncher.class).setSize(1, 1, 1, CenterType.CENTER);
|
||||
|
||||
FurnitureLib.getInstance().getFurnitureManager().getProjects().stream().filter(pro -> pro.getPlugin().equals(getPlugin())).forEach(pro -> pro.setEditorProject(false));
|
||||
}catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import org.bukkit.util.EulerAngle;
|
|||
|
||||
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
|
||||
import de.Ste3et_C0st.Furniture.Main.main;
|
||||
import de.Ste3et_C0st.FurnitureLib.Utilitis.LocationUtil;
|
||||
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
|
||||
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
|
||||
import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart;
|
||||
|
|
@ -94,6 +95,11 @@ public class Guillotine extends Furniture implements Listener{
|
|||
this.packet3 = (fArmorStand) entityByCustomName("#Head#");
|
||||
this.packet2 = (fArmorStand) getfAsList().stream().filter(entity -> entity.getCustomName().startsWith("#Oblation#")).findFirst().orElse(null);
|
||||
|
||||
if(!isFinish()) {
|
||||
Location oblationLocation = packet2.getLocation();
|
||||
packet2.setName("#Oblation#:" + oblationLocation.getX() + ":" + oblationLocation.getY() + ":" + oblationLocation.getZ());
|
||||
}
|
||||
|
||||
getfAsList().stream().filter(entity -> entity.getCustomName().startsWith("iron")).forEach(entity -> {
|
||||
armorStandList.add(entity);
|
||||
entity.teleport(getStartLocation(entity.getCustomName()));
|
||||
|
|
@ -450,11 +456,11 @@ public class Guillotine extends Furniture implements Listener{
|
|||
if(invIII.getItem(19)!=null){invisible=false;}
|
||||
if(invIII.getItem(28)!=null){invisible=false;}
|
||||
if(invIII.getItem(37)!=null){invisible=false;}
|
||||
|
||||
packet2.setBasePlate(false);
|
||||
packet2.setArms(true);
|
||||
packet2.setInvisible(invisible);
|
||||
update();
|
||||
LocationUtil.particleBlock(packet2.getLocation().getBlock());
|
||||
this.p = null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ public class streetlamp extends Furniture implements Listener{
|
|||
if(getObjID()==null){return;}
|
||||
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;}
|
||||
if(e.getBlock()==null){return;}
|
||||
if(!redstoneBlock.getWorld().equals(e.getBlock().getWorld())) return;
|
||||
if(redstoneBlock.distance(e.getBlock().getLocation()) <= 1){
|
||||
if(e.getNewCurrent()==0){
|
||||
setLight(false);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
name: DiceFurniture
|
||||
version: 3.3.0.2
|
||||
version: 3.4.2
|
||||
description: Add some new Objects to the Server
|
||||
author: Ste3et_C0st
|
||||
website: http://dicecraft.de
|
||||
|
|
|
|||
Loading…
Reference in New Issue