Upstream/ChestsPlusPlus
1
0
Fork 0
mirror of https://github.com/JamesPeters98/ChestsPlusPlus.git synced 2025-02-16 12:32:08 +01:00
Code Issues Projects Releases Wiki Activity

Material Checker Start

Browse Source 
Having to sort through most items manually to decide how to display them!
This commit is contained in:
jameslfc19 2020-07-03 17:10:58 +01:00
parent 6b1a83e1b7
commit 251d02e324
4 changed files with 110 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
ChestsPlusPlusAPI/src/main/java/com/jamesdpeters/minecraft/chests/MaterialChecker.java
View File

@ -2,51 +2,62 @@ package com.jamesdpeters.minecraft.chests;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.Tag;
import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public abstract class MaterialChecker {
public static List<Material> DEFAULT_ITEMS = Arrays.asList(
//Signs
Material.ACACIA_SIGN,
Material.ACACIA_WALL_SIGN,
Material.BIRCH_SIGN,
Material.BIRCH_WALL_SIGN,
Material.DARK_OAK_SIGN,
Material.DARK_OAK_WALL_SIGN,
Material.JUNGLE_SIGN,
Material.JUNGLE_WALL_SIGN,
Material.OAK_SIGN,
Material.OAK_WALL_SIGN,
Material.SPRUCE_SIGN,
Material.SPRUCE_WALL_SIGN,
//Doors
Material.ACACIA_DOOR,
Material.BIRCH_DOOR,
Material.DARK_OAK_DOOR,
Material.JUNGLE_DOOR,
Material.OAK_DOOR,
Material.SPRUCE_DOOR,
Material.IRON_DOOR,
//Saplings
Material.SPRUCE_SAPLING,
Material.ACACIA_SAPLING,
Material.BAMBOO_SAPLING,
Material.BIRCH_SAPLING,
Material.DARK_OAK_SAPLING,
Material.JUNGLE_SAPLING,
Material.OAK_SAPLING
);
static List<Material> version_1_14_Items;
static List<Material> version_1_14_Ignored_Items;
public static MaterialChecker DEFAULT = new MaterialChecker() {
List<Material> empty = new ArrayList<>();
static {
version_1_14_Items = new ArrayList<>();
version_1_14_Items.addAll(Tag.SIGNS.getValues());
version_1_14_Items.addAll(Tag.WALL_SIGNS.getValues());
version_1_14_Items.addAll(Tag.DOORS.getValues());
version_1_14_Items.addAll(Tag.SAPLINGS.getValues());
version_1_14_Items.addAll(Tag.SMALL_FLOWERS.getValues());
version_1_14_Items.addAll(Tag.RAILS.getValues());
version_1_14_Items.addAll(Tag.CORAL_PLANTS.getValues());
version_1_14_Items.addAll(Tag.BANNERS.getValues());
version_1_14_Items.addAll(getGlassPanes());
version_1_14_Items.add(Material.BROWN_MUSHROOM);
version_1_14_Items.add(Material.RED_MUSHROOM);
version_1_14_Items.add(Material.END_ROD);
version_1_14_Items.add(Material.COBWEB);
version_1_14_Items.add(Material.GRASS);
version_1_14_Items.add(Material.FERN);
version_1_14_Items.add(Material.DEAD_BUSH);
version_1_14_Items.add(Material.SEAGRASS);
version_1_14_Items.add(Material.SEA_PICKLE);
version_1_14_Items.add(Material.LADDER);
version_1_14_Items.add(Material.IRON_BARS);
version_1_14_Items.add(Material.VINE);
version_1_14_Items.add(Material.LILY_PAD);
version_1_14_Items.add(Material.SUNFLOWER);
version_1_14_Items.add(Material.LILAC);
version_1_14_Items.add(Material.ROSE_BUSH);
version_1_14_Items.add(Material.PEONY);
version_1_14_Items.add(Material.TALL_GRASS);
version_1_14_Items.add(Material.LARGE_FERN);
version_1_14_Ignored_Items = new ArrayList<>();
version_1_14_Ignored_Items.addAll(Tag.BEDS.getValues());
}
public static MaterialChecker Version_1_14 = new MaterialChecker() {
@Override
protected List<Material> graphically2DList() {
return empty;
return version_1_14_Items;
}
@Override
protected List<Material> ignoredMaterials() {
return version_1_14_Ignored_Items;
}
};
@ -58,15 +69,42 @@ public abstract class MaterialChecker {
*/
protected abstract List<Material> graphically2DList();
/**
* List of @{@link Material} that gets ignored (Beds are a pain).
* @return
*/
protected abstract List<Material> ignoredMaterials();
/**
* Used to test if an item is graphically 2D (e.g a sign is a block but is held like an item.)
* @param itemStack
* @return
*/
public boolean isGraphically2D(ItemStack itemStack){
if(DEFAULT_ITEMS.contains(itemStack.getType())) return true;
if (graphically2DList().contains(itemStack.getType())) return true;
return itemStack.getType().isBlock();
return !itemStack.getType().isBlock();
}
private static List<Material> getGlassPanes(){
List<Material> materials = new ArrayList<>();
materials.add(Material.GLASS_PANE);
materials.add(Material.BLACK_STAINED_GLASS_PANE);
materials.add(Material.BLUE_STAINED_GLASS_PANE);
materials.add(Material.BROWN_STAINED_GLASS_PANE);
materials.add(Material.CYAN_STAINED_GLASS_PANE);
materials.add(Material.GRAY_STAINED_GLASS_PANE);
materials.add(Material.GREEN_STAINED_GLASS_PANE);
materials.add(Material.LIME_STAINED_GLASS_PANE);
materials.add(Material.MAGENTA_STAINED_GLASS_PANE);
materials.add(Material.ORANGE_STAINED_GLASS_PANE);
materials.add(Material.PINK_STAINED_GLASS_PANE);
materials.add(Material.PURPLE_STAINED_GLASS_PANE);
materials.add(Material.RED_STAINED_GLASS_PANE);
materials.add(Material.WHITE_STAINED_GLASS_PANE);
materials.add(Material.YELLOW_STAINED_GLASS_PANE);
materials.add(Material.LIGHT_BLUE_STAINED_GLASS_PANE);
materials.add(Material.LIGHT_GRAY_STAINED_GLASS_PANE);
return materials;
}
}

13
ChestsPlusPlus_1_15/src/main/java/com/jamesdpeters/minecraft/chests/MaterialChecker_1_15.java
View File

@ -10,12 +10,14 @@ import java.util.List;
public class MaterialChecker_1_15 extends MaterialChecker {
private List<Material> materials;
private List<Material> ignoredMaterials;
public MaterialChecker_1_15(){
materials = new ArrayList<>();
materials.addAll(Arrays.asList(
// Material.DIRT
));
materials.addAll(version_1_14_Items);
ignoredMaterials = new ArrayList<>();
ignoredMaterials.addAll(version_1_14_Ignored_Items);
}
@Override
@ -23,4 +25,9 @@ public class MaterialChecker_1_15 extends MaterialChecker {
return materials;
}
@Override
protected List<Material> ignoredMaterials() {
return ignoredMaterials;
}
}

19
ChestsPlusPlus_1_16/src/main/java/com/jamesdpeters/minecraft/chests/MaterialChecker_1_16.java
View File

@ -2,6 +2,8 @@ package com.jamesdpeters.minecraft.chests;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Tag;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -9,15 +11,15 @@ import java.util.List;
public class MaterialChecker_1_16 extends MaterialChecker {
private List<Material> materials;
private List<Material> ignoredMaterials;
public MaterialChecker_1_16(){
materials = new ArrayList<>();
//Add previous API additions.
materials.addAll(new MaterialChecker_1_15().graphically2DList());
materials.addAll(Arrays.asList(
// Material.DIRT
));
API.getPlugin().getLogger().info("Loaded Material Checker 1.16");
materials.addAll(version_1_14_Items);
materials.addAll(Tag.CROPS.getValues());
ignoredMaterials = new ArrayList<>();
ignoredMaterials.addAll(version_1_14_Ignored_Items);
}
@Override
@ -25,4 +27,9 @@ public class MaterialChecker_1_16 extends MaterialChecker {
return materials;
}
@Override
protected List<Material> ignoredMaterials() {
return ignoredMaterials;
}
}

17
ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/api_interfaces/ApiSpecific.java
View File

@ -6,6 +6,8 @@ import com.jamesdpeters.minecraft.chests.MaterialChecker_1_15;
import com.jamesdpeters.minecraft.chests.MaterialChecker_1_16;
import org.bukkit.Bukkit;
import java.util.Arrays;
public class ApiSpecific {
private static MaterialChecker materialChecker;
@ -25,12 +27,17 @@ public class ApiSpecific {
private static Version getVersion(){
String version = Bukkit.getBukkitVersion().split("-")[0];
switch (version){
System.out.println(version);
String[] versionRevisions = version.split("\\.");
System.out.println(Arrays.toString(versionRevisions));
String minorVersion = versionRevisions[1];
//Switch minor revision number e.g 1.xx
switch (minorVersion){
//Assume default API is latest.
default: return Version.API_1_16;
case "1.15": return Version.API_1_15;
case "1.14": return Version.API_1_14;
case "15": return Version.API_1_15;
case "14": return Version.API_1_14;
}
}
@ -38,7 +45,7 @@ public class ApiSpecific {
switch (version){
case API_1_16: return new MaterialChecker_1_16();
case API_1_15: return new MaterialChecker_1_15();
default: return MaterialChecker.DEFAULT;
default: return MaterialChecker.Version_1_14;
}
}