Upstream
/
furniture
mirror of https://github.com/Ste3et/furniture.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Adventcalender Model

This commit is contained in:
Ste3et_C0st 2019-12-01 16:05:04 +01:00
parent f485d2fbde
commit 6a118a3779
9 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Models109/Tent2.yml
View File

@ -116,7 +116,7 @@ Tent2:
Z-Offset: -2.0
Type: BED_BLOCK
Data: 10
Rotation: NORTH
Rotation: SOUTH
'2':
X-Offset: 3.0
Y-Offset: 0.0

2
src/Models109/Tent3.yml
View File

@ -35,4 +35,4 @@ Tent3:
Z-Offset: -2.0
Type: BED_BLOCK
Data: 11
Rotation: EAST
Rotation: SOUTH

2
src/de/Ste3et_C0st/Furniture/Main/FurnitureHook.java
View File

@ -68,7 +68,7 @@ public class FurnitureHook extends FurniturePlugin{
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)).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);

3
src/de/Ste3et_C0st/Furniture/Main/main.java
View File

@ -1,13 +1,16 @@
package de.Ste3et_C0st.Furniture.Main;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.Vector;

9
src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventCalender.java
View File

@ -69,13 +69,10 @@ public class AdventCalender extends Furniture implements Listener{
public AdventCalender(ObjectID id){
super(id);
if(isFinish()){
Bukkit.getPluginManager().registerEvents(this, getPlugin());
load();
check();
return;
}
spawn(id.getStartLocation());
load();
check();
Bukkit.getPluginManager().registerEvents(this, getPlugin());
}
@Override

6
src/de/Ste3et_C0st/Furniture/Objects/garden/log.java
View File

@ -140,12 +140,12 @@ public class log extends Furniture implements Listener{
}
private void setList(){
ItemStack stack = new ItemStack(Material.valueOf(FurnitureHook.isNewVersion() ? "WHITE_BANNER" : "BANNER"));
ItemStack stack = FurnitureHook.isNewVersion() ? new ItemStack(Material.valueOf("WHITE_BANNER")) : new ItemStack(Material.valueOf("BANNER"), 1, (short) 1);
ItemMeta meta = stack.getItemMeta();
meta.setDisplayName("§6Mode: §cTop");
stack.setItemMeta(meta);
isList.add(stack);
stack = FurnitureHook.isNewVersion() ? new ItemStack(Material.valueOf("ORANGE_BANNER")) : new ItemStack(Material.valueOf("BANNER"), 1, (short) 1);
stack = FurnitureHook.isNewVersion() ? new ItemStack(Material.valueOf("ORANGE_BANNER")) : new ItemStack(Material.valueOf("BANNER"), 1, (short) 2);
meta = stack.getItemMeta();
meta.setDisplayName("§6Mode: §cFront I");
stack.setItemMeta(meta);
@ -196,7 +196,7 @@ public class log extends Furniture implements Listener{
if(e.getClickedInventory()==null||!e.getClickedInventory().equals(inv)){return;}
e.setCancelled(true);
if(e.getCurrentItem()==null){return;}
if(e.getCurrentItem().getType().name().contains("_BANNER")){
if(e.getCurrentItem().getType().name().contains("BANNER")){
Integer i = isList.indexOf(e.getCurrentItem());
ItemStack is = null;
if(i>=2){i = -1;}

18
src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java
View File

@ -3,8 +3,8 @@ package de.Ste3et_C0st.Furniture.Objects.outdoor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureHelper;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType;
import de.Ste3et_C0st.FurnitureLib.main.Type.DyeColor;
@ -22,11 +22,19 @@ public class tent_1 extends Furniture{
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)) return;
if(player == null) return;
if(canBuild(player)) {
if(DyeColor.getDyeColor(player.getInventory().getItemInMainHand().getType()) == null){
player.openWorkbench(null, true);
}else{
getLib().getColorManager().color(player, true, "_CARPET", getObjID(), ColorType.BLOCK, 1);
if(FurnitureHook.isNewVersion()) {
if(DyeColor.getDyeColor(player.getInventory().getItemInMainHand().getType()) != null){
getLib().getColorManager().color(player, true, "_CARPET", getObjID(), ColorType.BLOCK, 1);
return;
}
}else {
if(player.getInventory().getItemInMainHand().getType().name().equalsIgnoreCase("INK_SACK")){
getLib().getColorManager().color(player, true, "CARPET", getObjID(), ColorType.BLOCK, 1);
return;
}
}
player.openWorkbench(null, true);
}
}

27
src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java
View File

@ -4,6 +4,8 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Chest;
import org.bukkit.entity.Player;
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType;
@ -35,16 +37,25 @@ public class tent_2 extends Furniture{
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)) return;
if(player == null) return;
if(canBuild(player)) {
if(DyeColor.getDyeColor(player.getInventory().getItemInMainHand().getType()) == null){
for(Location b : getObjID().getBlockList()){
if(b.getBlock().getType().equals(Material.CHEST)){
Chest c = (Chest) b.getBlock().getState();
player.getPlayer().openInventory(c.getBlockInventory());
}
if(FurnitureHook.isNewVersion()) {
if(DyeColor.getDyeColor(player.getInventory().getItemInMainHand().getType()) != null){
getLib().getColorManager().color(player, true, "_CARPET", getObjID(), ColorType.BLOCK, 1);
return;
}
}else {
if(player.getInventory().getItemInMainHand().getType().name().equalsIgnoreCase("INK_SACK")){
getLib().getColorManager().color(player, true, "CARPET", getObjID(), ColorType.BLOCK, 1);
return;
}
}else{
getLib().getColorManager().color(player, true, "_CARPET", getObjID(), ColorType.BLOCK, 1);
}
for(Location b : getObjID().getBlockList()){
if(b.getBlock().getType().equals(Material.CHEST)){
Chest c = (Chest) b.getBlock().getState();
player.getPlayer().openInventory(c.getBlockInventory());
}
}
}
}
}

26
src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java
View File

@ -2,6 +2,8 @@ package de.Ste3et_C0st.Furniture.Objects.outdoor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType;
@ -33,14 +35,22 @@ public class tent_3 extends Furniture{
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)) return;
if(player == null) return;
if(canBuild(player)) {
if(DyeColor.getDyeColor(player.getInventory().getItemInMainHand().getType()) != null){
getLib().getColorManager().color(player, true, "_BANNER", getObjID(), ColorType.BANNER, 1);
}else{
for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#SITZ#")){
packet.setPassanger(player);
packet.update();
}
if(FurnitureHook.isNewVersion()) {
if(DyeColor.getDyeColor(player.getInventory().getItemInMainHand().getType()) != null){
getLib().getColorManager().color(player, true, "BANNER", getObjID(), ColorType.BANNER, 1);
return;
}
}else {
if(player.getInventory().getItemInMainHand().getType().name().equalsIgnoreCase("INK_SACK")){
getLib().getColorManager().color(player, true, "BANNER", getObjID(), ColorType.BANNER, 1);
return;
}
}
for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#SITZ#")){
packet.setPassanger(player);
packet.update();
}
}
}