diff --git a/pom.xml b/pom.xml index 77ede4d..1b02a27 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 club.claycoffee ClayTech - 1.0.1 + 1.0.2 diff --git a/src/main/java/club/claycoffee/ClayTech/ClayTech.java b/src/main/java/club/claycoffee/ClayTech/ClayTech.java index 3049ffb..5707998 100644 --- a/src/main/java/club/claycoffee/ClayTech/ClayTech.java +++ b/src/main/java/club/claycoffee/ClayTech/ClayTech.java @@ -155,7 +155,10 @@ SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, new ItemStack(Material.CRAF ClayTechItems.BLISTERING_CORE, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ADVANCED_CIRCUIT_BOARD, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.PROGRAMMABLE_ANDROID_3, SlimefunItems.WITHER_PROOF_OBSIDIAN }; - ItemStack[] ClayExperimentTableBasic = {ClayTechItems.CLAY_ALLOY_INGOT,SlimefunItems.ELECTRIC_MOTOR,ClayTechItems.CLAY_ALLOY_INGOT,SlimefunItems.ADVANCED_CIRCUIT_BOARD,ClayTechItems.CLAY_FOOD_CAULDRON,ClayTechItems.BLISTERING_CORE,ClayTechItems.CLAY_ALLOY_INGOT,ClayTechItems.ELEMENT_UNIT,ClayTechItems.CLAY_ALLOY_INGOT}; + ItemStack[] ClayExperimentTableBasic = { ClayTechItems.CLAY_ALLOY_INGOT, SlimefunItems.ELECTRIC_MOTOR, + ClayTechItems.CLAY_ALLOY_INGOT, SlimefunItems.ADVANCED_CIRCUIT_BOARD, ClayTechItems.CLAY_FOOD_CAULDRON, + ClayTechItems.BLISTERING_CORE, ClayTechItems.CLAY_ALLOY_INGOT, ClayTechItems.ELEMENT_UNIT, + ClayTechItems.CLAY_ALLOY_INGOT }; // 机器 SlimefunItemStack craftingtable = new SlimefunItemStack("CLAY_CRAFTING_TABLE", diff --git a/src/main/java/club/claycoffee/ClayTech/ClayTechItems.java b/src/main/java/club/claycoffee/ClayTech/ClayTechItems.java index cd2e8c0..5a35ba1 100644 --- a/src/main/java/club/claycoffee/ClayTech/ClayTechItems.java +++ b/src/main/java/club/claycoffee/ClayTech/ClayTechItems.java @@ -189,6 +189,8 @@ public class ClayTechItems { Enchantment.PROTECTION_ENVIRONMENTAL, 10), Enchantment.DURABILITY, 10), Enchantment.MENDING, 1); + public static final ItemStack SILICON_INGOT = Utils.newItemD(Material.IRON_INGOT, + Lang.readItemText("SILICON_INGOT")); // 头颅 public static final ItemStack CLAYCOFFEE_HEAD = Utils.setDisplayName(SkullItem.fromURL( diff --git a/src/main/java/club/claycoffee/ClayTech/ClayTechMachineRecipes.java b/src/main/java/club/claycoffee/ClayTech/ClayTechMachineRecipes.java index 2457177..7873ab8 100644 --- a/src/main/java/club/claycoffee/ClayTech/ClayTechMachineRecipes.java +++ b/src/main/java/club/claycoffee/ClayTech/ClayTechMachineRecipes.java @@ -149,4 +149,7 @@ ClayTechItems.MAGIC_CLAY, new ItemStack(Material.TNT), new ItemStack(Material.FL public final static ItemStack[] CLAY_ALLOY_LEGGINGS = Slimefunutils.getArmorsStack(3, ClayTechItems.CLAY_ALLOY_INGOT); public final static ItemStack[] CLAY_ALLOY_BOOTS = Slimefunutils.getArmorsStack(4, ClayTechItems.CLAY_ALLOY_INGOT); + public final static ItemStack[] SILICON_INGOT = { ClayTechItems.ELEMENT_SILICON, ClayTechItems.ELEMENT_SILICON, + ClayTechItems.ELEMENT_SILICON, ClayTechItems.ELEMENT_SILICON, ClayTechItems.ELEMENT_SILICON, null, null, + null, null }; } diff --git a/src/main/java/club/claycoffee/ClayTech/ClayTechRecipeType.java b/src/main/java/club/claycoffee/ClayTech/ClayTechRecipeType.java index 2ba47f8..9526092 100644 --- a/src/main/java/club/claycoffee/ClayTech/ClayTechRecipeType.java +++ b/src/main/java/club/claycoffee/ClayTech/ClayTechRecipeType.java @@ -23,4 +23,8 @@ public class ClayTechRecipeType { new NamespacedKey(ClayTech.plugin, "CLAY_ELEMENT_EXTRACTER"), new SlimefunItemStack("CLAY_ELEMENT_EXTRACTER", ClayTechItems.CLAY_ELEMENT_EXTRACTER), "", Lang.readMachineRecipesText("CLAY_ELEMENT_EXTRACTER")); + public static final RecipeType CLAY_EXPERIMENT_TABLE_BASIC = new RecipeType( + new NamespacedKey(ClayTech.plugin, "CLAY_EXPERIMENT_TABLE_BASIC"), + new SlimefunItemStack("CLAY_EXPERIMENT_TABLE_BASIC", ClayTechItems.CLAY_EXPERIMENT_TABLE_NORMAL), "", + Lang.readMachineRecipesText("CLAY_EXPERIMENT_TABLE_BASIC")); } diff --git a/src/main/java/club/claycoffee/ClayTech/Machines/ACraftingTable.java b/src/main/java/club/claycoffee/ClayTech/Machines/ACraftingTable.java index ece09e3..e4c2b1d 100644 --- a/src/main/java/club/claycoffee/ClayTech/Machines/ACraftingTable.java +++ b/src/main/java/club/claycoffee/ClayTech/Machines/ACraftingTable.java @@ -206,7 +206,7 @@ protected void tick(Block b) { public void run() { Bukkit.getPluginManager().callEvent(new MachineTickEvent(b)); } - + }.runTask(ClayTech.plugin); BlockMenu inv = BlockStorage.getInventory(b); // 机器正在处理 diff --git a/src/main/java/club/claycoffee/ClayTech/Machines/AExperimentTable.java b/src/main/java/club/claycoffee/ClayTech/Machines/AExperimentTable.java index 1d5f957..edaabf3 100644 --- a/src/main/java/club/claycoffee/ClayTech/Machines/AExperimentTable.java +++ b/src/main/java/club/claycoffee/ClayTech/Machines/AExperimentTable.java @@ -38,13 +38,13 @@ @SuppressWarnings("deprecation") public abstract class AExperimentTable extends SlimefunItem implements InventoryBlock, EnergyNetComponent { - public final static int[] inputslots = new int[] {20,21,22,23,24}; + public final static int[] inputslots = new int[] { 20, 21, 22, 23, 24 }; public final static int[] outputslots = new int[] { 40 }; public static Map processing = new HashMap<>(); public static Map progress = new HashMap<>(); protected final List recipes = new ArrayList<>(); - private static final int[] BORDER_A = { 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 44, 45, 46, 47, 48, 49, 50, 51, 41, 52, 53 }; + private static final int[] BORDER_A = { 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 44, 45, 46, 47, 48, 49, 50, 51, 41, 52, 53 }; private static final int[] BORDER_B = { 37, 38, 39, 41, 42, 43 }; private static final ItemStack FREE_STATE_ITEM = Utils.newItemD(Material.BLACK_STAINED_GLASS_PANE, Lang.readMachinesText("SPLIT_LINE")); @@ -163,7 +163,7 @@ public int[] getInputSlots() { public int[] getOutputSlots() { return outputslots; } - + public List getDisplayRecipes() { List displayRecipes = new ArrayList<>(recipes.size() * 2); @@ -194,7 +194,7 @@ public void registerRecipe(MachineRecipe recipe) { public void registerRecipe(int seconds, ItemStack[] input, ItemStack[] output) { registerRecipe(new MachineRecipe(seconds, input, output)); } - + protected void tick(Block b) { new BukkitRunnable() { @@ -202,7 +202,7 @@ protected void tick(Block b) { public void run() { Bukkit.getPluginManager().callEvent(new MachineTickEvent(b)); } - + }.runTask(ClayTech.plugin); BlockMenu inv = BlockStorage.getInventory(b); // 机器正在处理 @@ -255,7 +255,7 @@ public void run() { } else i = 0; } - if (found.size() == recipe.getInput().length) { + if (found.size() == 5) { r = recipe; break; } else diff --git a/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java b/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java index 4ab4197..13da1b3 100644 --- a/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java +++ b/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java @@ -214,7 +214,7 @@ protected void tick(Block b) { public void run() { Bukkit.getPluginManager().callEvent(new MachineTickEvent(b)); } - + }.runTask(ClayTech.plugin); BlockMenu inv = BlockStorage.getInventory(b); // 机器正在处理 diff --git a/src/main/java/club/claycoffee/ClayTech/Machines/ANewContainer.java b/src/main/java/club/claycoffee/ClayTech/Machines/ANewContainer.java index 15acca2..77a941d 100644 --- a/src/main/java/club/claycoffee/ClayTech/Machines/ANewContainer.java +++ b/src/main/java/club/claycoffee/ClayTech/Machines/ANewContainer.java @@ -69,7 +69,7 @@ protected void tick(Block b) { public void run() { Bukkit.getPluginManager().callEvent(new MachineTickEvent(b)); } - + }.runTask(ClayTech.plugin); BlockMenu inv = BlockStorage.getInventory(b); diff --git a/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java b/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java index f16d19c..16dc256 100644 --- a/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java +++ b/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java @@ -15,6 +15,7 @@ public class ClayTechManager { /** * * @return the ItemStack is ClayTech item or not. 这个ItemStack是不是粘土科技物品. + * @param item The item.物品. */ public static boolean isClayTechItem(ItemStack item) { Field[] fields = ClayTechItems.class.getDeclaredFields(); diff --git a/src/main/java/club/claycoffee/ClayTech/items/Armors.java b/src/main/java/club/claycoffee/ClayTech/items/Armors.java index b03cb19..959fb8a 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Armors.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Armors.java @@ -16,7 +16,8 @@ public class Armors { public Armors() { Slimefunutils.registerItem(ClayTechItems.C_ARMORS, "ANTI_SLOWNESS_BOOTS", ClayTechItems.ANTI_SLOWNESS_BOOTS, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.ANTI_SLOWNESS_BOOTS, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.ANTI_SLOWNESS_BOOTS, + false); Research basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ARMORS"), 9908, Lang.readResearchesText("CLAYTECH_ARMORS_I"), 50); diff --git a/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java b/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java index 0aae4f8..22b1f2e 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java +++ b/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java @@ -73,35 +73,48 @@ public void registerDefaultRecipes() { this.registerRecipe(20, ClayTechMachineRecipes.POISON_CORE, new ItemStack[] { ClayTechItems.POISON_CORE }); this.registerRecipe(40, ClayTechMachineRecipes.ADVANCED_CONFUSION_CORE, new ItemStack[] { ClayTechItems.ADVANCED_POISON_CORE }); - this.registerRecipe(20, ClayTechMachineRecipes.CONFUSION_CORE, new ItemStack[] { ClayTechItems.CONFUSION_CORE }); + this.registerRecipe(20, ClayTechMachineRecipes.CONFUSION_CORE, + new ItemStack[] { ClayTechItems.CONFUSION_CORE }); this.registerRecipe(40, ClayTechMachineRecipes.ADVANCED_CONFUSION_CORE, new ItemStack[] { ClayTechItems.ADVANCED_CONFUSION_CORE }); - this.registerRecipe(20, ClayTechMachineRecipes.BLACK_ROCK_BLOCK, new ItemStack[] { ClayTechItems.BLACK_ROCK_BLOCK }); + this.registerRecipe(20, ClayTechMachineRecipes.BLACK_ROCK_BLOCK, + new ItemStack[] { ClayTechItems.BLACK_ROCK_BLOCK }); this.registerRecipe(20, ClayTechMachineRecipes.SLOWNESS_CORE, new ItemStack[] { ClayTechItems.SLOWNESS_CORE }); this.registerRecipe(40, ClayTechMachineRecipes.ADVANCED_SLOWNESS_CORE, new ItemStack[] { ClayTechItems.ADVANCED_SLOWNESS_CORE }); - this.registerRecipe(40, ClayTechMachineRecipes.ADVANCED_BLIND_CORE, new ItemStack[] { ClayTechItems.ADVANCED_BLIND_CORE }); + this.registerRecipe(40, ClayTechMachineRecipes.ADVANCED_BLIND_CORE, + new ItemStack[] { ClayTechItems.ADVANCED_BLIND_CORE }); this.registerRecipe(400, ClayTechMachineRecipes.FOUR_BOW, new ItemStack[] { ClayTechItems.FOUR_BOW }); this.registerRecipe(100, ClayTechMachineRecipes.POISON_SWORD, new ItemStack[] { ClayTechItems.POISON_SWORD }); - this.registerRecipe(100, ClayTechMachineRecipes.ANTI_SLOWNESS_BOOTS, new ItemStack[] { ClayTechItems.ANTI_SLOWNESS_BOOTS }); - this.registerRecipe(80, ClayTechMachineRecipes.BLISTERING_CORE, new ItemStack[] { ClayTechItems.BLISTERING_CORE }); + this.registerRecipe(100, ClayTechMachineRecipes.ANTI_SLOWNESS_BOOTS, + new ItemStack[] { ClayTechItems.ANTI_SLOWNESS_BOOTS }); + this.registerRecipe(80, ClayTechMachineRecipes.BLISTERING_CORE, + new ItemStack[] { ClayTechItems.BLISTERING_CORE }); this.registerRecipe(30, ClayTechMachineRecipes.ELEMENT_UNIT, new ItemStack[] { ClayTechItems.ELEMENT_UNIT }); - this.registerRecipe(8, ClayTechMachineRecipes.HIGHSPEED_RAILWAY, new ItemStack[] { ClayTechItems.HIGHSPEED_RAILWAY }); + this.registerRecipe(8, ClayTechMachineRecipes.HIGHSPEED_RAILWAY, + new ItemStack[] { ClayTechItems.HIGHSPEED_RAILWAY }); ItemStack elem8 = ClayTechItems.ELECTRIC_MOTOR_8; elem8.setAmount(8); this.registerRecipe(8, ClayTechMachineRecipes.ELECTRIC_MOTOR_8, new ItemStack[] { elem8 }); - this.registerRecipe(50, ClayTechMachineRecipes.TNT_EXPLOSION_CREATER, new ItemStack[] { ClayTechItems.TNT_EXPLOSION_CREATER }); + this.registerRecipe(50, ClayTechMachineRecipes.TNT_EXPLOSION_CREATER, + new ItemStack[] { ClayTechItems.TNT_EXPLOSION_CREATER }); this.registerRecipe(180, ClayTechMachineRecipes.REINFORCED_ALLOY_PICKAXE, new ItemStack[] { ClayTechItems.REINFORCED_ALLOY_PICKAXE }); - this.registerRecipe(40, ClayTechMachineRecipes.CLAY_FUSION_INGOT, new ItemStack[] { ClayTechItems.CLAY_FUSION_INGOT }); - this.registerRecipe(50, ClayTechMachineRecipes.CLAY_ALLOY_INGOT, new ItemStack[] { ClayTechItems.CLAY_ALLOY_INGOT }); - this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_PICKAXE, new ItemStack[] { ClayTechItems.CLAY_ALLOY_PICKAXE }); - this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_HELMET, new ItemStack[] { ClayTechItems.CLAY_ALLOY_HELMET }); + this.registerRecipe(40, ClayTechMachineRecipes.CLAY_FUSION_INGOT, + new ItemStack[] { ClayTechItems.CLAY_FUSION_INGOT }); + this.registerRecipe(50, ClayTechMachineRecipes.CLAY_ALLOY_INGOT, + new ItemStack[] { ClayTechItems.CLAY_ALLOY_INGOT }); + this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_PICKAXE, + new ItemStack[] { ClayTechItems.CLAY_ALLOY_PICKAXE }); + this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_HELMET, + new ItemStack[] { ClayTechItems.CLAY_ALLOY_HELMET }); this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_CHESTPLATE, new ItemStack[] { ClayTechItems.CLAY_ALLOY_CHESTPLATE }); - this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_LEGGINGS, new ItemStack[] { ClayTechItems.CLAY_ALLOY_LEGGINGS }); - this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_BOOTS, new ItemStack[] { ClayTechItems.CLAY_ALLOY_BOOTS }); + this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_LEGGINGS, + new ItemStack[] { ClayTechItems.CLAY_ALLOY_LEGGINGS }); + this.registerRecipe(300, ClayTechMachineRecipes.CLAY_ALLOY_BOOTS, + new ItemStack[] { ClayTechItems.CLAY_ALLOY_BOOTS }); } @Override diff --git a/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java b/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java index 11f237c..45021a4 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java +++ b/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java @@ -41,7 +41,8 @@ public DrinkMakingStaff() { Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "TEA_POWDER", ClayTechItems.TEA_POWDER, "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CHALKING_MACHINE, ClayTechMachineRecipes.TEA_POWDER, false); Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "LEMON_POWDER", ClayTechItems.LEMON_POWDER, - "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CHALKING_MACHINE, ClayTechMachineRecipes.LEMON_POWDER, false); + "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CHALKING_MACHINE, ClayTechMachineRecipes.LEMON_POWDER, + false); Research foodmaterialsI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_DRINKMATERIALSBASIC"), 9908, Lang.readResearchesText("CLAYTECH_DRINK_MAKINGS_I"), 50); diff --git a/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java b/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java index cf87696..d8b36a2 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java +++ b/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java @@ -14,7 +14,8 @@ public class EffectItems { public EffectItems() { Slimefunutils.registerItem(ClayTechItems.C_TOOLS, "TNT_EXPLOSION_CREATER", ClayTechItems.TNT_EXPLOSION_CREATER, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.TNT_EXPLOSION_CREATER, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.TNT_EXPLOSION_CREATER, + false); Research rs = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_AFT_1"), 9921, Lang.readResearchesText("CLAYTECH_EFFECT_ITEM_I"), 30); diff --git a/src/main/java/club/claycoffee/ClayTech/items/Elements.java b/src/main/java/club/claycoffee/ClayTech/items/Elements.java index dfbf2eb..50d7f08 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Elements.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Elements.java @@ -17,11 +17,14 @@ public Elements() { Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_UNIT", ClayTechItems.ELEMENT_UNIT, "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.ELEMENT_UNIT, false); Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_OXYGEN", ClayTechItems.ELEMENT_OXYGEN, - "notresearch", 10, ClayTechRecipeType.CLAY_ELEMENT_EXTRACTER, ClayTechMachineRecipes.ELEMENT_OXYGEN, false); + "notresearch", 10, ClayTechRecipeType.CLAY_ELEMENT_EXTRACTER, ClayTechMachineRecipes.ELEMENT_OXYGEN, + false); Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_CARBON", ClayTechItems.ELEMENT_CARBON, - "notresearch", 10, ClayTechRecipeType.CLAY_ELEMENT_EXTRACTER, ClayTechMachineRecipes.ELEMENT_CARBON, false); + "notresearch", 10, ClayTechRecipeType.CLAY_ELEMENT_EXTRACTER, ClayTechMachineRecipes.ELEMENT_CARBON, + false); Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_SILICON", ClayTechItems.ELEMENT_SILICON, - "notresearch", 10, ClayTechRecipeType.CLAY_ELEMENT_EXTRACTER, ClayTechMachineRecipes.ELEMENT_SILICON, false); + "notresearch", 10, ClayTechRecipeType.CLAY_ELEMENT_EXTRACTER, ClayTechMachineRecipes.ELEMENT_SILICON, + false); Research before_element = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_BEFORE_ELEMENT"), 9919, Lang.readResearchesText("CLAYTECH_ELEMENTS_I"), 50); diff --git a/src/main/java/club/claycoffee/ClayTech/items/ExperimentTableNormal.java b/src/main/java/club/claycoffee/ClayTech/items/ExperimentTableNormal.java index b11482f..3543d4a 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/ExperimentTableNormal.java +++ b/src/main/java/club/claycoffee/ClayTech/items/ExperimentTableNormal.java @@ -3,13 +3,15 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import club.claycoffee.ClayTech.ClayTechItems; +import club.claycoffee.ClayTech.ClayTechMachineRecipes; import club.claycoffee.ClayTech.Machines.AExperimentTable; import club.claycoffee.ClayTech.utils.Lang; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; -public class ExperimentTableNormal extends AExperimentTable{ +public class ExperimentTableNormal extends AExperimentTable { public ExperimentTableNormal(Category category, SlimefunItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { @@ -40,9 +42,9 @@ public int getSpeed() { public String getMachineIdentifier() { return null; } - + @Override public void registerDefaultRecipes() { - // TODO Recipes. + this.registerRecipe(20, ClayTechMachineRecipes.SILICON_INGOT, new ItemStack[] { ClayTechItems.SILICON_INGOT }); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java b/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java index 3c1283e..36e54bc 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java +++ b/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java @@ -64,17 +64,21 @@ public String getMachineIdentifier() { public void registerDefaultRecipes() { this.registerRecipe(30, ClayTechMachineRecipes.CHICKEN_FOOT, new ItemStack[] { ClayTechItems.CHICKEN_FOOT }); - this.registerRecipe(30, ClayTechMachineRecipes.SPICY_CHICKEN_BURGER, new ItemStack[] { ClayTechItems.SPICY_CHICKEN_BURGER }); + this.registerRecipe(30, ClayTechMachineRecipes.SPICY_CHICKEN_BURGER, + new ItemStack[] { ClayTechItems.SPICY_CHICKEN_BURGER }); this.registerRecipe(30, ClayTechMachineRecipes.BABA_BURGER, new ItemStack[] { ClayTechItems.BABA_BURGER }); this.registerRecipe(30, ClayTechMachineRecipes.CHOCOLATE, new ItemStack[] { ClayTechItems.CHOCOLATE }); this.registerRecipe(30, ClayTechMachineRecipes.SNAIL_FOOD, new ItemStack[] { ClayTechItems.SNAIL_FOOD }); this.registerRecipe(10, ClayTechMachineRecipes.HONEY_SWEET, new ItemStack[] { ClayTechItems.HONEY_SWEET }); - this.registerRecipe(15, ClayTechMachineRecipes.COOKED_SWEET_POTATO, new ItemStack[] { ClayTechItems.COOKED_SWEET_POTATO }); + this.registerRecipe(15, ClayTechMachineRecipes.COOKED_SWEET_POTATO, + new ItemStack[] { ClayTechItems.COOKED_SWEET_POTATO }); this.registerRecipe(30, ClayTechMachineRecipes.CLAY_COFFEE, new ItemStack[] { ClayTechItems.CLAY_COFFEE }); - this.registerRecipe(30, ClayTechMachineRecipes.LEMON_POWDER_DRINK, new ItemStack[] { ClayTechItems.LEMON_POWDER_DRINK }); + this.registerRecipe(30, ClayTechMachineRecipes.LEMON_POWDER_DRINK, + new ItemStack[] { ClayTechItems.LEMON_POWDER_DRINK }); this.registerRecipe(30, ClayTechMachineRecipes.TEA_DRINK, new ItemStack[] { ClayTechItems.TEA_DRINK }); - this.registerRecipe(30, ClayTechMachineRecipes.LEMON_TEA_DRINK, new ItemStack[] { ClayTechItems.LEMON_TEA_DRINK }); + this.registerRecipe(30, ClayTechMachineRecipes.LEMON_TEA_DRINK, + new ItemStack[] { ClayTechItems.LEMON_TEA_DRINK }); } @Override diff --git a/src/main/java/club/claycoffee/ClayTech/items/Foods.java b/src/main/java/club/claycoffee/ClayTech/items/Foods.java index 7d668b2..ac02bbe 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Foods.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Foods.java @@ -17,7 +17,8 @@ public Foods() { Slimefunutils.registerItem(ClayTechItems.C_FOOD, "CHICKEN_FOOT", ClayTechItems.CHICKEN_FOOT, "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.CHICKEN_FOOT, false); Slimefunutils.registerItem(ClayTechItems.C_FOOD, "SPICY_CHICKEN_BURGER", ClayTechItems.SPICY_CHICKEN_BURGER, - "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.SPICY_CHICKEN_BURGER, false); + "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.SPICY_CHICKEN_BURGER, + false); Slimefunutils.registerItem(ClayTechItems.C_FOOD, "BABA_BURGER", ClayTechItems.BABA_BURGER, "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.BABA_BURGER, false); Slimefunutils.registerItem(ClayTechItems.C_FOOD, "CHOCOLATE", ClayTechItems.CHOCOLATE, "notresearch", 10, @@ -27,7 +28,8 @@ public Foods() { Slimefunutils.registerItem(ClayTechItems.C_FOOD, "SNAIL_FOOD", ClayTechItems.SNAIL_FOOD, "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.SNAIL_FOOD, false); Slimefunutils.registerItem(ClayTechItems.C_FOOD, "COOKED_SWEET_POTATO", ClayTechItems.COOKED_SWEET_POTATO, - "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.COOKED_SWEET_POTATO, false); + "notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CAULDRON, ClayTechMachineRecipes.COOKED_SWEET_POTATO, + false); Research foodI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODBASIC"), 9911, Lang.readResearchesText("CLAYTECH_FOOD_I"), 50); diff --git a/src/main/java/club/claycoffee/ClayTech/items/Ingots.java b/src/main/java/club/claycoffee/ClayTech/items/Ingots.java index 6c70ce8..ed41d36 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Ingots.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Ingots.java @@ -14,14 +14,20 @@ public class Ingots { public Ingots() { Slimefunutils.registerItem(ClayTechItems.C_ORESTHINGS, "CLAY_FUSION_INGOT", ClayTechItems.CLAY_FUSION_INGOT, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CLAY_FUSION_INGOT, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CLAY_FUSION_INGOT, + false); Slimefunutils.registerItem(ClayTechItems.C_ORESTHINGS, "CLAY_ALLOY_INGOT", ClayTechItems.CLAY_ALLOY_INGOT, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CLAY_ALLOY_INGOT, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CLAY_ALLOY_INGOT, + false); + Slimefunutils.registerItem(ClayTechItems.C_ORESTHINGS, "CLAY_SILICON_INGOT", ClayTechItems.SILICON_INGOT, + "notresearch", 10, ClayTechRecipeType.CLAY_EXPERIMENT_TABLE_BASIC, ClayTechMachineRecipes.SILICON_INGOT, + false); Research rs = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_OREINGOTS_1"), 9923, Lang.readResearchesText("CLAYTECH_OREINGOTS_I"), 50); rs.addItems(SlimefunItem.getByItem(ClayTechItems.CLAY_FUSION_INGOT), - SlimefunItem.getByItem(ClayTechItems.CLAY_ALLOY_INGOT)); + SlimefunItem.getByItem(ClayTechItems.CLAY_ALLOY_INGOT), + SlimefunItem.getByItem(ClayTechItems.SILICON_INGOT)); rs.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java b/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java index d4fa7b8..f1340da 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java +++ b/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java @@ -14,7 +14,8 @@ public class MachineMakingBasic { public MachineMakingBasic() { Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "BLISTERING_CORE", ClayTechItems.BLISTERING_CORE, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.BLISTERING_CORE, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.BLISTERING_CORE, + false); Research before_element = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_BEFORE_ELEMENT"), 9917, Lang.readResearchesText("CLAYTECH_BEFORE_ELEMENTS"), 50); diff --git a/src/main/java/club/claycoffee/ClayTech/items/PotionAffect_Weapons.java b/src/main/java/club/claycoffee/ClayTech/items/PotionAffect_Weapons.java index f61d38c..0cb5a76 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/PotionAffect_Weapons.java +++ b/src/main/java/club/claycoffee/ClayTech/items/PotionAffect_Weapons.java @@ -24,7 +24,8 @@ public PotionAffect_Weapons() { ClayTechItems.ADVANCED_POISON_CORE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, ClayTechMachineRecipes.ADVANCED_POISON_CORE, false); Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "CONFUSION_CORE", ClayTechItems.CONFUSION_CORE, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CONFUSION_CORE, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CONFUSION_CORE, + false); Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ADVANCED_CONFUSION_CORE", ClayTechItems.ADVANCED_CONFUSION_CORE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, ClayTechMachineRecipes.ADVANCED_CONFUSION_CORE, false); @@ -37,7 +38,8 @@ public PotionAffect_Weapons() { Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "POISON_EYE", ClayTechItems.POISON_EYE, "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.POISON_EYE, false); Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "BLACK_ROCK_BLOCK", ClayTechItems.BLACK_ROCK_BLOCK, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.BLACK_ROCK_BLOCK, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.BLACK_ROCK_BLOCK, + false); Slimefunutils.registerItem(ClayTechItems.C_WEAPONS, "BLIND_SWORD", ClayTechItems.BLIND_SWORD, "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.BLIND_SWORD, false); diff --git a/src/main/java/club/claycoffee/ClayTech/items/Railways.java b/src/main/java/club/claycoffee/ClayTech/items/Railways.java index 6d9e4e1..a127637 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Railways.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Railways.java @@ -16,12 +16,13 @@ public class Railways { public Railways() { Slimefunutils.registerItem(ClayTechItems.C_OTHER, "CLAY_HIGHSPEED_RAILWAY", ClayTechItems.HIGHSPEED_RAILWAY, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.HIGHSPEED_RAILWAY, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.HIGHSPEED_RAILWAY, + false); ItemStack elem8 = ClayTechItems.ELECTRIC_MOTOR_8; elem8.setAmount(8); SlimefunItemStack motor_8 = new SlimefunItemStack("ELECTRIC_MOTOR_8", elem8); - SlimefunItem motor_8_i = new SlimefunItem(ClayTechItems.C_OTHER, motor_8, ClayTechRecipeType.CLAY_CRAFTING_TABLE, - ClayTechMachineRecipes.ELECTRIC_MOTOR_8); + SlimefunItem motor_8_i = new SlimefunItem(ClayTechItems.C_OTHER, motor_8, + ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.ELECTRIC_MOTOR_8); motor_8_i.register(ClayTech.plugin); Research railway_basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_RAILWAY_BASIC"), 9920, Lang.readResearchesText("CLAYTECH_RAILWAY_I"), 40); diff --git a/src/main/java/club/claycoffee/ClayTech/items/Tools.java b/src/main/java/club/claycoffee/ClayTech/items/Tools.java index d671f56..c3b6fef 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Tools.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Tools.java @@ -17,7 +17,8 @@ public Tools() { ClayTechItems.REINFORCED_ALLOY_PICKAXE, "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.REINFORCED_ALLOY_PICKAXE, false); Slimefunutils.registerItem(ClayTechItems.C_TOOLS, "CLAY_ALLOY_PICKAXE", ClayTechItems.CLAY_ALLOY_PICKAXE, - "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CLAY_ALLOY_PICKAXE, false); + "notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.CLAY_ALLOY_PICKAXE, + false); Research rs = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_TOOLS_1"), 9922, Lang.readResearchesText("CLAYTECH_TOOLS_I"), 35); diff --git a/src/main/java/club/claycoffee/ClayTech/listener/FoodDropListener.java b/src/main/java/club/claycoffee/ClayTech/listener/FoodDropListener.java index b10088a..3c3806c 100644 --- a/src/main/java/club/claycoffee/ClayTech/listener/FoodDropListener.java +++ b/src/main/java/club/claycoffee/ClayTech/listener/FoodDropListener.java @@ -13,7 +13,7 @@ import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.utils.Food; -public class FoodDropListener implements Listener{ +public class FoodDropListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void BlockBreakEvent(BlockBreakEvent e) { if (!e.isCancelled()) { @@ -35,7 +35,7 @@ public void BlockBreakEvent(BlockBreakEvent e) { } } } - + @EventHandler(priority = EventPriority.HIGHEST) public void PlayerFishEvent(PlayerFishEvent e) { if (e.getState() == State.CAUGHT_FISH) { diff --git a/src/main/java/club/claycoffee/ClayTech/listener/FoodEatListener.java b/src/main/java/club/claycoffee/ClayTech/listener/FoodEatListener.java index b4a44f3..29b4f91 100644 --- a/src/main/java/club/claycoffee/ClayTech/listener/FoodEatListener.java +++ b/src/main/java/club/claycoffee/ClayTech/listener/FoodEatListener.java @@ -12,7 +12,7 @@ import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.utils.Food; -public class FoodEatListener implements Listener{ +public class FoodEatListener implements Listener { @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.HIGHEST) public void PlayerInteractEvent(PlayerInteractEvent e) { diff --git a/src/main/java/club/claycoffee/ClayTech/listener/ItemUseListener.java b/src/main/java/club/claycoffee/ClayTech/listener/ItemUseListener.java index 021dd42..c6ecde1 100644 --- a/src/main/java/club/claycoffee/ClayTech/listener/ItemUseListener.java +++ b/src/main/java/club/claycoffee/ClayTech/listener/ItemUseListener.java @@ -27,13 +27,13 @@ import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Utils; -public class ItemUseListener implements Listener{ +public class ItemUseListener implements Listener { private Player p; - + @EventHandler(priority = EventPriority.HIGHEST) public void PlayerInteractEvent(PlayerInteractEvent e) { - if(e.hasItem()) { - if(e.getItem().hasItemMeta()) { + if (e.hasItem()) { + if (e.getItem().hasItemMeta()) { if (e.getItem().getItemMeta().getDisplayName() .equalsIgnoreCase(Lang.readItemText("TNT_EXPLOSION_CREATER"))) { Bukkit.getPluginManager().callEvent(new PlayerUseItemEvent(e.getPlayer(), e.getItem())); @@ -62,7 +62,8 @@ public void PlayerInteractEvent(PlayerInteractEvent e) { public void run() { e.getPlayer().getWorld().spawnEntity(currentLoc, EntityType.PRIMED_TNT); Block center = currentLoc.add(0, -1, 0).getBlock(); - center.setMetadata("isExplosionCreater", new FixedMetadataValue(ClayTech.plugin, true)); + center.setMetadata("isExplosionCreater", + new FixedMetadataValue(ClayTech.plugin, true)); p = e.getPlayer(); return; } @@ -82,7 +83,7 @@ public void run() { } } } - + @EventHandler(priority = EventPriority.HIGHEST) public void EntityExplodeEvent(EntityExplodeEvent e) { List blockL = new ArrayList(); diff --git a/src/main/java/club/claycoffee/ClayTech/listener/RailwayListener.java b/src/main/java/club/claycoffee/ClayTech/listener/RailwayListener.java index 38f5630..f5c4467 100644 --- a/src/main/java/club/claycoffee/ClayTech/listener/RailwayListener.java +++ b/src/main/java/club/claycoffee/ClayTech/listener/RailwayListener.java @@ -12,7 +12,7 @@ import club.claycoffee.ClayTech.ClayTech; import me.mrCookieSlime.Slimefun.api.BlockStorage; -public class RailwayListener implements Listener{ +public class RailwayListener implements Listener { @EventHandler public void VehicleMoveEvent(VehicleMoveEvent e) { if (e.getVehicle() instanceof Minecart) { diff --git a/src/main/java/club/claycoffee/ClayTech/listener/WeaponListener.java b/src/main/java/club/claycoffee/ClayTech/listener/WeaponListener.java index cdb7829..abb2add 100644 --- a/src/main/java/club/claycoffee/ClayTech/listener/WeaponListener.java +++ b/src/main/java/club/claycoffee/ClayTech/listener/WeaponListener.java @@ -12,7 +12,7 @@ import club.claycoffee.ClayTech.utils.Affect; import club.claycoffee.ClayTech.utils.Utils; -public class WeaponListener implements Listener{ +public class WeaponListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void EntityDamageByEntityEvent(EntityDamageByEntityEvent e) { if (e.getDamager().getType() == EntityType.ARROW) { @@ -20,7 +20,7 @@ public void EntityDamageByEntityEvent(EntityDamageByEntityEvent e) { Player d = (Player) ((Projectile) e.getDamager()).getShooter(); Player p = (Player) e.getEntity(); Affect.AffectCheck(d, p); - } catch (ClassCastException err) { + } catch (Exception err) { } } else { if (e.getDamager().getType() == EntityType.PLAYER && e.getEntity().getType() == EntityType.PLAYER) { @@ -30,18 +30,17 @@ public void EntityDamageByEntityEvent(EntityDamageByEntityEvent e) { } } } - - @SuppressWarnings("deprecation") + @EventHandler(priority = EventPriority.HIGHEST) public void PlayerInteractEntityEvent(PlayerInteractEntityEvent e) { if (e.getRightClicked().getType() == EntityType.PLAYER) { Player d = e.getPlayer(); try { - if (Utils.ExitsInList("§7钩子武器", Utils.getLore(d.getItemInHand()))) { + if (Utils.ExitsInList("§7钩子武器", Utils.getLore(d.getInventory().getItemInMainHand()))) { Player p = (Player) e.getRightClicked(); Affect.AffectCheck(d, p); } - } catch (NullPointerException err) { + } catch (Exception err) { } } diff --git a/src/main/resources/en-UK.yml b/src/main/resources/en-UK.yml index faacd15..3134e29 100644 --- a/src/main/resources/en-UK.yml +++ b/src/main/resources/en-UK.yml @@ -315,6 +315,15 @@ Items: CLAY_ALLOY_CHESTPLATE: "&9Clay Alloy Chestplate" CLAY_ALLOY_LEGGINGS: "&9Clay Alloy Leggings" CLAY_ALLOY_BOOTS: "&9Clay Alloy Boots" + CLAY_EXPERIMENT_TABLE_NORMAL: "&eExperiment Table(Basic)" + CLAY_EXPERIMENT_TABLE_NORMAL_LORE: + - "" + - "&fCan do some basic experiments or crafting new matter." + - "" + - "%TIER%" + - "%POWER%" + - "&8\u21E8 &e\u26A1 &780 J/s" + SILICON_INGOT: "&bSilicon Ingot" # End Items Researches: CLAYTECH_ARMORS_I: "Basic Effect Armors" @@ -345,19 +354,12 @@ Researches: CLAYTECH_TOOLS_I: "Tools I" CLAYTECH_OREINGOTS_I: "Ore Ingots I" CLAYTECH_CLAY_ALLOY_ARMORS_I: "Clay Alloy Armors" - CLAY_EXPERIMENT_TABLE_NORMAL: "&eExperiment Table(Basic)" - CLAY_EXPERIMENT_TABLE_NORMAL_LORE: - - "" - - "&fCan do some basic experiments or crafting new matter." - - "" - - "%TIER%" - - "%POWER%" - - "&8\u21E8 &e\u26A1 &780 J/s" MachineRecipes: CLAY_FUSION_MACHINE: "&a&oCraft this in Clay Fusing Machine" CLAY_ELETRIC_CAULDRON: "&a&oCraft this in Electric Cauldron" CLAY_FOOD_CHALKING_MACHINE: "&a&oCraft this in Food Chalking Machine" CLAY_ELEMENT_EXTRACTER: "&a&oExtract this in Element Extracter" + CLAY_EXPERIMENT_TABLE_BASIC: "&a&oGet this by experimenting in the Experiment Table(Basic)." Machines: SPLIT_LINE: " " CLAY_FUSION_MACHINE: "&bClay Fusing Machine" diff --git a/src/main/resources/en-US.yml b/src/main/resources/en-US.yml index faacd15..3134e29 100644 --- a/src/main/resources/en-US.yml +++ b/src/main/resources/en-US.yml @@ -315,6 +315,15 @@ Items: CLAY_ALLOY_CHESTPLATE: "&9Clay Alloy Chestplate" CLAY_ALLOY_LEGGINGS: "&9Clay Alloy Leggings" CLAY_ALLOY_BOOTS: "&9Clay Alloy Boots" + CLAY_EXPERIMENT_TABLE_NORMAL: "&eExperiment Table(Basic)" + CLAY_EXPERIMENT_TABLE_NORMAL_LORE: + - "" + - "&fCan do some basic experiments or crafting new matter." + - "" + - "%TIER%" + - "%POWER%" + - "&8\u21E8 &e\u26A1 &780 J/s" + SILICON_INGOT: "&bSilicon Ingot" # End Items Researches: CLAYTECH_ARMORS_I: "Basic Effect Armors" @@ -345,19 +354,12 @@ Researches: CLAYTECH_TOOLS_I: "Tools I" CLAYTECH_OREINGOTS_I: "Ore Ingots I" CLAYTECH_CLAY_ALLOY_ARMORS_I: "Clay Alloy Armors" - CLAY_EXPERIMENT_TABLE_NORMAL: "&eExperiment Table(Basic)" - CLAY_EXPERIMENT_TABLE_NORMAL_LORE: - - "" - - "&fCan do some basic experiments or crafting new matter." - - "" - - "%TIER%" - - "%POWER%" - - "&8\u21E8 &e\u26A1 &780 J/s" MachineRecipes: CLAY_FUSION_MACHINE: "&a&oCraft this in Clay Fusing Machine" CLAY_ELETRIC_CAULDRON: "&a&oCraft this in Electric Cauldron" CLAY_FOOD_CHALKING_MACHINE: "&a&oCraft this in Food Chalking Machine" CLAY_ELEMENT_EXTRACTER: "&a&oExtract this in Element Extracter" + CLAY_EXPERIMENT_TABLE_BASIC: "&a&oGet this by experimenting in the Experiment Table(Basic)." Machines: SPLIT_LINE: " " CLAY_FUSION_MACHINE: "&bClay Fusing Machine" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 78c3207..6255970 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ClayTech main: club.claycoffee.ClayTech.ClayTech -version: 1.0.1 +version: 1.0.2 api-version: 1.14 depend: [CS-CoreLib, Slimefun] \ No newline at end of file diff --git a/src/main/resources/zh-CN.yml b/src/main/resources/zh-CN.yml index baad689..0add4d1 100644 --- a/src/main/resources/zh-CN.yml +++ b/src/main/resources/zh-CN.yml @@ -323,6 +323,8 @@ Items: - "%TIER%" - "%POWER%" - "&8\u21E8 &e\u26A1 &780 J/s" + SILICON_INGOT: "&b硅锭" + # End Items Researches: CLAYTECH_ARMORS_I: "基础效果装备" @@ -358,6 +360,7 @@ MachineRecipes: CLAY_ELETRIC_CAULDRON: "&a&o在电锅内合成" CLAY_FOOD_CHALKING_MACHINE: "&a&o在食物打粉机内合成" CLAY_ELEMENT_EXTRACTER: "&a&o在元素提取机内提取" + CLAY_EXPERIMENT_TABLE_BASIC: "&a&o在实验台(基本)中实验获得" Machines: SPLIT_LINE: " " CLAY_FUSION_MACHINE: "&b粘土融合器" diff --git a/src/main/resources/zh-TW.yml b/src/main/resources/zh-TW.yml index 16bf587..1fe8257 100644 --- a/src/main/resources/zh-TW.yml +++ b/src/main/resources/zh-TW.yml @@ -323,6 +323,7 @@ Items: - "%TIER%" - "%POWER%" - "&8\u21E8 &e\u26A1 &780 J/s" + SILICON_INGOT: "&b矽錠" # End Items Researches: CLAYTECH_ARMORS_I: "基礎效果裝備" @@ -358,6 +359,7 @@ MachineRecipes: CLAY_ELETRIC_CAULDRON: "&a&o在電鍋內合成" CLAY_FOOD_CHALKING_MACHINE: "&a&o在食物打粉機內合成" CLAY_ELEMENT_EXTRACTER: "&a&o在元素提取機內提取" + CLAY_EXPERIMENT_TABLE_BASIC: "&a&o在實驗台(基本)中實驗獲得" Machines: SPLIT_LINE: " " CLAY_FUSION_MACHINE: "&b粘土融合器"