Skip to content

Commit

Permalink
[U] 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ClayCoffee committed Mar 18, 2020
1 parent d22abc8 commit 8d460ff
Show file tree
Hide file tree
Showing 33 changed files with 143 additions and 83 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>club.claycoffee</groupId>
<artifactId>ClayTech</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<build>
<plugins>
<plugin>
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/club/claycoffee/ClayTech/ClayTech.java
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/club/claycoffee/ClayTech/ClayTechItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
// 机器正在处理
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Block, MachineRecipe> processing = new HashMap<>();
public static Map<Block, Integer> progress = new HashMap<>();
protected final List<MachineRecipe> 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"));
Expand Down Expand Up @@ -163,7 +163,7 @@ public int[] getInputSlots() {
public int[] getOutputSlots() {
return outputslots;
}

public List<ItemStack> getDisplayRecipes() {
List<ItemStack> displayRecipes = new ArrayList<>(recipes.size() * 2);

Expand Down Expand Up @@ -194,15 +194,15 @@ 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() {

@Override
public void run() {
Bukkit.getPluginManager().callEvent(new MachineTickEvent(b));
}

}.runTask(ClayTech.plugin);
BlockMenu inv = BlockStorage.getInventory(b);
// 机器正在处理
Expand Down Expand Up @@ -255,7 +255,7 @@ public void run() {
} else
i = 0;
}
if (found.size() == recipe.getInput().length) {
if (found.size() == 5) {
r = recipe;
break;
} else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
// 机器正在处理
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/club/claycoffee/ClayTech/items/Armors.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
39 changes: 26 additions & 13 deletions src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/club/claycoffee/ClayTech/items/Elements.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 });
}
}
12 changes: 8 additions & 4 deletions src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/club/claycoffee/ClayTech/items/Foods.java
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/club/claycoffee/ClayTech/items/Ingots.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Loading

0 comments on commit 8d460ff

Please sign in to comment.