mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Updated CS-CoreLib2 dependency
This commit is contained in:
parent
c4a5705c44
commit
cff45aae66
3
pom.xml
3
pom.xml
@ -70,6 +70,7 @@
|
||||
<include>**/cscorelib2/updater/**</include>
|
||||
<include>**/cscorelib2/materials/**</include>
|
||||
<include>**/cscorelib2/protection/**</include>
|
||||
<include>**/cscorelib2/item/**</include>
|
||||
</includes>
|
||||
</filter>
|
||||
</filters>
|
||||
@ -125,7 +126,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.thebusybiscuit</groupId>
|
||||
<artifactId>CS-CoreLib2</artifactId>
|
||||
<version>0.5.1</version>
|
||||
<version>0.5.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -3,9 +3,9 @@ package me.mrCookieSlime.Slimefun.Objects;
|
||||
import java.util.List;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Tag;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
|
||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunMachine;
|
||||
@ -74,8 +74,8 @@ public class MultiBlock {
|
||||
|
||||
private boolean compareBlocks(Material a, Material b) {
|
||||
if (b != null) {
|
||||
if (MaterialHelper.isLog(b)) {
|
||||
return MaterialHelper.isLog(a);
|
||||
if (Tag.LOGS.isTagged(b)) {
|
||||
return Tag.LOGS.isTagged(a);
|
||||
}
|
||||
|
||||
if (b != a) {
|
||||
|
@ -26,6 +26,7 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class AContainer extends SlimefunItem implements InventoryBlock {
|
||||
|
||||
|
@ -18,6 +18,7 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
@Deprecated
|
||||
public abstract class ADrill extends AContainer {
|
||||
|
@ -38,6 +38,7 @@ import me.mrCookieSlime.Slimefun.api.energy.EnergyTicker;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class AGenerator extends SlimefunItem implements RecipeDisplayItem {
|
||||
|
||||
|
@ -43,6 +43,7 @@ import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||
import me.mrCookieSlime.Slimefun.holograms.ReactorHologram;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class AReactor extends SlimefunItem implements RecipeDisplayItem {
|
||||
|
||||
|
@ -8,8 +8,8 @@ import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Block.TreeCalculator;
|
||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
@ -29,7 +29,7 @@ public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements
|
||||
public BlockBreakHandler getItemHandler() {
|
||||
return (e, item, fortune, drops) -> {
|
||||
if (SlimefunManager.isItemSimiliar(e.getPlayer().getInventory().getItemInMainHand(), getItem(), true)) {
|
||||
if (MaterialHelper.isLog( e.getBlock().getType())) {
|
||||
if (MaterialCollections.contains(e.getBlock().getType(), MaterialCollections.getAllLogs())) {
|
||||
List<Location> logs = new ArrayList<>();
|
||||
TreeCalculator.getTree(e.getBlock().getLocation(), e.getBlock().getLocation(), logs);
|
||||
|
||||
|
@ -10,8 +10,8 @@ import org.bukkit.block.data.Levelled;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.events.ItemUseEvent;
|
||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
@ -52,7 +52,7 @@ public class Crucible extends SlimefunGadget {
|
||||
|
||||
for (int i = 1; i < 9; i++) {int j = 8 - i;
|
||||
Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> {
|
||||
if (input.getType() == Material.COBBLESTONE || input.getType() == Material.TERRACOTTA || MaterialHelper.isTerracotta(input.getType())) {
|
||||
if (input.getType() == Material.COBBLESTONE || input.getType() == Material.TERRACOTTA || MaterialCollections.contains(input.getType(), MaterialCollections.getAllTerracottaColors())) {
|
||||
block.setType(Material.LAVA);
|
||||
Levelled le = (Levelled) block.getBlockData();
|
||||
le.setLevel(j);
|
||||
|
@ -12,12 +12,12 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class AutoAnvil extends AContainer {
|
||||
|
||||
|
@ -20,11 +20,11 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public class AutoDisenchanter extends AContainer {
|
||||
|
||||
|
@ -14,12 +14,12 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public class AutoDrier extends AContainer implements RecipeDisplayItem {
|
||||
|
||||
|
@ -20,11 +20,11 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public class AutoEnchanter extends AContainer {
|
||||
|
||||
|
@ -13,12 +13,12 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks.OreWasher;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class ElectricDustWasher extends AContainer {
|
||||
|
||||
|
@ -14,12 +14,12 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class ElectricGoldPan extends AContainer implements RecipeDisplayItem {
|
||||
|
||||
|
@ -21,7 +21,6 @@ import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
@ -31,6 +30,7 @@ import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||
import me.mrCookieSlime.Slimefun.api.item_transport.RecipeSorter;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class HeatedPressureChamber extends AContainer {
|
||||
|
||||
|
@ -13,12 +13,12 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class Refinery extends AContainer implements RecipeDisplayItem {
|
||||
|
||||
|
@ -21,7 +21,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
|
||||
@ -30,6 +29,7 @@ import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.holograms.SimpleHologram;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class GEOMiner extends AContainer implements InventoryBlock, RecipeDisplayItem {
|
||||
|
||||
|
@ -14,13 +14,13 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||
import me.mrCookieSlime.Slimefun.utils.MachineHelper;
|
||||
|
||||
public abstract class OilPump extends AContainer {
|
||||
|
||||
|
@ -2,6 +2,7 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.bukkit.Effect;
|
||||
import org.bukkit.Material;
|
||||
@ -11,7 +12,7 @@ import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialConverter;
|
||||
import me.mrCookieSlime.Slimefun.Lists.Categories;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
|
||||
@ -30,8 +31,12 @@ public class TableSaw extends MultiBlockMachine {
|
||||
);
|
||||
|
||||
for (Material log: Tag.LOGS.getValues()) {
|
||||
displayRecipes.add(new ItemStack(log));
|
||||
displayRecipes.add(new ItemStack(MaterialHelper.getWoodFromLog(log), 8));
|
||||
Optional<Material> planks = MaterialConverter.getPlanksFromLog(log);
|
||||
|
||||
if (planks.isPresent()) {
|
||||
displayRecipes.add(new ItemStack(log));
|
||||
displayRecipes.add(new ItemStack(planks.get(), 8));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,15 +49,16 @@ public class TableSaw extends MultiBlockMachine {
|
||||
public void onInteract(Player p, Block b) {
|
||||
ItemStack log = p.getInventory().getItemInMainHand();
|
||||
|
||||
ItemStack item = new ItemStack(MaterialHelper.getWoodFromLog(log.getType()), 8);
|
||||
if(item == null || item.getType() == Material.AIR) return;
|
||||
Optional<Material> planks = MaterialConverter.getPlanksFromLog(log.getType());
|
||||
|
||||
b.getWorld().dropItemNaturally(b.getLocation(), item);
|
||||
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, log.getType());
|
||||
log.setAmount(log.getAmount() -1);
|
||||
|
||||
if(log.getAmount() <= 0) {
|
||||
p.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
|
||||
if (planks.isPresent()) {
|
||||
b.getWorld().dropItemNaturally(b.getLocation(), new ItemStack(planks.get(), 8));
|
||||
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, log.getType());
|
||||
log.setAmount(log.getAmount() -1);
|
||||
|
||||
if(log.getAmount() <= 0) {
|
||||
p.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
package me.mrCookieSlime.Slimefun.Objects.tasks;
|
||||
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
|
||||
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.data.Waterlogged;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
|
||||
|
||||
public class RainbowTicker extends BlockTicker {
|
||||
|
||||
private int meta;
|
||||
@ -26,15 +26,15 @@ public class RainbowTicker extends BlockTicker {
|
||||
|
||||
@Override
|
||||
public void tick(Block b, SlimefunItem item, Config data) {
|
||||
if (MaterialHelper.isWool(b.getType())) {
|
||||
b.setType(MaterialHelper.WoolColours[meta], false);
|
||||
if (MaterialCollections.contains(b.getType(), MaterialCollections.getAllWools())) {
|
||||
b.setType(MaterialCollections.getAllWools()[meta], false);
|
||||
}
|
||||
else if (MaterialHelper.isStainedGlass(b.getType())) {
|
||||
b.setType(MaterialHelper.StainedGlassColours[meta], false);
|
||||
else if (MaterialCollections.contains(b.getType(), MaterialCollections.getAllStainedGlassColors())) {
|
||||
b.setType(MaterialCollections.getAllStainedGlassColors()[meta], false);
|
||||
}
|
||||
else if (MaterialHelper.isStainedGlassPane(b.getType())){
|
||||
else if (MaterialCollections.contains(b.getType(), MaterialCollections.getAllStainedGlassPaneColors())){
|
||||
boolean waterlogged = ((Waterlogged) b.getBlockData()).isWaterlogged();
|
||||
b.setType(MaterialHelper.StainedGlassPaneColours[meta], true);
|
||||
b.setType(MaterialCollections.getAllStainedGlassPaneColors()[meta], true);
|
||||
|
||||
if (waterlogged) {
|
||||
Waterlogged block = (Waterlogged) b.getBlockData();
|
||||
@ -42,8 +42,8 @@ public class RainbowTicker extends BlockTicker {
|
||||
b.setBlockData(block);
|
||||
}
|
||||
}
|
||||
else if (MaterialHelper.isTerracotta(b.getType())){
|
||||
b.setType(MaterialHelper.TerracottaColours[meta], false);
|
||||
else if (MaterialCollections.contains(b.getType(), MaterialCollections.getAllTerracottaColors())){
|
||||
b.setType(MaterialCollections.getAllTerracottaColors()[meta], false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -38,9 +38,10 @@ import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialConverter;
|
||||
import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Block.TreeCalculator;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
|
||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.AdvancedMenuClickHandler;
|
||||
@ -390,7 +391,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent
|
||||
exoticFarm(b, b.getRelative(BlockFace.DOWN));
|
||||
break;
|
||||
case CHOP_TREE:
|
||||
if (MaterialHelper.isLog(b.getRelative(face).getType())) {
|
||||
if (MaterialCollections.contains(b.getRelative(face).getType(), MaterialCollections.getAllLogs())) {
|
||||
List<Location> list = new ArrayList<>();
|
||||
list.add(b.getRelative(face).getLocation());
|
||||
TreeCalculator.getTree(b.getRelative(face).getLocation(), b.getRelative(face).getLocation(), list);
|
||||
@ -408,7 +409,10 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent
|
||||
log.getWorld().playEffect(log.getLocation(), Effect.STEP_SOUND, log.getType());
|
||||
|
||||
if (log.getY() == b.getRelative(face).getY()) {
|
||||
log.setType(MaterialHelper.getSaplingFromLog(log.getType()));
|
||||
Optional<Material> sapling = MaterialConverter.getSaplingFromLog(log.getType());
|
||||
if (sapling.isPresent()) {
|
||||
log.setType(sapling.get());
|
||||
}
|
||||
}
|
||||
else log.setType(Material.AIR);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user