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

Make it compatible with the newest FurnitureLib build

This commit is contained in:
Ste3et_C0st 2021-04-24 14:37:58 +02:00
parent 3dc190e76e
commit 71b4f43abd
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -105,7 +105,7 @@
<dependency>
<groupId>com.github.Ste3et</groupId>
<artifactId>FurnitureLib</artifactId>
<version>9c4836a</version>
<version>3c143b81</version>
</dependency>
</dependencies>
</project>

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

@ -12,6 +12,7 @@ import org.bukkit.util.Vector;
import de.Ste3et_C0st.Furniture.Objects.garden.config;
import de.Ste3et_C0st.FurnitureLib.Utilitis.LocationUtil;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib;
public class main extends JavaPlugin{
@ -34,7 +35,6 @@ public class main extends JavaPlugin{
furniturePlugin.saveRessource("config.yml", "/fence/whiteList.yml");
furniturePlugin.saveRessource("damage.yml", "/bearTrap/damage.yml");
furniturePlugin.saveRessource("range.yml", "/catapult/range.yml");
furniturePlugin.register();
setDefaults();
setDefaults_2();

3
src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java
View File

@ -5,6 +5,7 @@ import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction;
import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity;
@ -93,7 +94,7 @@ public class flag extends Furniture {
if(player.getInventory().getItemInMainHand()!=null&&player.getInventory().getItemInMainHand().getType()!=null){
if(player.getInventory().getItemInMainHand().getType().name().contains("BANNER")){
getStand().setHelmet(player.getInventory().getItemInMainHand());update();
if(player.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
if(player.getGameMode().equals(GameMode.CREATIVE) && FurnitureConfig.getFurnitureConfig().useGamemode()) return;
Integer i = player.getInventory().getHeldItemSlot();
ItemStack is = player.getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1);

3
src/de/Ste3et_C0st/Furniture/Objects/christmas/FireworkLauncher.java
View File

@ -17,6 +17,7 @@ import org.bukkit.util.EulerAngle;
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction;
import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand;
@ -79,7 +80,7 @@ public class FireworkLauncher extends Furniture{
}
}, 5);
if(player.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
if(player.getGameMode().equals(GameMode.CREATIVE) && FurnitureConfig.getFurnitureConfig().useGamemode()) return;
Integer i = player.getInventory().getHeldItemSlot();
ItemStack is = player.getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1);

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

@ -23,6 +23,7 @@ import de.Ste3et_C0st.FurnitureLib.Crafting.Project;
import de.Ste3et_C0st.FurnitureLib.Utilitis.HiddenStringUtils;
import de.Ste3et_C0st.FurnitureLib.Utilitis.ManageInv;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction;
@ -170,7 +171,7 @@ public class log extends Furniture implements Listener{
}
public void removeItem(Player p){
Boolean useGameMode = FurnitureLib.getInstance().useGamemode();
Boolean useGameMode = FurnitureConfig.getFurnitureConfig().useGamemode();
if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;}
Integer slot = p.getInventory().getHeldItemSlot();
ItemStack itemStack = p.getInventory().getItemInMainHand().clone();

3
src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java
View File

@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack;
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType;
import de.Ste3et_C0st.FurnitureLib.main.Type.DyeColor;
@ -105,7 +106,7 @@ public class largeTable extends Furniture{
update();
if(player.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
if(player.getGameMode().equals(GameMode.CREATIVE) && FurnitureConfig.getFurnitureConfig().useGamemode()) return;
Integer i = player.getInventory().getHeldItemSlot();
ItemStack itemstack = is.clone();
itemstack.setAmount(itemstack.getAmount()-1);

3
src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java
View File

@ -21,6 +21,7 @@ import org.bukkit.util.Vector;
import de.Ste3et_C0st.Furniture.Main.FurnitureHook;
import de.Ste3et_C0st.Furniture.Main.main;
import de.Ste3et_C0st.FurnitureLib.main.Furniture;
import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart;
import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction;
@ -115,7 +116,7 @@ public class campfire_2 extends Furniture {
setGrill();
if (player.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode())
if (player.getGameMode().equals(GameMode.CREATIVE) && FurnitureConfig.getFurnitureConfig().useGamemode())
return;
Integer i = player.getInventory().getHeldItemSlot();
ItemStack item = player.getInventory().getItemInMainHand();