diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index 08129b9..2e71c02 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -2,10 +2,10 @@ - + All Classes - + @@ -17,8 +17,8 @@

All Classes

  • AExtracter
  • ANewContainer
  • ClayTech
    • +
  • ClayTechItems
  • ClayTechManager
    • -
  • Defines
  • MachineTickEvent
  • PlayerCookItemEvent
  • PlayerCraftItemEvent
    • diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html index e1d24f1..13a96e6 100644 --- a/doc/allclasses-noframe.html +++ b/doc/allclasses-noframe.html @@ -2,10 +2,10 @@ - + All Classes - + @@ -17,8 +17,8 @@

    All Classes

  • AExtracter
  • ANewContainer
  • ClayTech
    • +
  • ClayTechItems
  • ClayTechManager
    • -
  • Defines
  • MachineTickEvent
  • PlayerCookItemEvent
  • PlayerCraftItemEvent
    • diff --git a/doc/club/claycoffee/ClayTech/ClayTech.html b/doc/club/claycoffee/ClayTech/ClayTech.html index 9a572a2..19cf8cb 100644 --- a/doc/club/claycoffee/ClayTech/ClayTech.html +++ b/doc/club/claycoffee/ClayTech/ClayTech.html @@ -2,10 +2,10 @@ - + ClayTech - + @@ -51,7 +51,7 @@
    diff --git a/doc/index-files/index-12.html b/doc/index-files/index-12.html index 68a5ed8..3d6216b 100644 --- a/doc/index-files/index-12.html +++ b/doc/index-files/index-12.html @@ -2,10 +2,10 @@ - + N-Index - + @@ -75,7 +75,7 @@

    N

    -
    NORECIPE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    NORECIPE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    A B C D E F G H I L M N O P R S T U  diff --git a/doc/index-files/index-13.html b/doc/index-files/index-13.html index 5953a51..91a3793 100644 --- a/doc/index-files/index-13.html +++ b/doc/index-files/index-13.html @@ -2,10 +2,10 @@ - + O-Index - + @@ -79,7 +79,7 @@

    O

     
    onEnable() - Method in class club.claycoffee.ClayTech.ClayTech
     
    -
    ORE_DIAMOND - Static variable in class club.claycoffee.ClayTech.Defines
    +
    ORE_DIAMOND - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    outpotslots - Static variable in class club.claycoffee.ClayTech.Machines.ACraftingTable
     
    diff --git a/doc/index-files/index-14.html b/doc/index-files/index-14.html index e84574e..da54ea7 100644 --- a/doc/index-files/index-14.html +++ b/doc/index-files/index-14.html @@ -2,10 +2,10 @@ - + P-Index - + @@ -75,7 +75,7 @@

    P

    -
    PLASTIC - Static variable in class club.claycoffee.ClayTech.Defines
    +
    PLASTIC - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    PlayerCookItemEvent - Class in club.claycoffee.ClayTech.api.listeners
    @@ -121,15 +121,15 @@

    P

     
    plugin - Static variable in class club.claycoffee.ClayTech.ClayTech
     
    -
    POISON_CORE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    POISON_CORE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    POISON_CORE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    POISON_EYE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    POISON_EYE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    POISON_EYE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    POISON_SWORD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    POISON_SWORD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    POISON_SWORD - Static variable in class club.claycoffee.ClayTech.Recipes
     
    diff --git a/doc/index-files/index-15.html b/doc/index-files/index-15.html index 2681a7b..f959ba0 100644 --- a/doc/index-files/index-15.html +++ b/doc/index-files/index-15.html @@ -2,10 +2,10 @@ - + R-Index - + @@ -75,13 +75,13 @@

    R

    -
    RAW_BREAD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    RAW_BREAD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    RAW_CHICKEN_FOOT - Static variable in class club.claycoffee.ClayTech.Defines
    +
    RAW_CHICKEN_FOOT - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    RAW_TEA - Static variable in class club.claycoffee.ClayTech.Defines
    +
    RAW_TEA - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    RAW_VEGETABLE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    RAW_VEGETABLE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    Recipes - Class in club.claycoffee.ClayTech
     
    diff --git a/doc/index-files/index-16.html b/doc/index-files/index-16.html index 95b9ad8..9876ca3 100644 --- a/doc/index-files/index-16.html +++ b/doc/index-files/index-16.html @@ -2,10 +2,10 @@ - + S-Index - + @@ -79,25 +79,27 @@

    S

     
    SetupMenu(BlockMenuPreset) - Method in class club.claycoffee.ClayTech.Machines.AExtracter
     
    -
    SLOWNESS_CORE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    SLOWNESS_CORE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    SLOWNESS_CORE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    SNAIL_BAD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    SNAIL_BAD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    SNAIL_FOOD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    SNAIL_FOOD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    SNAIL_FOOD - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    SNAIL_HEALTHY - Static variable in class club.claycoffee.ClayTech.Defines
    +
    SNAIL_HEALTHY - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    SPICY_CHICKEN_BURGER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    SPICY_CHICKEN_BURGER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    SPICY_CHICKEN_BURGER - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    STALIN_HEAD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    STALIN_HEAD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    STARCH - Static variable in class club.claycoffee.ClayTech.Defines
    +
    STARCH - Static variable in class club.claycoffee.ClayTech.ClayTechItems
    +
     
    +
    SWEET_POTATO - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    A B C D E F G H I L M N O P R S T U  diff --git a/doc/index-files/index-17.html b/doc/index-files/index-17.html index 6c99f3d..bfa3305 100644 --- a/doc/index-files/index-17.html +++ b/doc/index-files/index-17.html @@ -2,10 +2,10 @@ - + T-Index - + @@ -75,15 +75,15 @@

    T

    -
    TEA_DRINK - Static variable in class club.claycoffee.ClayTech.Defines
    +
    TEA_DRINK - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    TEA_DRINK - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    TEA_POWDER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    TEA_POWDER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    TEA_POWDER - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    TNT_EXPLOSION_CREATER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    TNT_EXPLOSION_CREATER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    TNT_EXPLOSION_CREATER - Static variable in class club.claycoffee.ClayTech.Recipes
     
    diff --git a/doc/index-files/index-18.html b/doc/index-files/index-18.html index e882b0f..3cb2dc5 100644 --- a/doc/index-files/index-18.html +++ b/doc/index-files/index-18.html @@ -2,10 +2,10 @@ - + U-Index - + @@ -75,7 +75,7 @@

    U

    -
    USEFUL_DIRT - Static variable in class club.claycoffee.ClayTech.Defines
    +
    USEFUL_DIRT - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    A B C D E F G H I L M N O P R S T U  diff --git a/doc/index-files/index-2.html b/doc/index-files/index-2.html index 5fbe6ce..27dde5c 100644 --- a/doc/index-files/index-2.html +++ b/doc/index-files/index-2.html @@ -2,10 +2,10 @@ - + B-Index - + @@ -75,23 +75,23 @@

    B

    -
    BABA_BURGER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    BABA_BURGER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    BABA_BURGER - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    BLACK_ROCK_BLOCK - Static variable in class club.claycoffee.ClayTech.Defines
    +
    BLACK_ROCK_BLOCK - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    BLACK_ROCK_BLOCK - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    BLIND_CORE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    BLIND_CORE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    BLIND_CORE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    BLIND_SWORD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    BLIND_SWORD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    BLIND_SWORD - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    BLISTERING_CORE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    BLISTERING_CORE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    BLISTERING_CORE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    diff --git a/doc/index-files/index-3.html b/doc/index-files/index-3.html index ed18031..66ea6e0 100644 --- a/doc/index-files/index-3.html +++ b/doc/index-files/index-3.html @@ -2,10 +2,10 @@ - + C-Index - + @@ -75,73 +75,77 @@

    C

    -
    C_ARMORS - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_ARMORS - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_BASICS - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_BASICS - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_DECORATES - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_DECORATES - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_DRINK - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_DRINK - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_ELEMENTS - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_ELEMENTS - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_FOOD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_FOOD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_FOODMATERIALS - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_FOODMATERIALS - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_MACHINES - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_MACHINES - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_MATERIALS - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_MATERIALS - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_OTHER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_OTHER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    C_WEAPONS - Static variable in class club.claycoffee.ClayTech.Defines
    +
    C_WEAPONS - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    CHICKEN_FOOT - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CHICKEN_FOOT - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CHICKEN_FOOT - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    CHOCOLATE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CHOCOLATE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CHOCOLATE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    CLAY_COFFEE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_COFFEE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CLAY_COFFEE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    CLAY_CRAFTING_TABLE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_CRAFTING_TABLE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CLAY_CRAFTING_TABLE - Static variable in class club.claycoffee.ClayTech.TRecipe
     
    -
    CLAY_ELECTRIC_STONE_CRUSHER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_ELECTRIC_STONE_CRUSHER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    CLAY_ELEMENT_EXTRACTER - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_ELEMENT_EXTRACTER - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CLAY_ELEMENT_EXTRACTER - Static variable in class club.claycoffee.ClayTech.TRecipe
     
    -
    CLAY_FOOD_CAULDRON - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_FOOD_CAULDRON - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CLAY_FOOD_CAULDRON - Static variable in class club.claycoffee.ClayTech.TRecipe
     
    -
    CLAY_FOOD_CHALKING_MACHINE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_FOOD_CHALKING_MACHINE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CLAY_FOOD_CHALKING_MACHINE - Static variable in class club.claycoffee.ClayTech.TRecipe
     
    -
    CLAY_STICK - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAY_STICK - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    CLAYCOFFEE_HEAD - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLAYCOFFEE_HEAD - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    ClayTech - Class in club.claycoffee.ClayTech
     
    ClayTech() - Constructor for class club.claycoffee.ClayTech.ClayTech
     
    +
    ClayTechItems - Class in club.claycoffee.ClayTech
    +
     
    +
    ClayTechItems() - Constructor for class club.claycoffee.ClayTech.ClayTechItems
    +
     
    ClayTechManager - Class in club.claycoffee.ClayTech.api
    the ClayTech API manager.
    ClayTechManager() - Constructor for class club.claycoffee.ClayTech.api.ClayTechManager
     
    -
    CLOCK_C - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CLOCK_C - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    club.claycoffee.ClayTech - package club.claycoffee.ClayTech
     
    @@ -151,14 +155,18 @@

    C

     
    club.claycoffee.ClayTech.Machines - package club.claycoffee.ClayTech.Machines
     
    -
    COCOA_BEAN - Static variable in class club.claycoffee.ClayTech.Defines
    +
    COCOA_BEAN - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    compatible - Static variable in class club.claycoffee.ClayTech.ClayTech
     
    -
    CONFUSION_CORE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    CONFUSION_CORE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    CONFUSION_CORE - Static variable in class club.claycoffee.ClayTech.Recipes
     
    +
    COOKED_SWEET_POTATO - Static variable in class club.claycoffee.ClayTech.ClayTechItems
    +
     
    +
    COOKED_SWEET_POTATO - Static variable in class club.claycoffee.ClayTech.Recipes
    +
     
    currentLang - Static variable in class club.claycoffee.ClayTech.ClayTech
     
    currentLangYML - Static variable in class club.claycoffee.ClayTech.ClayTech
    diff --git a/doc/index-files/index-4.html b/doc/index-files/index-4.html index c09ed4c..3dd7d6d 100644 --- a/doc/index-files/index-4.html +++ b/doc/index-files/index-4.html @@ -2,10 +2,10 @@ - + D-Index - + @@ -75,15 +75,11 @@

    D

    -
    Defines - Class in club.claycoffee.ClayTech
    +
    DIRTY_DRINK_BOTTLE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    Defines() - Constructor for class club.claycoffee.ClayTech.Defines
    +
    DIRTY_TEA - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    DIRTY_DRINK_BOTTLE - Static variable in class club.claycoffee.ClayTech.Defines
    -
     
    -
    DIRTY_TEA - Static variable in class club.claycoffee.ClayTech.Defines
    -
     
    -
    DRINK_BOTTLE - Static variable in class club.claycoffee.ClayTech.Defines
    +
    DRINK_BOTTLE - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    A B C D E F G H I L M N O P R S T U  diff --git a/doc/index-files/index-5.html b/doc/index-files/index-5.html index eae1893..1009028 100644 --- a/doc/index-files/index-5.html +++ b/doc/index-files/index-5.html @@ -2,10 +2,10 @@ - + E-Index - + @@ -75,23 +75,23 @@

    E

    -
    ELECTRIC_MOTOR_8 - Static variable in class club.claycoffee.ClayTech.Defines
    +
    ELECTRIC_MOTOR_8 - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    ELECTRIC_MOTOR_8 - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    ELEMENT_CARBON - Static variable in class club.claycoffee.ClayTech.Defines
    +
    ELEMENT_CARBON - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    ELEMENT_CARBON - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    ELEMENT_OXYGEN - Static variable in class club.claycoffee.ClayTech.Defines
    +
    ELEMENT_OXYGEN - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    ELEMENT_OXYGEN - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    ELEMENT_SILICON - Static variable in class club.claycoffee.ClayTech.Defines
    +
    ELEMENT_SILICON - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    ELEMENT_SILICON - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    ELEMENT_UNIT - Static variable in class club.claycoffee.ClayTech.Defines
    +
    ELEMENT_UNIT - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    ELEMENT_UNIT - Static variable in class club.claycoffee.ClayTech.Recipes
     
    diff --git a/doc/index-files/index-6.html b/doc/index-files/index-6.html index 626de7f..b31d6cb 100644 --- a/doc/index-files/index-6.html +++ b/doc/index-files/index-6.html @@ -2,10 +2,10 @@ - + F-Index - + @@ -75,9 +75,9 @@

    F

    -
    FLOUR - Static variable in class club.claycoffee.ClayTech.Defines
    +
    FLOUR - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    -
    FOUR_BOW - Static variable in class club.claycoffee.ClayTech.Defines
    +
    FOUR_BOW - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    FOUR_BOW - Static variable in class club.claycoffee.ClayTech.Recipes
     
    diff --git a/doc/index-files/index-7.html b/doc/index-files/index-7.html index 897fe6a..ac66018 100644 --- a/doc/index-files/index-7.html +++ b/doc/index-files/index-7.html @@ -2,10 +2,10 @@ - + G-Index - + diff --git a/doc/index-files/index-8.html b/doc/index-files/index-8.html index 4338509..cdbd68a 100644 --- a/doc/index-files/index-8.html +++ b/doc/index-files/index-8.html @@ -2,10 +2,10 @@ - + H-Index - + @@ -77,11 +77,11 @@

    H

    highrailspeed - Static variable in class club.claycoffee.ClayTech.ClayTech
     
    -
    HIGHSPEED_RAILWAY - Static variable in class club.claycoffee.ClayTech.Defines
    +
    HIGHSPEED_RAILWAY - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    HIGHSPEED_RAILWAY - Static variable in class club.claycoffee.ClayTech.Recipes
     
    -
    HONEY_SWEET - Static variable in class club.claycoffee.ClayTech.Defines
    +
    HONEY_SWEET - Static variable in class club.claycoffee.ClayTech.ClayTechItems
     
    HONEY_SWEET - Static variable in class club.claycoffee.ClayTech.Recipes
     
    diff --git a/doc/index-files/index-9.html b/doc/index-files/index-9.html index 9820b28..390b392 100644 --- a/doc/index-files/index-9.html +++ b/doc/index-files/index-9.html @@ -2,10 +2,10 @@ - + I-Index - + diff --git a/doc/index.html b/doc/index.html index f6cf5b7..f17cd9e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) diff --git a/doc/overview-summary.html b/doc/overview-summary.html index 00b9c5a..1f9a0cf 100644 --- a/doc/overview-summary.html +++ b/doc/overview-summary.html @@ -2,10 +2,10 @@ - + Overview - + diff --git a/doc/overview-tree.html b/doc/overview-tree.html index 5fdf442..855f435 100644 --- a/doc/overview-tree.html +++ b/doc/overview-tree.html @@ -2,10 +2,10 @@ - + Class Hierarchy - + @@ -85,8 +85,8 @@

    Class Hierarchy

    • java.lang.Object
        +
      • club.claycoffee.ClayTech.ClayTechItems
      • club.claycoffee.ClayTech.api.ClayTechManager
        • -
      • club.claycoffee.ClayTech.Defines
      • org.bukkit.event.Event
        • club.claycoffee.ClayTech.api.listeners.MachineTickEvent
          • diff --git a/pom.xml b/pom.xml index ab99226..6b57760 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 club.claycoffee ClayTech - nightly-20200314 + nightly-20200315 diff --git a/src/main/java/club/claycoffee/ClayTech/ClayTech.java b/src/main/java/club/claycoffee/ClayTech/ClayTech.java index 16a6a50..1b082f1 100644 --- a/src/main/java/club/claycoffee/ClayTech/ClayTech.java +++ b/src/main/java/club/claycoffee/ClayTech/ClayTech.java @@ -37,7 +37,7 @@ public class ClayTech extends JavaPlugin implements SlimefunAddon { @Override public void onEnable() { plugin = this; - // 当前研究ID: 9920 + // 当前研究ID: 9921 this.saveDefaultConfig(); FileConfiguration config = this.getConfig(); locale = config.getString("Locale"); @@ -132,41 +132,41 @@ public void onDisable() { public void registerSlimefun() { ItemStack[] ClayCrafingTable = { SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ELECTRO_MAGNET, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, new ItemStack(Material.CRAFTING_TABLE), - SlimefunItems.BATTERY, Defines.MAGIC_CLAY, SlimefunItems.SMALL_CAPACITOR, Defines.MAGIC_CLAY }; + SlimefunItems.BATTERY, ClayTechItems.MAGIC_CLAY, SlimefunItems.SMALL_CAPACITOR, ClayTechItems.MAGIC_CLAY }; ItemStack[] ClayStoneCrusher = { SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ELECTRO_MAGNET, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, SlimefunItems.ADVANCED_CIRCUIT_BOARD, - SlimefunItems.BATTERY, Defines.MAGIC_CLAY, SlimefunItems.SMALL_CAPACITOR, + SlimefunItems.BATTERY, ClayTechItems.MAGIC_CLAY, SlimefunItems.SMALL_CAPACITOR, new ItemStack(Material.DISPENSER) }; ItemStack[] ClayFoodCauldron = { SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ELECTRO_MAGNET, - SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, Defines.CLAY_CRAFTING_TABLE, SlimefunItems.BATTERY, - Defines.MAGIC_CLAY, SlimefunItems.MEDIUM_CAPACITOR, Defines.MAGIC_CLAY }; + SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, ClayTechItems.CLAY_CRAFTING_TABLE, SlimefunItems.BATTERY, + ClayTechItems.MAGIC_CLAY, SlimefunItems.MEDIUM_CAPACITOR, ClayTechItems.MAGIC_CLAY }; ItemStack[] ClayChalkingMachine = { SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ELECTRO_MAGNET, - SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, Defines.CLAY_CRAFTING_TABLE, SlimefunItems.BATTERY, - Defines.CLAY_STICK, SlimefunItems.MEDIUM_CAPACITOR, Defines.MAGIC_CLAY }; - ItemStack[] ClayElementExtracter = { Defines.BLISTERING_CORE, Defines.BLISTERING_CORE, Defines.BLISTERING_CORE, + SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, ClayTechItems.CLAY_CRAFTING_TABLE, SlimefunItems.BATTERY, + ClayTechItems.CLAY_STICK, SlimefunItems.MEDIUM_CAPACITOR, ClayTechItems.MAGIC_CLAY }; + ItemStack[] ClayElementExtracter = { ClayTechItems.BLISTERING_CORE, ClayTechItems.BLISTERING_CORE, 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 }; // 机器 - SlimefunItemStack craftingtable = new SlimefunItemStack("CLAY_CRAFTING_TABLE", Defines.CLAY_CRAFTING_TABLE); - SlimefunItemStack foodcauldron = new SlimefunItemStack("CLAY_FOOD_CAULDRON", Defines.CLAY_FOOD_CAULDRON); + SlimefunItemStack craftingtable = new SlimefunItemStack("CLAY_CRAFTING_TABLE", ClayTechItems.CLAY_CRAFTING_TABLE); + SlimefunItemStack foodcauldron = new SlimefunItemStack("CLAY_FOOD_CAULDRON", ClayTechItems.CLAY_FOOD_CAULDRON); SlimefunItemStack chalkingmachine = new SlimefunItemStack("CLAY_FOOD_CHALKING_MACHINE", - Defines.CLAY_FOOD_CHALKING_MACHINE); + ClayTechItems.CLAY_FOOD_CHALKING_MACHINE); SlimefunItemStack elementextracter = new SlimefunItemStack("CLAY_ELEMENT_EXTRACTER", - Defines.CLAY_ELEMENT_EXTRACTER); + ClayTechItems.CLAY_ELEMENT_EXTRACTER); SlimefunItemStack electricstonecrusher = new SlimefunItemStack("CLAY_ELECTRIC_STONE_CRUSHER", - Defines.CLAY_ELECTRIC_STONE_CRUSHER); + ClayTechItems.CLAY_ELECTRIC_STONE_CRUSHER); - new CraftingTable(Defines.C_MACHINES, craftingtable, "CLAY_CRAFTING_TABLE", RecipeType.ENHANCED_CRAFTING_TABLE, + new CraftingTable(ClayTechItems.C_MACHINES, craftingtable, "CLAY_CRAFTING_TABLE", RecipeType.ENHANCED_CRAFTING_TABLE, ClayCrafingTable).register(this); - new ElectricStoneCrusher(Defines.C_MACHINES, electricstonecrusher, "CLAY_ELECTRIC_STONE_CRUSHER", + new ElectricStoneCrusher(ClayTechItems.C_MACHINES, electricstonecrusher, "CLAY_ELECTRIC_STONE_CRUSHER", RecipeType.ENHANCED_CRAFTING_TABLE, ClayStoneCrusher).register(this); - new FoodCauldron(Defines.C_MACHINES, foodcauldron, "CLAY_FOOD_CAULDRON", RecipeType.ENHANCED_CRAFTING_TABLE, + new FoodCauldron(ClayTechItems.C_MACHINES, foodcauldron, "CLAY_FOOD_CAULDRON", RecipeType.ENHANCED_CRAFTING_TABLE, ClayFoodCauldron).register(this); - new FoodChalkingMachine(Defines.C_MACHINES, chalkingmachine, "CLAY_FOOD_CHALKING_MACHINE", + new FoodChalkingMachine(ClayTechItems.C_MACHINES, chalkingmachine, "CLAY_FOOD_CHALKING_MACHINE", RecipeType.ENHANCED_CRAFTING_TABLE, ClayChalkingMachine).register(this); - new ElementExtracter(Defines.C_MACHINES, elementextracter, "CLAY_ELEMENT_EXTRACTER", + new ElementExtracter(ClayTechItems.C_MACHINES, elementextracter, "CLAY_ELEMENT_EXTRACTER", RecipeType.ENHANCED_CRAFTING_TABLE, ClayElementExtracter).register(this); // 物品 diff --git a/src/main/java/club/claycoffee/ClayTech/Defines.java b/src/main/java/club/claycoffee/ClayTech/ClayTechItems.java similarity index 97% rename from src/main/java/club/claycoffee/ClayTech/Defines.java rename to src/main/java/club/claycoffee/ClayTech/ClayTechItems.java index 175a56f..c147da9 100644 --- a/src/main/java/club/claycoffee/ClayTech/Defines.java +++ b/src/main/java/club/claycoffee/ClayTech/ClayTechItems.java @@ -13,7 +13,7 @@ import io.github.thebusybiscuit.slimefun4.core.attributes.MachineTier; import io.github.thebusybiscuit.slimefun4.core.attributes.MachineType; -public class Defines { +public class ClayTechItems { public static final ItemStack[] NORECIPE = { null, null, null, null, null, null, null, null, null }; // 分类 @@ -142,6 +142,12 @@ public class Defines { public static final ItemStack TNT_EXPLOSION_CREATER = Utils.setLore( Utils.newItemD(Material.GOLDEN_HOE, Lang.readItemText("TNT_EXPLOSION_CREATER")), Lang.readItemLore("TNT_EXPLOSION_CREATER")); + public static final ItemStack SWEET_POTATO = Utils.setLore( + Utils.newItemD(Material.BEETROOT,Lang.readItemText("SWEET_POTATO")), + Lang.readItemLore("SWEET_POTATO")); + public static final ItemStack COOKED_SWEET_POTATO = Utils.setLore( + Utils.newItemD(Material.BEETROOT,Lang.readItemText("COOKED_SWEET_POTATO")), + Lang.readItemLore("COOKED_SWEET_POTATO")); // 头颅 public static final ItemStack CLAYCOFFEE_HEAD = Utils.setDisplayName(SkullItem.fromURL( diff --git a/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java b/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java index 7b87de0..f32174a 100644 --- a/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java +++ b/src/main/java/club/claycoffee/ClayTech/Machines/AExtracter.java @@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.api.listeners.MachineTickEvent; import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Utils; @@ -260,7 +260,7 @@ protected void tick(Block b) { return; ChargableBlock.addCharge(b, -getEnergyConsumption()); } - if (!SlimefunManager.isItemSimilar(inv.getItemInSlot(40), Defines.ELEMENT_UNIT, true)) + if (!SlimefunManager.isItemSimilar(inv.getItemInSlot(40), ClayTechItems.ELEMENT_UNIT, true)) return; for (Map.Entry entry : found.entrySet()) { if (entry.getValue() > 0) { diff --git a/src/main/java/club/claycoffee/ClayTech/Recipes.java b/src/main/java/club/claycoffee/ClayTech/Recipes.java index b26303d..3781134 100644 --- a/src/main/java/club/claycoffee/ClayTech/Recipes.java +++ b/src/main/java/club/claycoffee/ClayTech/Recipes.java @@ -8,81 +8,83 @@ public class Recipes { static ItemStack newMotor; public final static ItemStack[] BLIND_CORE = { new ItemStack(Material.INK_SAC), new ItemStack(Material.END_CRYSTAL), - new ItemStack(Material.INK_SAC), new ItemStack(Material.INK_SAC), Defines.MAGIC_CLAY, + new ItemStack(Material.INK_SAC), new ItemStack(Material.INK_SAC), ClayTechItems.MAGIC_CLAY, new ItemStack(Material.INK_SAC), new ItemStack(Material.INK_SAC), new ItemStack(Material.END_CRYSTAL), new ItemStack(Material.INK_SAC) }; - public final static ItemStack[] BLIND_SWORD = { Defines.BLIND_CORE, Defines.BLIND_CORE, Defines.BLIND_CORE, - Defines.BLIND_CORE, new ItemStack(Material.DIAMOND_SWORD), Defines.BLIND_CORE, Defines.BLIND_CORE, - Defines.BLIND_CORE, Defines.BLIND_CORE }; + public final static ItemStack[] BLIND_SWORD = { ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, + ClayTechItems.BLIND_CORE, new ItemStack(Material.DIAMOND_SWORD), ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, + ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE }; public final static ItemStack[] POISON_EYE = { new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE), - Defines.MAGIC_CLAY, new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE), + ClayTechItems.MAGIC_CLAY, new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.SPIDER_EYE) }; - public final static ItemStack[] POISON_CORE = { new ItemStack(Material.COAL_BLOCK), Defines.POISON_EYE, + public final static ItemStack[] POISON_CORE = { new ItemStack(Material.COAL_BLOCK), ClayTechItems.POISON_EYE, new ItemStack(Material.COAL_BLOCK), new ItemStack(Material.FERMENTED_SPIDER_EYE), new ItemStack(Material.FERMENTED_SPIDER_EYE), new ItemStack(Material.FERMENTED_SPIDER_EYE), - new ItemStack(Material.COAL_BLOCK), Defines.POISON_EYE, new ItemStack(Material.COAL_BLOCK), - Defines.POISON_EYE }; + new ItemStack(Material.COAL_BLOCK), ClayTechItems.POISON_EYE, new ItemStack(Material.COAL_BLOCK), + ClayTechItems.POISON_EYE }; public final static ItemStack[] CONFUSION_CORE = { new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH), - Defines.MAGIC_CLAY, new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH), + ClayTechItems.MAGIC_CLAY, new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH), new ItemStack(Material.PUFFERFISH) }; public final static ItemStack[] BLACK_ROCK_BLOCK = { new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN), - Defines.MAGIC_CLAY, new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN), + ClayTechItems.MAGIC_CLAY, new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN), new ItemStack(Material.OBSIDIAN) }; - public final static ItemStack[] SLOWNESS_CORE = { Defines.BLACK_ROCK_BLOCK, Defines.BLACK_ROCK_BLOCK, - Defines.BLACK_ROCK_BLOCK, Defines.BLACK_ROCK_BLOCK, Defines.MAGIC_CLAY, Defines.BLACK_ROCK_BLOCK, - Defines.BLACK_ROCK_BLOCK, Defines.BLACK_ROCK_BLOCK, Defines.BLACK_ROCK_BLOCK }; - public final static ItemStack[] ADVANCED_CONFUSION_CORE = { Defines.CONFUSION_CORE, Defines.CONFUSION_CORE, - Defines.CONFUSION_CORE, Defines.CONFUSION_CORE, Defines.MAGIC_CLAY, Defines.CONFUSION_CORE, - Defines.CONFUSION_CORE, Defines.CONFUSION_CORE, Defines.CONFUSION_CORE }; - public final static ItemStack[] ADVANCED_POISON_CORE = { Defines.POISON_CORE, Defines.POISON_CORE, - Defines.POISON_CORE, Defines.POISON_CORE, Defines.MAGIC_CLAY, Defines.POISON_CORE, Defines.POISON_CORE, - Defines.POISON_CORE, Defines.POISON_CORE }; - public final static ItemStack[] ADVANCED_SLOWNESS_CORE = { Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, - Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, Defines.MAGIC_CLAY, Defines.SLOWNESS_CORE, - Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE }; - public final static ItemStack[] ADVANCED_BLIND_CORE = { Defines.BLIND_CORE, Defines.BLIND_CORE, Defines.BLIND_CORE, - Defines.BLIND_CORE, Defines.MAGIC_CLAY, Defines.BLIND_CORE, Defines.BLIND_CORE, Defines.BLIND_CORE, - Defines.BLIND_CORE }; - public final static ItemStack[] FOUR_BOW = { Defines.ADVANCED_SLOWNESS_CORE, Defines.ADVANCED_POISON_CORE, - Defines.ADVANCED_BLIND_CORE, Defines.ADVANCED_CONFUSION_CORE, new ItemStack(Material.BOW), - Defines.ADVANCED_CONFUSION_CORE, Defines.ADVANCED_BLIND_CORE, Defines.ADVANCED_POISON_CORE, - Defines.ADVANCED_SLOWNESS_CORE }; - public final static ItemStack[] POISON_SWORD = { Defines.POISON_CORE, Defines.POISON_CORE, Defines.POISON_CORE, - Defines.POISON_CORE, new ItemStack(Material.DIAMOND_SWORD), Defines.POISON_CORE, Defines.POISON_CORE, - Defines.POISON_CORE, Defines.POISON_CORE }; - public final static ItemStack[] ANTI_SLOWNESS_BOOTS = { Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, - Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, new ItemStack(Material.IRON_BOOTS), Defines.SLOWNESS_CORE, - Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE }; - public final static ItemStack[] TNT_EXPLOSION_CREATER = {new ItemStack(Material.TNT),Defines.MAGIC_CLAY,new ItemStack(Material.TNT),Defines.MAGIC_CLAY,new ItemStack(Material.DIAMOND_HOE),Defines.MAGIC_CLAY,new ItemStack(Material.TNT),new ItemStack(Material.FLINT_AND_STEEL),new ItemStack(Material.TNT)}; + public final static ItemStack[] SLOWNESS_CORE = { ClayTechItems.BLACK_ROCK_BLOCK, ClayTechItems.BLACK_ROCK_BLOCK, + ClayTechItems.BLACK_ROCK_BLOCK, ClayTechItems.BLACK_ROCK_BLOCK, ClayTechItems.MAGIC_CLAY, ClayTechItems.BLACK_ROCK_BLOCK, + ClayTechItems.BLACK_ROCK_BLOCK, ClayTechItems.BLACK_ROCK_BLOCK, ClayTechItems.BLACK_ROCK_BLOCK }; + public final static ItemStack[] ADVANCED_CONFUSION_CORE = { ClayTechItems.CONFUSION_CORE, ClayTechItems.CONFUSION_CORE, + ClayTechItems.CONFUSION_CORE, ClayTechItems.CONFUSION_CORE, ClayTechItems.MAGIC_CLAY, ClayTechItems.CONFUSION_CORE, + ClayTechItems.CONFUSION_CORE, ClayTechItems.CONFUSION_CORE, ClayTechItems.CONFUSION_CORE }; + public final static ItemStack[] ADVANCED_POISON_CORE = { ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE, + ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE, ClayTechItems.MAGIC_CLAY, ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE, + ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE }; + public final static ItemStack[] ADVANCED_SLOWNESS_CORE = { ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE, + ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE, ClayTechItems.MAGIC_CLAY, ClayTechItems.SLOWNESS_CORE, + ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE }; + public final static ItemStack[] ADVANCED_BLIND_CORE = { ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, + ClayTechItems.BLIND_CORE, ClayTechItems.MAGIC_CLAY, ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, ClayTechItems.BLIND_CORE, + ClayTechItems.BLIND_CORE }; + public final static ItemStack[] FOUR_BOW = { ClayTechItems.ADVANCED_SLOWNESS_CORE, ClayTechItems.ADVANCED_POISON_CORE, + ClayTechItems.ADVANCED_BLIND_CORE, ClayTechItems.ADVANCED_CONFUSION_CORE, new ItemStack(Material.BOW), + ClayTechItems.ADVANCED_CONFUSION_CORE, ClayTechItems.ADVANCED_BLIND_CORE, ClayTechItems.ADVANCED_POISON_CORE, + ClayTechItems.ADVANCED_SLOWNESS_CORE }; + public final static ItemStack[] POISON_SWORD = { ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE, + ClayTechItems.POISON_CORE, new ItemStack(Material.DIAMOND_SWORD), ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE, + ClayTechItems.POISON_CORE, ClayTechItems.POISON_CORE }; + public final static ItemStack[] ANTI_SLOWNESS_BOOTS = { ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE, + ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE, new ItemStack(Material.IRON_BOOTS), ClayTechItems.SLOWNESS_CORE, + ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE, ClayTechItems.SLOWNESS_CORE }; + public final static ItemStack[] TNT_EXPLOSION_CREATER = {new ItemStack(Material.TNT),ClayTechItems.MAGIC_CLAY,new ItemStack(Material.TNT),ClayTechItems.MAGIC_CLAY,new ItemStack(Material.DIAMOND_HOE),ClayTechItems.MAGIC_CLAY,new ItemStack(Material.TNT),new ItemStack(Material.FLINT_AND_STEEL),new ItemStack(Material.TNT)}; // 食物 public final static ItemStack[] CHICKEN_FOOT = { null, new ItemStack(Material.COAL), null, null, - Defines.RAW_CHICKEN_FOOT, null, null, new ItemStack(Material.COAL), null }; - public final static ItemStack[] SPICY_CHICKEN_BURGER = { Defines.RAW_BREAD, Defines.RAW_VEGETABLE, - Defines.RAW_BREAD, Defines.RAW_VEGETABLE, Defines.CHICKEN_FOOT, Defines.RAW_VEGETABLE, Defines.RAW_BREAD, - Defines.MAGIC_CLAY, Defines.RAW_BREAD }; - public final static ItemStack[] BABA_BURGER = { new ItemStack(Material.COAL), Defines.RAW_BREAD, + ClayTechItems.RAW_CHICKEN_FOOT, null, null, new ItemStack(Material.COAL), null }; + public final static ItemStack[] SPICY_CHICKEN_BURGER = { ClayTechItems.RAW_BREAD, ClayTechItems.RAW_VEGETABLE, + ClayTechItems.RAW_BREAD, ClayTechItems.RAW_VEGETABLE, ClayTechItems.CHICKEN_FOOT, ClayTechItems.RAW_VEGETABLE, ClayTechItems.RAW_BREAD, + ClayTechItems.MAGIC_CLAY, ClayTechItems.RAW_BREAD }; + public final static ItemStack[] BABA_BURGER = { new ItemStack(Material.COAL), ClayTechItems.RAW_BREAD, new ItemStack(Material.COAL), new ItemStack(Material.COAL), new ItemStack(Material.COAL), - new ItemStack(Material.COAL), new ItemStack(Material.COAL), Defines.RAW_BREAD, + new ItemStack(Material.COAL), new ItemStack(Material.COAL), ClayTechItems.RAW_BREAD, new ItemStack(Material.COAL) }; - public final static ItemStack[] CHOCOLATE = { Defines.COCOA_BEAN, Defines.COCOA_BEAN, Defines.COCOA_BEAN, - Defines.COCOA_BEAN, Defines.STARCH, Defines.COCOA_BEAN, Defines.COCOA_BEAN, Defines.COCOA_BEAN, - Defines.COCOA_BEAN }; - public final static ItemStack[] SNAIL_FOOD = { Defines.FLOUR, Defines.FLOUR, Defines.FLOUR, Defines.FLOUR, - Defines.SNAIL_HEALTHY, Defines.FLOUR, Defines.FLOUR, Defines.FLOUR, Defines.FLOUR }; - public final static ItemStack[] CLAY_COFFEE = { null, Defines.COCOA_BEAN, null, null, Defines.COCOA_BEAN, null, - null, Defines.DRINK_BOTTLE, null }; - public final static ItemStack[] LEMON_POWDER_DRINK = { null, Defines.LEMON_POWDER, null, null, Defines.LEMON_POWDER, - null, null, Defines.DRINK_BOTTLE, null }; - public final static ItemStack[] TEA_DRINK = { null, Defines.TEA_POWDER, null, null, Defines.TEA_POWDER, null, null, - Defines.DRINK_BOTTLE, null }; - public final static ItemStack[] LEMON_TEA_DRINK = { null, Defines.TEA_POWDER, null, Defines.LEMON_POWDER, - Defines.TEA_POWDER, Defines.LEMON_POWDER, null, Defines.DRINK_BOTTLE, null }; - public final static ItemStack[] TEA_POWDER = { null, null, null, null, Defines.RAW_TEA, null, null, null, null }; - public final static ItemStack[] LEMON_POWDER = { null, null, null, null, Defines.LEMON, null, null, null, null }; + public final static ItemStack[] CHOCOLATE = { ClayTechItems.COCOA_BEAN, ClayTechItems.COCOA_BEAN, ClayTechItems.COCOA_BEAN, + ClayTechItems.COCOA_BEAN, ClayTechItems.STARCH, ClayTechItems.COCOA_BEAN, ClayTechItems.COCOA_BEAN, ClayTechItems.COCOA_BEAN, + ClayTechItems.COCOA_BEAN }; + public final static ItemStack[] SNAIL_FOOD = { ClayTechItems.FLOUR, ClayTechItems.FLOUR, ClayTechItems.FLOUR, ClayTechItems.FLOUR, + ClayTechItems.SNAIL_HEALTHY, ClayTechItems.FLOUR, ClayTechItems.FLOUR, ClayTechItems.FLOUR, ClayTechItems.FLOUR }; + public final static ItemStack[] CLAY_COFFEE = { null, ClayTechItems.COCOA_BEAN, null, null, ClayTechItems.COCOA_BEAN, null, + null, ClayTechItems.DRINK_BOTTLE, null }; + public final static ItemStack[] LEMON_POWDER_DRINK = { null, ClayTechItems.LEMON_POWDER, null, null, ClayTechItems.LEMON_POWDER, + null, null, ClayTechItems.DRINK_BOTTLE, null }; + public final static ItemStack[] TEA_DRINK = { null, ClayTechItems.TEA_POWDER, null, null, ClayTechItems.TEA_POWDER, null, null, + ClayTechItems.DRINK_BOTTLE, null }; + public final static ItemStack[] LEMON_TEA_DRINK = { null, ClayTechItems.TEA_POWDER, null, ClayTechItems.LEMON_POWDER, + ClayTechItems.TEA_POWDER, ClayTechItems.LEMON_POWDER, null, ClayTechItems.DRINK_BOTTLE, null }; + public final static ItemStack[] TEA_POWDER = { null, null, null, null, ClayTechItems.RAW_TEA, null, null, null, null }; + public final static ItemStack[] LEMON_POWDER = { null, null, null, null, ClayTechItems.LEMON, null, null, null, null }; + public final static ItemStack[] COOKED_SWEET_POTATO = {null,new ItemStack(Material.COAL),null,null,ClayTechItems.SWEET_POTATO,null,null,new ItemStack(Material.COAL),null}; + public static ItemStack[] HONEY_SWEET; static { if (ClayTech.is115) { @@ -107,7 +109,7 @@ Defines.SLOWNESS_CORE, Defines.SLOWNESS_CORE, new ItemStack(Material.IRON_BOOTS) null, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT }; static { - newMotor = Defines.ELECTRIC_MOTOR_8.clone(); + newMotor = ClayTechItems.ELECTRIC_MOTOR_8.clone(); newMotor.setAmount(1); } public final static ItemStack[] ELECTRIC_MOTOR_8 = { null, null, null, null, SlimefunItems.ELECTRIC_MOTOR, null, diff --git a/src/main/java/club/claycoffee/ClayTech/TRecipe.java b/src/main/java/club/claycoffee/ClayTech/TRecipe.java index 9f59fb1..55f252d 100644 --- a/src/main/java/club/claycoffee/ClayTech/TRecipe.java +++ b/src/main/java/club/claycoffee/ClayTech/TRecipe.java @@ -8,15 +8,15 @@ public class TRecipe { public static final RecipeType CLAY_CRAFTING_TABLE = new RecipeType( - new NamespacedKey(ClayTech.plugin,"CLAY_CRAFTIONG_TABLE"),new SlimefunItemStack("CLAY_CRAFTING_TABLE", Defines.CLAY_CRAFTING_TABLE), "", + new NamespacedKey(ClayTech.plugin,"CLAY_CRAFTIONG_TABLE"),new SlimefunItemStack("CLAY_CRAFTING_TABLE", ClayTechItems.CLAY_CRAFTING_TABLE), "", Lang.readMachineRecipesText("CLAY_FUSION_MACHINE")); public static final RecipeType CLAY_FOOD_CAULDRON = new RecipeType( - new NamespacedKey(ClayTech.plugin,"CLAY_FOOD_CAULDRON"),new SlimefunItemStack("CLAY_FOOD_CAULDRON", Defines.CLAY_FOOD_CAULDRON), "", + new NamespacedKey(ClayTech.plugin,"CLAY_FOOD_CAULDRON"),new SlimefunItemStack("CLAY_FOOD_CAULDRON", ClayTechItems.CLAY_FOOD_CAULDRON), "", Lang.readMachineRecipesText("CLAY_ELETRIC_CAULDRON")); public static final RecipeType CLAY_FOOD_CHALKING_MACHINE = new RecipeType( - new NamespacedKey(ClayTech.plugin,"CLAY_FOOD_CHALKING_MACHINE"),new SlimefunItemStack("CLAY_FOOD_CHALKING_MACHINE", Defines.CLAY_FOOD_CHALKING_MACHINE), "", + new NamespacedKey(ClayTech.plugin,"CLAY_FOOD_CHALKING_MACHINE"),new SlimefunItemStack("CLAY_FOOD_CHALKING_MACHINE", ClayTechItems.CLAY_FOOD_CHALKING_MACHINE), "", Lang.readMachineRecipesText("CLAY_FOOD_CHALKING_MACHINE")); public static final RecipeType CLAY_ELEMENT_EXTRACTER = new RecipeType( - new NamespacedKey(ClayTech.plugin,"CLAY_ELEMENT_EXTRACTER"),new SlimefunItemStack("CLAY_ELEMENT_EXTRACTER", Defines.CLAY_ELEMENT_EXTRACTER), "", + new NamespacedKey(ClayTech.plugin,"CLAY_ELEMENT_EXTRACTER"),new SlimefunItemStack("CLAY_ELEMENT_EXTRACTER", ClayTechItems.CLAY_ELEMENT_EXTRACTER), "", Lang.readMachineRecipesText("CLAY_ELEMENT_EXTRACTER")); } diff --git a/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java b/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java index 554548e..5dcefd4 100644 --- a/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java +++ b/src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java @@ -4,7 +4,7 @@ import org.bukkit.inventory.ItemStack; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.utils.ClayItem; import club.claycoffee.ClayTech.utils.Utils; @@ -18,9 +18,9 @@ public class ClayTechManager { * @return the ItemStack is ClayTech item or not. */ public static boolean isClayTechItem(ItemStack item) throws IllegalArgumentException, IllegalAccessException { - Field[] fields = Defines.class.getDeclaredFields(); + Field[] fields = ClayTechItems.class.getDeclaredFields(); for (Field field : fields) { - ItemStack is = (ItemStack) field.get(new Defines()); + ItemStack is = (ItemStack) field.get(new ClayTechItems()); if (Utils.getDisplayName(is).equalsIgnoreCase(Utils.getDisplayName(item)) && Utils.getLoreList(is).equals(Utils.getLoreList(item)) && is.getType() == item.getType()) { return true; diff --git a/src/main/java/club/claycoffee/ClayTech/items/Armors.java b/src/main/java/club/claycoffee/ClayTech/items/Armors.java index 1048e9e..c125631 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Armors.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Armors.java @@ -3,7 +3,7 @@ import org.bukkit.NamespacedKey; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -14,12 +14,12 @@ public class Armors { public Armors() { - Slimefunutils.registerItem(Defines.C_ARMORS, "ANTI_SLOWNESS_BOOTS", Defines.ANTI_SLOWNESS_BOOTS, "notresearch", + Slimefunutils.registerItem(ClayTechItems.C_ARMORS, "ANTI_SLOWNESS_BOOTS", ClayTechItems.ANTI_SLOWNESS_BOOTS, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.ANTI_SLOWNESS_BOOTS, false); Research basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ARMORS"), 9908, Lang.readResearchesText("CLAYTECH_ARMORS_I"), 50); - basic.addItems(SlimefunItem.getByItem(Defines.ANTI_SLOWNESS_BOOTS)); + basic.addItems(SlimefunItem.getByItem(ClayTechItems.ANTI_SLOWNESS_BOOTS)); basic.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/Clay_basic.java b/src/main/java/club/claycoffee/ClayTech/items/Clay_basic.java index b645b6e..301655d 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Clay_basic.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Clay_basic.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Slimefunutils; import me.mrCookieSlime.Slimefun.Lists.RecipeType; @@ -23,27 +23,27 @@ public Clay_basic() { new ItemStack(Material.STICK), new ItemStack(Material.DIRT), endingot2, new ItemStack(Material.IRON_INGOT), endingot2 }; - Slimefunutils.registerItem(Defines.C_BASICS, "MAGIC_CLAY", Defines.MAGIC_CLAY, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_BASICS, "MAGIC_CLAY", ClayTechItems.MAGIC_CLAY, "notresearch", 10, RecipeType.MAGIC_WORKBENCH, recipea, false); - Slimefunutils.registerItem(Defines.C_BASICS, "CLAY_STICK", Defines.CLAY_STICK, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_BASICS, "CLAY_STICK", ClayTechItems.CLAY_STICK, "notresearch", 10, RecipeType.MAGIC_WORKBENCH, recipeb, false); Research basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_BASIC"), 9900, Lang.readResearchesText("CLAYTECH_START"), 20); - basic.addItems(SlimefunItem.getByItem(Defines.MAGIC_CLAY), SlimefunItem.getByItem(Defines.CLAY_STICK)); + basic.addItems(SlimefunItem.getByItem(ClayTechItems.MAGIC_CLAY), SlimefunItem.getByItem(ClayTechItems.CLAY_STICK)); basic.register(); Research basic2 = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ELECBASIC"), 9915, Lang.readResearchesText("CLAYTECH_ELECTRICMACHINE"), 65); - basic2.addItems(SlimefunItem.getByItem(Defines.CLAY_CRAFTING_TABLE), - SlimefunItem.getByItem(Defines.CLAY_ELECTRIC_STONE_CRUSHER), - SlimefunItem.getByItem(Defines.CLAY_FOOD_CAULDRON), - SlimefunItem.getByItem(Defines.CLAY_FOOD_CHALKING_MACHINE)); + basic2.addItems(SlimefunItem.getByItem(ClayTechItems.CLAY_CRAFTING_TABLE), + SlimefunItem.getByItem(ClayTechItems.CLAY_ELECTRIC_STONE_CRUSHER), + SlimefunItem.getByItem(ClayTechItems.CLAY_FOOD_CAULDRON), + SlimefunItem.getByItem(ClayTechItems.CLAY_FOOD_CHALKING_MACHINE)); basic2.register(); Research basic3 = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ELEMACHINE"), 9918, Lang.readResearchesText("CLAYTECH_ELEMENT_EXTRACTER_MACHINE"), 65); - basic3.addItems(SlimefunItem.getByItem(Defines.CLAY_ELEMENT_EXTRACTER)); + basic3.addItems(SlimefunItem.getByItem(ClayTechItems.CLAY_ELEMENT_EXTRACTER)); basic3.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java b/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java index 0c9d3eb..9e38405 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java +++ b/src/main/java/club/claycoffee/ClayTech/items/CraftingTable.java @@ -10,7 +10,7 @@ import org.bukkit.scheduler.BukkitRunnable; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.Machines.ACraftingTable; import club.claycoffee.ClayTech.api.listeners.PlayerCraftItemEvent; @@ -67,27 +67,27 @@ public int getCapacity() { @Override public void registerDefaultRecipes() { - this.registerRecipe(20, Recipes.BLIND_CORE, new ItemStack[] { Defines.BLIND_CORE }); - this.registerRecipe(100, Recipes.BLIND_SWORD, new ItemStack[] { Defines.BLIND_SWORD }); - this.registerRecipe(20, Recipes.POISON_EYE, new ItemStack[] { Defines.POISON_EYE }); - this.registerRecipe(20, Recipes.POISON_CORE, new ItemStack[] { Defines.POISON_CORE }); - this.registerRecipe(40, Recipes.ADVANCED_CONFUSION_CORE, new ItemStack[] { Defines.ADVANCED_POISON_CORE }); - this.registerRecipe(20, Recipes.CONFUSION_CORE, new ItemStack[] { Defines.CONFUSION_CORE }); - this.registerRecipe(40, Recipes.ADVANCED_CONFUSION_CORE, new ItemStack[] { Defines.ADVANCED_CONFUSION_CORE }); - this.registerRecipe(20, Recipes.BLACK_ROCK_BLOCK, new ItemStack[] { Defines.BLACK_ROCK_BLOCK }); - this.registerRecipe(20, Recipes.SLOWNESS_CORE, new ItemStack[] { Defines.SLOWNESS_CORE }); - this.registerRecipe(40, Recipes.ADVANCED_SLOWNESS_CORE, new ItemStack[] { Defines.ADVANCED_SLOWNESS_CORE }); - this.registerRecipe(40, Recipes.ADVANCED_BLIND_CORE, new ItemStack[] { Defines.ADVANCED_BLIND_CORE }); - this.registerRecipe(400, Recipes.FOUR_BOW, new ItemStack[] { Defines.FOUR_BOW }); - this.registerRecipe(100, Recipes.POISON_SWORD, new ItemStack[] { Defines.POISON_SWORD }); - this.registerRecipe(100, Recipes.ANTI_SLOWNESS_BOOTS, new ItemStack[] { Defines.ANTI_SLOWNESS_BOOTS }); - this.registerRecipe(80, Recipes.BLISTERING_CORE, new ItemStack[] { Defines.BLISTERING_CORE }); - this.registerRecipe(30, Recipes.ELEMENT_UNIT, new ItemStack[] { Defines.ELEMENT_UNIT }); - this.registerRecipe(8, Recipes.HIGHSPEED_RAILWAY, new ItemStack[] { Defines.HIGHSPEED_RAILWAY }); - ItemStack elem8 = Defines.ELECTRIC_MOTOR_8; + this.registerRecipe(20, Recipes.BLIND_CORE, new ItemStack[] { ClayTechItems.BLIND_CORE }); + this.registerRecipe(100, Recipes.BLIND_SWORD, new ItemStack[] { ClayTechItems.BLIND_SWORD }); + this.registerRecipe(20, Recipes.POISON_EYE, new ItemStack[] { ClayTechItems.POISON_EYE }); + this.registerRecipe(20, Recipes.POISON_CORE, new ItemStack[] { ClayTechItems.POISON_CORE }); + this.registerRecipe(40, Recipes.ADVANCED_CONFUSION_CORE, new ItemStack[] { ClayTechItems.ADVANCED_POISON_CORE }); + this.registerRecipe(20, Recipes.CONFUSION_CORE, new ItemStack[] { ClayTechItems.CONFUSION_CORE }); + this.registerRecipe(40, Recipes.ADVANCED_CONFUSION_CORE, new ItemStack[] { ClayTechItems.ADVANCED_CONFUSION_CORE }); + this.registerRecipe(20, Recipes.BLACK_ROCK_BLOCK, new ItemStack[] { ClayTechItems.BLACK_ROCK_BLOCK }); + this.registerRecipe(20, Recipes.SLOWNESS_CORE, new ItemStack[] { ClayTechItems.SLOWNESS_CORE }); + this.registerRecipe(40, Recipes.ADVANCED_SLOWNESS_CORE, new ItemStack[] { ClayTechItems.ADVANCED_SLOWNESS_CORE }); + this.registerRecipe(40, Recipes.ADVANCED_BLIND_CORE, new ItemStack[] { ClayTechItems.ADVANCED_BLIND_CORE }); + this.registerRecipe(400, Recipes.FOUR_BOW, new ItemStack[] { ClayTechItems.FOUR_BOW }); + this.registerRecipe(100, Recipes.POISON_SWORD, new ItemStack[] { ClayTechItems.POISON_SWORD }); + this.registerRecipe(100, Recipes.ANTI_SLOWNESS_BOOTS, new ItemStack[] { ClayTechItems.ANTI_SLOWNESS_BOOTS }); + this.registerRecipe(80, Recipes.BLISTERING_CORE, new ItemStack[] { ClayTechItems.BLISTERING_CORE }); + this.registerRecipe(30, Recipes.ELEMENT_UNIT, new ItemStack[] { ClayTechItems.ELEMENT_UNIT }); + this.registerRecipe(8, Recipes.HIGHSPEED_RAILWAY, new ItemStack[] { ClayTechItems.HIGHSPEED_RAILWAY }); + ItemStack elem8 = ClayTechItems.ELECTRIC_MOTOR_8; elem8.setAmount(8); this.registerRecipe(8, Recipes.ELECTRIC_MOTOR_8, new ItemStack[] { elem8 }); - this.registerRecipe(50, Recipes.TNT_EXPLOSION_CREATER, new ItemStack[] { Defines.TNT_EXPLOSION_CREATER }); + this.registerRecipe(50, Recipes.TNT_EXPLOSION_CREATER, new ItemStack[] { ClayTechItems.TNT_EXPLOSION_CREATER }); } @Override diff --git a/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java b/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java index f97ce63..afb0402 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java +++ b/src/main/java/club/claycoffee/ClayTech/items/DrinkMakingStaff.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -18,40 +18,40 @@ public class DrinkMakingStaff { public DrinkMakingStaff() { ItemStack[] recipea = { new ItemStack(Material.COCOA_BEANS), new ItemStack(Material.COCOA_BEANS), - new ItemStack(Material.COCOA_BEANS), new ItemStack(Material.COCOA_BEANS), Defines.CLAY_STICK, + new ItemStack(Material.COCOA_BEANS), new ItemStack(Material.COCOA_BEANS), ClayTechItems.CLAY_STICK, new ItemStack(Material.COCOA_BEANS), new ItemStack(Material.COCOA_BEANS), new ItemStack(Material.COCOA_BEANS), new ItemStack(Material.COCOA_BEANS) }; ItemStack[] recipeb = { null, null, null, null, SlimefunItems.BUCKET_OF_OIL, null, null, null, null }; - ItemStack[] recipec = { Defines.PLASTIC, Defines.PLASTIC, Defines.PLASTIC, Defines.PLASTIC, Defines.MAGIC_CLAY, - Defines.PLASTIC, Defines.PLASTIC, Defines.PLASTIC, Defines.PLASTIC }; + ItemStack[] recipec = { ClayTechItems.PLASTIC, ClayTechItems.PLASTIC, ClayTechItems.PLASTIC, ClayTechItems.PLASTIC, ClayTechItems.MAGIC_CLAY, + ClayTechItems.PLASTIC, ClayTechItems.PLASTIC, ClayTechItems.PLASTIC, ClayTechItems.PLASTIC }; - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "COCOA_BEAN", Defines.COCOA_BEAN, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "COCOA_BEAN", ClayTechItems.COCOA_BEAN, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipea, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "PLASTIC", Defines.PLASTIC, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "PLASTIC", ClayTechItems.PLASTIC, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipeb, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "DRINK_BOTTLE", Defines.DRINK_BOTTLE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "DRINK_BOTTLE", ClayTechItems.DRINK_BOTTLE, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipec, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "DIRTY_DRINK_BOTTLE", Defines.DIRTY_DRINK_BOTTLE, - "notresearch", 10, RecipeType.NULL, Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "DIRTY_TEA", Defines.DIRTY_TEA, "notresearch", 10, - RecipeType.NULL, Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "RAW_TEA", Defines.RAW_TEA, "notresearch", 10, - RecipeType.NULL, Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "TEA_POWDER", Defines.TEA_POWDER, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "DIRTY_DRINK_BOTTLE", ClayTechItems.DIRTY_DRINK_BOTTLE, + "notresearch", 10, RecipeType.NULL, ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "DIRTY_TEA", ClayTechItems.DIRTY_TEA, "notresearch", 10, + RecipeType.NULL, ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_TEA", ClayTechItems.RAW_TEA, "notresearch", 10, + RecipeType.NULL, ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "TEA_POWDER", ClayTechItems.TEA_POWDER, "notresearch", 10, TRecipe.CLAY_FOOD_CHALKING_MACHINE, Recipes.TEA_POWDER, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "LEMON_POWDER", Defines.LEMON_POWDER, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "LEMON_POWDER", ClayTechItems.LEMON_POWDER, "notresearch", 10, TRecipe.CLAY_FOOD_CHALKING_MACHINE, Recipes.LEMON_POWDER, false); Research foodmaterialsI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_DRINKMATERIALSBASIC"), 9908, Lang.readResearchesText("CLAYTECH_DRINK_MAKINGS_I"), 50); - foodmaterialsI.addItems(SlimefunItem.getByItem(Defines.COCOA_BEAN), SlimefunItem.getByItem(Defines.PLASTIC), - SlimefunItem.getByItem(Defines.DRINK_BOTTLE), SlimefunItem.getByItem(Defines.DIRTY_DRINK_BOTTLE)); + foodmaterialsI.addItems(SlimefunItem.getByItem(ClayTechItems.COCOA_BEAN), SlimefunItem.getByItem(ClayTechItems.PLASTIC), + SlimefunItem.getByItem(ClayTechItems.DRINK_BOTTLE), SlimefunItem.getByItem(ClayTechItems.DIRTY_DRINK_BOTTLE)); foodmaterialsI.register(); Research foodmaterialsII = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_DRINKMATERIALSII"), 9911, Lang.readResearchesText("CLAYTECH_DRINK_MAKINGS_II"), 50); - foodmaterialsII.addItems(SlimefunItem.getByItem(Defines.DIRTY_TEA), SlimefunItem.getByItem(Defines.RAW_TEA), - SlimefunItem.getByItem(Defines.LEMON_POWDER), SlimefunItem.getByItem(Defines.TEA_POWDER)); + foodmaterialsII.addItems(SlimefunItem.getByItem(ClayTechItems.DIRTY_TEA), SlimefunItem.getByItem(ClayTechItems.RAW_TEA), + SlimefunItem.getByItem(ClayTechItems.LEMON_POWDER), SlimefunItem.getByItem(ClayTechItems.TEA_POWDER)); foodmaterialsII.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/Drinks.java b/src/main/java/club/claycoffee/ClayTech/items/Drinks.java index 4dfce48..4149c18 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Drinks.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Drinks.java @@ -4,7 +4,7 @@ import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Slimefunutils; @@ -13,28 +13,28 @@ public class Drinks { public Drinks() { - ItemStack[] recipea = { null, Defines.COCOA_BEAN, null, null, Defines.COCOA_BEAN, null, null, - Defines.DRINK_BOTTLE, null }; - ItemStack[] recipeb = { null, Defines.LEMON_POWDER, null, null, Defines.LEMON_POWDER, null, null, - Defines.DRINK_BOTTLE, null }; - ItemStack[] recipec = { null, Defines.TEA_POWDER, null, null, Defines.TEA_POWDER, null, null, - Defines.DRINK_BOTTLE, null }; - ItemStack[] reciped = { null, Defines.TEA_POWDER, null, Defines.LEMON_POWDER, Defines.TEA_POWDER, - Defines.LEMON_POWDER, null, Defines.DRINK_BOTTLE, null }; + ItemStack[] recipea = { null, ClayTechItems.COCOA_BEAN, null, null, ClayTechItems.COCOA_BEAN, null, null, + ClayTechItems.DRINK_BOTTLE, null }; + ItemStack[] recipeb = { null, ClayTechItems.LEMON_POWDER, null, null, ClayTechItems.LEMON_POWDER, null, null, + ClayTechItems.DRINK_BOTTLE, null }; + ItemStack[] recipec = { null, ClayTechItems.TEA_POWDER, null, null, ClayTechItems.TEA_POWDER, null, null, + ClayTechItems.DRINK_BOTTLE, null }; + ItemStack[] reciped = { null, ClayTechItems.TEA_POWDER, null, ClayTechItems.LEMON_POWDER, ClayTechItems.TEA_POWDER, + ClayTechItems.LEMON_POWDER, null, ClayTechItems.DRINK_BOTTLE, null }; - Slimefunutils.registerItem(Defines.C_DRINK, "CLAY_COFFEE", Defines.CLAY_COFFEE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DRINK, "CLAY_COFFEE", ClayTechItems.CLAY_COFFEE, "notresearch", 10, TRecipe.CLAY_FOOD_CAULDRON, recipea, false); - Slimefunutils.registerItem(Defines.C_DRINK, "LEMON_POWDER_DRINK", Defines.LEMON_POWDER_DRINK, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DRINK, "LEMON_POWDER_DRINK", ClayTechItems.LEMON_POWDER_DRINK, "notresearch", 10, TRecipe.CLAY_FOOD_CAULDRON, recipeb, false); - Slimefunutils.registerItem(Defines.C_DRINK, "TEA_DRINK", Defines.TEA_DRINK, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DRINK, "TEA_DRINK", ClayTechItems.TEA_DRINK, "notresearch", 10, TRecipe.CLAY_FOOD_CAULDRON, recipec, false); - Slimefunutils.registerItem(Defines.C_DRINK, "LEMON_TEA_DRINK", Defines.LEMON_TEA_DRINK, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DRINK, "LEMON_TEA_DRINK", ClayTechItems.LEMON_TEA_DRINK, "notresearch", 10, TRecipe.CLAY_FOOD_CAULDRON, reciped, false); Research foodI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_DRINKBASIC"), 9909, Lang.readResearchesText("CLAYTECH_DRINK_I"), 50); - foodI.addItems(SlimefunItem.getByItem(Defines.CLAY_COFFEE), SlimefunItem.getByItem(Defines.LEMON_POWDER_DRINK), - SlimefunItem.getByItem(Defines.TEA_DRINK), SlimefunItem.getByItem(Defines.LEMON_TEA_DRINK)); + foodI.addItems(SlimefunItem.getByItem(ClayTechItems.CLAY_COFFEE), SlimefunItem.getByItem(ClayTechItems.LEMON_POWDER_DRINK), + SlimefunItem.getByItem(ClayTechItems.TEA_DRINK), SlimefunItem.getByItem(ClayTechItems.LEMON_TEA_DRINK)); foodI.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java b/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java index b7584fb..07c482c 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java +++ b/src/main/java/club/claycoffee/ClayTech/items/EffectItems.java @@ -3,7 +3,7 @@ import org.bukkit.NamespacedKey; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -13,13 +13,13 @@ public class EffectItems { public EffectItems() { - Slimefunutils.registerItem(Defines.C_WEAPONS, "TNT_EXPLOSION_CREATER", Defines.TNT_EXPLOSION_CREATER, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_WEAPONS, "TNT_EXPLOSION_CREATER", ClayTechItems.TNT_EXPLOSION_CREATER, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.TNT_EXPLOSION_CREATER, false); - Research rs = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_AFT_1"), 9900, + Research rs = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_AFT_1"), 9921, Lang.readResearchesText("CLAYTECH_EFFECT_ITEM_I"), 30); - rs.addItems(SlimefunItem.getByItem(Defines.TNT_EXPLOSION_CREATER)); + rs.addItems(SlimefunItem.getByItem(ClayTechItems.TNT_EXPLOSION_CREATER)); rs.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/ElementExtracter.java b/src/main/java/club/claycoffee/ClayTech/items/ElementExtracter.java index 54d08e5..d1f3ad5 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/ElementExtracter.java +++ b/src/main/java/club/claycoffee/ClayTech/items/ElementExtracter.java @@ -1,7 +1,7 @@ package club.claycoffee.ClayTech.items; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Machines.AExtracter; import club.claycoffee.ClayTech.api.listeners.MachineTickEvent; import club.claycoffee.ClayTech.api.listeners.PlayerExtractElementEvent; @@ -62,11 +62,11 @@ public String getMachineIdentifier() { public void registerDefaultRecipes() { registerRecipe(10, new ItemStack[] { new ItemStack(Material.DIRT, 3) }, - new ItemStack[] { Defines.ELEMENT_OXYGEN }); + new ItemStack[] { ClayTechItems.ELEMENT_OXYGEN }); registerRecipe(10, new ItemStack[] { new ItemStack(Material.COAL, 8) }, - new ItemStack[] { Defines.ELEMENT_CARBON }); + new ItemStack[] { ClayTechItems.ELEMENT_CARBON }); registerRecipe(10, new ItemStack[] { new ItemStack(Material.SAND, 10) }, - new ItemStack[] { Defines.ELEMENT_SILICON }); + new ItemStack[] { ClayTechItems.ELEMENT_SILICON }); } protected void tick(Block b) { @@ -134,7 +134,7 @@ public void run() { return; ChargableBlock.addCharge(b, -getEnergyConsumption()); } - if (!SlimefunManager.isItemSimilar(inv.getItemInSlot(40), Defines.ELEMENT_UNIT, true)) + if (!SlimefunManager.isItemSimilar(inv.getItemInSlot(40), ClayTechItems.ELEMENT_UNIT, true)) return; for (Map.Entry entry : found.entrySet()) { if (entry.getValue() > 0) { diff --git a/src/main/java/club/claycoffee/ClayTech/items/Elements.java b/src/main/java/club/claycoffee/ClayTech/items/Elements.java index a89345a..c4a7e58 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Elements.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Elements.java @@ -1,7 +1,7 @@ package club.claycoffee.ClayTech.items; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -14,21 +14,21 @@ public class Elements { public Elements() { - Slimefunutils.registerItem(Defines.C_ELEMENTS, "ELEMENT_UNIT", Defines.ELEMENT_UNIT, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_UNIT", ClayTechItems.ELEMENT_UNIT, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.ELEMENT_UNIT, false); - Slimefunutils.registerItem(Defines.C_ELEMENTS, "ELEMENT_OXYGEN", Defines.ELEMENT_OXYGEN, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_OXYGEN", ClayTechItems.ELEMENT_OXYGEN, "notresearch", 10, TRecipe.CLAY_ELEMENT_EXTRACTER, Recipes.ELEMENT_OXYGEN, false); - Slimefunutils.registerItem(Defines.C_ELEMENTS, "ELEMENT_CARBON", Defines.ELEMENT_CARBON, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_CARBON", ClayTechItems.ELEMENT_CARBON, "notresearch", 10, TRecipe.CLAY_ELEMENT_EXTRACTER, Recipes.ELEMENT_CARBON, false); - Slimefunutils.registerItem(Defines.C_ELEMENTS, "ELEMENT_SILICON", Defines.ELEMENT_SILICON, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_ELEMENTS, "ELEMENT_SILICON", ClayTechItems.ELEMENT_SILICON, "notresearch", 10, TRecipe.CLAY_ELEMENT_EXTRACTER, Recipes.ELEMENT_SILICON, false); Research before_element = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_BEFORE_ELEMENT"), 9919, Lang.readResearchesText("CLAYTECH_ELEMENTS_I"), 50); - before_element.addItems(SlimefunItem.getByItem(Defines.ELEMENT_UNIT), - SlimefunItem.getByItem(Defines.ELEMENT_OXYGEN), SlimefunItem.getByItem(Defines.ELEMENT_CARBON), - SlimefunItem.getByItem(Defines.ELEMENT_SILICON)); + before_element.addItems(SlimefunItem.getByItem(ClayTechItems.ELEMENT_UNIT), + SlimefunItem.getByItem(ClayTechItems.ELEMENT_OXYGEN), SlimefunItem.getByItem(ClayTechItems.ELEMENT_CARBON), + SlimefunItem.getByItem(ClayTechItems.ELEMENT_SILICON)); before_element.register(); } } \ No newline at end of file diff --git a/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java b/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java index 4eba256..1d7bc18 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java +++ b/src/main/java/club/claycoffee/ClayTech/items/FoodCauldron.java @@ -10,7 +10,7 @@ import org.bukkit.scheduler.BukkitRunnable; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.Machines.ACraftingTable; import club.claycoffee.ClayTech.api.listeners.PlayerCookItemEvent; @@ -63,17 +63,18 @@ public String getMachineIdentifier() { @Override public void registerDefaultRecipes() { - this.registerRecipe(30, Recipes.CHICKEN_FOOT, new ItemStack[] { Defines.CHICKEN_FOOT }); - this.registerRecipe(30, Recipes.SPICY_CHICKEN_BURGER, new ItemStack[] { Defines.SPICY_CHICKEN_BURGER }); - this.registerRecipe(30, Recipes.BABA_BURGER, new ItemStack[] { Defines.BABA_BURGER }); - this.registerRecipe(30, Recipes.CHOCOLATE, new ItemStack[] { Defines.CHOCOLATE }); - this.registerRecipe(30, Recipes.SNAIL_FOOD, new ItemStack[] { Defines.SNAIL_FOOD }); - this.registerRecipe(10, Recipes.HONEY_SWEET, new ItemStack[] { Defines.HONEY_SWEET }); - - this.registerRecipe(30, Recipes.CLAY_COFFEE, new ItemStack[] { Defines.CLAY_COFFEE }); - this.registerRecipe(30, Recipes.LEMON_POWDER_DRINK, new ItemStack[] { Defines.LEMON_POWDER_DRINK }); - this.registerRecipe(30, Recipes.TEA_DRINK, new ItemStack[] { Defines.TEA_DRINK }); - this.registerRecipe(30, Recipes.LEMON_TEA_DRINK, new ItemStack[] { Defines.LEMON_TEA_DRINK }); + this.registerRecipe(30, Recipes.CHICKEN_FOOT, new ItemStack[] { ClayTechItems.CHICKEN_FOOT }); + this.registerRecipe(30, Recipes.SPICY_CHICKEN_BURGER, new ItemStack[] { ClayTechItems.SPICY_CHICKEN_BURGER }); + this.registerRecipe(30, Recipes.BABA_BURGER, new ItemStack[] { ClayTechItems.BABA_BURGER }); + this.registerRecipe(30, Recipes.CHOCOLATE, new ItemStack[] { ClayTechItems.CHOCOLATE }); + this.registerRecipe(30, Recipes.SNAIL_FOOD, new ItemStack[] { ClayTechItems.SNAIL_FOOD }); + this.registerRecipe(10, Recipes.HONEY_SWEET, new ItemStack[] { ClayTechItems.HONEY_SWEET }); + this.registerRecipe(15, Recipes.COOKED_SWEET_POTATO, new ItemStack[] { ClayTechItems.COOKED_SWEET_POTATO }); + + this.registerRecipe(30, Recipes.CLAY_COFFEE, new ItemStack[] { ClayTechItems.CLAY_COFFEE }); + this.registerRecipe(30, Recipes.LEMON_POWDER_DRINK, new ItemStack[] { ClayTechItems.LEMON_POWDER_DRINK }); + this.registerRecipe(30, Recipes.TEA_DRINK, new ItemStack[] { ClayTechItems.TEA_DRINK }); + this.registerRecipe(30, Recipes.LEMON_TEA_DRINK, new ItemStack[] { ClayTechItems.LEMON_TEA_DRINK }); } @Override diff --git a/src/main/java/club/claycoffee/ClayTech/items/FoodChalkingMachine.java b/src/main/java/club/claycoffee/ClayTech/items/FoodChalkingMachine.java index 853231a..fa0fdd5 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/FoodChalkingMachine.java +++ b/src/main/java/club/claycoffee/ClayTech/items/FoodChalkingMachine.java @@ -3,7 +3,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Machines.ANewContainer; import club.claycoffee.ClayTech.utils.Lang; import me.mrCookieSlime.Slimefun.Lists.RecipeType; @@ -49,7 +49,7 @@ public String getMachineIdentifier() { @Override public void registerDefaultRecipes() { - this.registerRecipe(8, new ItemStack[] { Defines.RAW_TEA }, new ItemStack[] { Defines.TEA_POWDER }); - this.registerRecipe(8, new ItemStack[] { Defines.LEMON }, new ItemStack[] { Defines.LEMON_POWDER }); + this.registerRecipe(8, new ItemStack[] { ClayTechItems.RAW_TEA }, new ItemStack[] { ClayTechItems.TEA_POWDER }); + this.registerRecipe(8, new ItemStack[] { ClayTechItems.LEMON }, new ItemStack[] { ClayTechItems.LEMON_POWDER }); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/FoodMakingStaff.java b/src/main/java/club/claycoffee/ClayTech/items/FoodMakingStaff.java index 4ee8f65..4c017ba 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/FoodMakingStaff.java +++ b/src/main/java/club/claycoffee/ClayTech/items/FoodMakingStaff.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Slimefunutils; import me.mrCookieSlime.Slimefun.Lists.RecipeType; @@ -15,41 +15,43 @@ public class FoodMakingStaff { public FoodMakingStaff() { ItemStack[] recipea = { null, null, null, null, new ItemStack(Material.CHICKEN), null, null, null, null }; - ItemStack[] recipec = { null, new ItemStack(Material.BREAD), null, null, Defines.MAGIC_CLAY, null, null, + ItemStack[] recipec = { null, new ItemStack(Material.BREAD), null, null, ClayTechItems.MAGIC_CLAY, null, null, new ItemStack(Material.BREAD), null }; - ItemStack[] reciped = { null, new ItemStack(Material.KELP), null, null, Defines.MAGIC_CLAY, null, null, + ItemStack[] reciped = { null, new ItemStack(Material.KELP), null, null, ClayTechItems.MAGIC_CLAY, null, null, new ItemStack(Material.BAMBOO), null }; - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "RAW_CHICKEN_FOOT", Defines.RAW_CHICKEN_FOOT, "notresearch", + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_CHICKEN_FOOT", ClayTechItems.RAW_CHICKEN_FOOT, "notresearch", 10, RecipeType.ORE_CRUSHER, recipea, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "RAW_BREAD", Defines.RAW_BREAD, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_BREAD", ClayTechItems.RAW_BREAD, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipec, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "RAW_VEGETABLE", Defines.RAW_VEGETABLE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_VEGETABLE", ClayTechItems.RAW_VEGETABLE, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, reciped, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "LEMON", Defines.LEMON, "notresearch", 10, RecipeType.NULL, - Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "STARCH", Defines.STARCH, "notresearch", 10, - RecipeType.NULL, Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "FLOUR", Defines.FLOUR, "notresearch", 10, RecipeType.NULL, - Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOODMATERIALS, "SNAIL_HEALTHY", Defines.SNAIL_HEALTHY, "notresearch", 10, - RecipeType.NULL, Defines.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "LEMON", ClayTechItems.LEMON, "notresearch", 10, RecipeType.NULL, + ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "STARCH", ClayTechItems.STARCH, "notresearch", 10, + RecipeType.NULL, ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "FLOUR", ClayTechItems.FLOUR, "notresearch", 10, RecipeType.NULL, + ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "SNAIL_HEALTHY", ClayTechItems.SNAIL_HEALTHY, "notresearch", 10, + RecipeType.NULL, ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "SWEET_POTATO", ClayTechItems.SWEET_POTATO, "notresearch", 10, + RecipeType.NULL, ClayTechItems.NORECIPE, false); Research foodmaterialsI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODMATERIALSBASIC"), 9910, Lang.readResearchesText("CLAYTECH_FOOD_MAKINGS_I"), 50); - foodmaterialsI.addItems(SlimefunItem.getByItem(Defines.RAW_CHICKEN_FOOT), - SlimefunItem.getByItem(Defines.RAW_BREAD), SlimefunItem.getByItem(Defines.RAW_VEGETABLE)); + foodmaterialsI.addItems(SlimefunItem.getByItem(ClayTechItems.RAW_CHICKEN_FOOT), + SlimefunItem.getByItem(ClayTechItems.RAW_BREAD), SlimefunItem.getByItem(ClayTechItems.RAW_VEGETABLE)); foodmaterialsI.register(); Research foodmaterialsIE = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODMATERIALSBASIC"), 9913, Lang.readResearchesText("CLAYTECH_FOOD_MAKINGS_II"), 50); - foodmaterialsIE.addItems(SlimefunItem.getByItem(Defines.FLOUR), SlimefunItem.getByItem(Defines.STARCH), - SlimefunItem.getByItem(Defines.SNAIL_HEALTHY)); + foodmaterialsIE.addItems(SlimefunItem.getByItem(ClayTechItems.FLOUR), SlimefunItem.getByItem(ClayTechItems.STARCH), + SlimefunItem.getByItem(ClayTechItems.SNAIL_HEALTHY)); foodmaterialsIE.register(); Research foodmaterialsII = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FRUITBASIC"), 9912, Lang.readResearchesText("CLAYTECH_FRUIT_I"), 50); - foodmaterialsII.addItems(SlimefunItem.getByItem(Defines.LEMON)); + foodmaterialsII.addItems(SlimefunItem.getByItem(ClayTechItems.LEMON)); foodmaterialsII.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/Foods.java b/src/main/java/club/claycoffee/ClayTech/items/Foods.java index 6726c88..3f87397 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Foods.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Foods.java @@ -1,11 +1,9 @@ package club.claycoffee.ClayTech.items; -import org.bukkit.Material; import org.bukkit.NamespacedKey; -import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -16,46 +14,44 @@ public class Foods { public Foods() { - ItemStack[] recipeb = { null, new ItemStack(Material.COAL), null, null, Defines.RAW_CHICKEN_FOOT, null, null, - new ItemStack(Material.COAL), null }; - ItemStack[] recipec = { Defines.RAW_BREAD, Defines.RAW_VEGETABLE, Defines.RAW_BREAD, Defines.RAW_VEGETABLE, - Defines.CHICKEN_FOOT, Defines.RAW_VEGETABLE, Defines.RAW_BREAD, Defines.MAGIC_CLAY, Defines.RAW_BREAD }; - ItemStack[] reciped = { new ItemStack(Material.COAL), Defines.RAW_BREAD, new ItemStack(Material.COAL), - new ItemStack(Material.COAL), new ItemStack(Material.COAL), new ItemStack(Material.COAL), - new ItemStack(Material.COAL), Defines.RAW_BREAD, new ItemStack(Material.COAL) }; - ItemStack[] recipee = { Defines.COCOA_BEAN, Defines.COCOA_BEAN, Defines.COCOA_BEAN, Defines.COCOA_BEAN, - Defines.STARCH, Defines.COCOA_BEAN, Defines.COCOA_BEAN, Defines.COCOA_BEAN, Defines.COCOA_BEAN }; - ItemStack[] recipef = { Defines.FLOUR, Defines.FLOUR, Defines.FLOUR, Defines.FLOUR, Defines.SNAIL_HEALTHY, - Defines.FLOUR, Defines.FLOUR, Defines.FLOUR, Defines.FLOUR }; - - Slimefunutils.registerItem(Defines.C_FOOD, "CHICKEN_FOOT", Defines.CHICKEN_FOOT, "notresearch", 10, - TRecipe.CLAY_FOOD_CAULDRON, recipeb, false); - Slimefunutils.registerItem(Defines.C_FOOD, "SPICY_CHICKEN_BURGER", Defines.SPICY_CHICKEN_BURGER, "notresearch", - 10, TRecipe.CLAY_FOOD_CAULDRON, recipec, false); - Slimefunutils.registerItem(Defines.C_FOOD, "BABA_BURGER", Defines.BABA_BURGER, "notresearch", 10, - TRecipe.CLAY_FOOD_CAULDRON, reciped, false); - Slimefunutils.registerItem(Defines.C_FOOD, "CHOCOLATE", Defines.CHOCOLATE, "notresearch", 10, - TRecipe.CLAY_FOOD_CAULDRON, recipee, false); - Slimefunutils.registerItem(Defines.C_FOOD, "SNAIL_BAD", Defines.SNAIL_BAD, "notresearch", 10, RecipeType.NULL, - Defines.NORECIPE, false); - Slimefunutils.registerItem(Defines.C_FOOD, "SNAIL_FOOD", Defines.SNAIL_FOOD, "notresearch", 10, - TRecipe.CLAY_FOOD_CAULDRON, recipef, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "CHICKEN_FOOT", ClayTechItems.CHICKEN_FOOT, "notresearch", 10, + TRecipe.CLAY_FOOD_CAULDRON, Recipes.CHICKEN_FOOT, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "SPICY_CHICKEN_BURGER", ClayTechItems.SPICY_CHICKEN_BURGER, "notresearch", + 10, TRecipe.CLAY_FOOD_CAULDRON, Recipes.SPICY_CHICKEN_BURGER, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "BABA_BURGER", ClayTechItems.BABA_BURGER, "notresearch", 10, + TRecipe.CLAY_FOOD_CAULDRON, Recipes.BABA_BURGER, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "CHOCOLATE", ClayTechItems.CHOCOLATE, "notresearch", 10, + TRecipe.CLAY_FOOD_CAULDRON, Recipes.CHOCOLATE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "SNAIL_BAD", ClayTechItems.SNAIL_BAD, "notresearch", 10, RecipeType.NULL, + ClayTechItems.NORECIPE, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "SNAIL_FOOD", ClayTechItems.SNAIL_FOOD, "notresearch", 10, + TRecipe.CLAY_FOOD_CAULDRON, Recipes.SNAIL_FOOD, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "COOKED_SWEET_POTATO", ClayTechItems.COOKED_SWEET_POTATO, "notresearch", 10, + TRecipe.CLAY_FOOD_CAULDRON, Recipes.COOKED_SWEET_POTATO, false); + + + Research foodI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODBASIC"), 9911, + Lang.readResearchesText("CLAYTECH_FOOD_I"), 50); + foodI.addItems(SlimefunItem.getByItem(ClayTechItems.CHICKEN_FOOT), + SlimefunItem.getByItem(ClayTechItems.SPICY_CHICKEN_BURGER), SlimefunItem.getByItem(ClayTechItems.BABA_BURGER), + SlimefunItem.getByItem(ClayTechItems.CHOCOLATE), SlimefunItem.getByItem(ClayTechItems.SNAIL_BAD), + SlimefunItem.getByItem(ClayTechItems.SNAIL_FOOD)); + foodI.register(); + if (ClayTech.is115) { - Slimefunutils.registerItem(Defines.C_FOOD, "HONEY_SWEET", Defines.HONEY_SWEET, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "HONEY_SWEET", ClayTechItems.HONEY_SWEET, "notresearch", 10, TRecipe.CLAY_FOOD_CAULDRON, Recipes.HONEY_SWEET, false); Research foodII = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODBASIC2"), 9916, Lang.readResearchesText("CLAYTECH_FOOD_II"), 50); - foodII.addItems(SlimefunItem.getByItem(Defines.HONEY_SWEET)); + foodII.addItems(SlimefunItem.getByItem(ClayTechItems.HONEY_SWEET),SlimefunItem.getByItem(ClayTechItems.SWEET_POTATO),SlimefunItem.getByItem(ClayTechItems.COOKED_SWEET_POTATO)); + foodII.register(); + } + else { + Research foodII = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODBASIC2"), 9916, + Lang.readResearchesText("CLAYTECH_FOOD_II"), 50); + foodII.addItems(SlimefunItem.getByItem(ClayTechItems.SWEET_POTATO),SlimefunItem.getByItem(ClayTechItems.COOKED_SWEET_POTATO)); foodII.register(); } - - Research foodI = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_FOODBASIC"), 9911, - Lang.readResearchesText("CLAYTECH_FOOD_I"), 50); - foodI.addItems(SlimefunItem.getByItem(Defines.CHICKEN_FOOT), - SlimefunItem.getByItem(Defines.SPICY_CHICKEN_BURGER), SlimefunItem.getByItem(Defines.BABA_BURGER), - SlimefunItem.getByItem(Defines.CHOCOLATE), SlimefunItem.getByItem(Defines.SNAIL_BAD), - SlimefunItem.getByItem(Defines.SNAIL_FOOD)); - foodI.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/Golden_things.java b/src/main/java/club/claycoffee/ClayTech/items/Golden_things.java index 6c9d61e..71a21bf 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Golden_things.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Golden_things.java @@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.ClayTech; import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Slimefunutils; @@ -15,52 +15,52 @@ public class Golden_things { public Golden_things() { ItemStack[] recipec = { new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT), - new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT), Defines.MAGIC_CLAY, + new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT), ClayTechItems.MAGIC_CLAY, new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT), new ItemStack(Material.GOLD_INGOT) }; - ItemStack[] reciped = { Defines.ARTIFICIAL_GOLD_NUGGET, Defines.ARTIFICIAL_GOLD_NUGGET, - Defines.ARTIFICIAL_GOLD_NUGGET, Defines.ARTIFICIAL_GOLD_NUGGET, Defines.MAGIC_CLAY, - Defines.ARTIFICIAL_GOLD_NUGGET, Defines.ARTIFICIAL_GOLD_NUGGET, Defines.ARTIFICIAL_GOLD_NUGGET, - Defines.ARTIFICIAL_GOLD_NUGGET }; - ItemStack[] recipee = { null, Defines.MAGIC_CLAY, null, null, Defines.ARTIFICIAL_GOLD_INGOT_O, null, null, null, + ItemStack[] reciped = { ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.ARTIFICIAL_GOLD_NUGGET, + ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.MAGIC_CLAY, + ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.ARTIFICIAL_GOLD_NUGGET, + ClayTechItems.ARTIFICIAL_GOLD_NUGGET }; + ItemStack[] recipee = { null, ClayTechItems.MAGIC_CLAY, null, null, ClayTechItems.ARTIFICIAL_GOLD_INGOT_O, null, null, null, null }; - ItemStack[] recipef = { Defines.ARTIFICIAL_GOLD_INGOT, Defines.ARTIFICIAL_GOLD_INGOT, - Defines.ARTIFICIAL_GOLD_INGOT, Defines.ARTIFICIAL_GOLD_INGOT, Defines.ARTIFICIAL_GOLD_INGOT, - Defines.ARTIFICIAL_GOLD_INGOT, Defines.ARTIFICIAL_GOLD_INGOT, Defines.ARTIFICIAL_GOLD_INGOT, - Defines.ARTIFICIAL_GOLD_INGOT }; - ItemStack[] recipeg = { Defines.ARTIFICIAL_GOLD_BLOCK, Defines.ARTIFICIAL_GOLD_BLOCK, - Defines.ARTIFICIAL_GOLD_BLOCK, Defines.ARTIFICIAL_GOLD_BLOCK, new ItemStack(Material.GOLDEN_APPLE), - Defines.ARTIFICIAL_GOLD_BLOCK, Defines.ARTIFICIAL_GOLD_BLOCK, Defines.ARTIFICIAL_GOLD_BLOCK, - Defines.ARTIFICIAL_GOLD_BLOCK }; + ItemStack[] recipef = { ClayTechItems.ARTIFICIAL_GOLD_INGOT, ClayTechItems.ARTIFICIAL_GOLD_INGOT, + ClayTechItems.ARTIFICIAL_GOLD_INGOT, ClayTechItems.ARTIFICIAL_GOLD_INGOT, ClayTechItems.ARTIFICIAL_GOLD_INGOT, + ClayTechItems.ARTIFICIAL_GOLD_INGOT, ClayTechItems.ARTIFICIAL_GOLD_INGOT, ClayTechItems.ARTIFICIAL_GOLD_INGOT, + ClayTechItems.ARTIFICIAL_GOLD_INGOT }; + ItemStack[] recipeg = { ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ARTIFICIAL_GOLD_BLOCK, + ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ARTIFICIAL_GOLD_BLOCK, new ItemStack(Material.GOLDEN_APPLE), + ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ARTIFICIAL_GOLD_BLOCK, + ClayTechItems.ARTIFICIAL_GOLD_BLOCK }; - Slimefunutils.registerItem(Defines.C_MATERIALS, "ARTIFICIAL_GOLD_NUGGET", Defines.ARTIFICIAL_GOLD_NUGGET, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_NUGGET", ClayTechItems.ARTIFICIAL_GOLD_NUGGET, "notresearch", 10, RecipeType.COMPRESSOR, recipec, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ARTIFICIAL_GOLD_INGOT_O", Defines.ARTIFICIAL_GOLD_INGOT_O, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_INGOT_O", ClayTechItems.ARTIFICIAL_GOLD_INGOT_O, "notresearch", 10, RecipeType.COMPRESSOR, reciped, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ARTIFICIAL_GOLD_INGOT", Defines.ARTIFICIAL_GOLD_INGOT, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_INGOT", ClayTechItems.ARTIFICIAL_GOLD_INGOT, "notresearch", 10, RecipeType.COMPRESSOR, recipee, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ARTIFICIAL_GOLD_BLOCK", Defines.ARTIFICIAL_GOLD_BLOCK, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_BLOCK", ClayTechItems.ARTIFICIAL_GOLD_BLOCK, "notresearch", 10, RecipeType.COMPRESSOR, recipef, false); - Slimefunutils.registerItem(Defines.C_FOOD, "ARTIFICIAL_ENCHANTED_GOLDEN_APPLE", - Defines.ARTIFICIAL_ENCHANTED_GOLDEN_APPLE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, recipeg, false); + Slimefunutils.registerItem(ClayTechItems.C_FOOD, "ARTIFICIAL_ENCHANTED_GOLDEN_APPLE", + ClayTechItems.ARTIFICIAL_ENCHANTED_GOLDEN_APPLE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, recipeg, false); Research artificial_basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ARTIFICIAL_BASIC"), 9901, Lang.readResearchesText("CLAYTECH_ARTIFICIAL_I"), 45); - artificial_basic.addItems(SlimefunItem.getByItem(Defines.ARTIFICIAL_GOLD_NUGGET), - SlimefunItem.getByItem(Defines.ARTIFICIAL_GOLD_INGOT), - SlimefunItem.getByItem(Defines.ARTIFICIAL_GOLD_BLOCK)); + artificial_basic.addItems(SlimefunItem.getByItem(ClayTechItems.ARTIFICIAL_GOLD_NUGGET), + SlimefunItem.getByItem(ClayTechItems.ARTIFICIAL_GOLD_INGOT), + SlimefunItem.getByItem(ClayTechItems.ARTIFICIAL_GOLD_BLOCK)); artificial_basic.register(); Research artificial_basic_o = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ARTIFICIAL_BASIC_O"), 9902, Lang.readResearchesText("CLAYTECH_ARTIFICIAL_ORE_I"), 30); - artificial_basic_o.addItems(SlimefunItem.getByItem(Defines.ARTIFICIAL_GOLD_INGOT_O)); + artificial_basic_o.addItems(SlimefunItem.getByItem(ClayTechItems.ARTIFICIAL_GOLD_INGOT_O)); artificial_basic_o.register(); Research artificial_enchanted_golden_apple_r = new Research( new NamespacedKey(ClayTech.plugin, "CLAYTECH_ENCHANTED_GOLDEN_APPLE"), 9903, Lang.readResearchesText("CLAYTECH_ARTIFICIAL_ENCHANTED_GOLDEN_APPLE"), 100); - artificial_enchanted_golden_apple_r.addItems(SlimefunItem.getByItem(Defines.ARTIFICIAL_ENCHANTED_GOLDEN_APPLE)); + artificial_enchanted_golden_apple_r.addItems(SlimefunItem.getByItem(ClayTechItems.ARTIFICIAL_ENCHANTED_GOLDEN_APPLE)); artificial_enchanted_golden_apple_r.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java b/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java index 0511311..2973474 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java +++ b/src/main/java/club/claycoffee/ClayTech/items/MachineMakingBasic.java @@ -1,7 +1,7 @@ package club.claycoffee.ClayTech.items; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -13,13 +13,13 @@ public class MachineMakingBasic { public MachineMakingBasic() { - Slimefunutils.registerItem(Defines.C_MATERIALS, "BLISTERING_CORE", Defines.BLISTERING_CORE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "BLISTERING_CORE", ClayTechItems.BLISTERING_CORE, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.BLISTERING_CORE, false); Research before_element = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_BEFORE_ELEMENT"), 9917, Lang.readResearchesText("CLAYTECH_BEFORE_ELEMENTS"), 50); - before_element.addItems(new SlimefunItem[] { SlimefunItem.getByItem(Defines.BLISTERING_CORE) }); + before_element.addItems(new SlimefunItem[] { SlimefunItem.getByItem(ClayTechItems.BLISTERING_CORE) }); before_element.register(); } 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 b4e8907..53ddd07 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/PotionAffect_Weapons.java +++ b/src/main/java/club/claycoffee/ClayTech/items/PotionAffect_Weapons.java @@ -3,7 +3,7 @@ import org.bukkit.NamespacedKey; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -14,61 +14,61 @@ public class PotionAffect_Weapons { public PotionAffect_Weapons() { - Slimefunutils.registerItem(Defines.C_MATERIALS, "BLIND_CORE", Defines.BLIND_CORE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "BLIND_CORE", ClayTechItems.BLIND_CORE, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.BLIND_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ADVANCED_BLIND_CORE", Defines.ADVANCED_BLIND_CORE, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ADVANCED_BLIND_CORE", ClayTechItems.ADVANCED_BLIND_CORE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, Recipes.ADVANCED_BLIND_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "POISON_CORE", Defines.POISON_CORE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "POISON_CORE", ClayTechItems.POISON_CORE, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.POISON_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ADVANCED_POISON_CORE", Defines.ADVANCED_POISON_CORE, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ADVANCED_POISON_CORE", ClayTechItems.ADVANCED_POISON_CORE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, Recipes.ADVANCED_POISON_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "CONFUSION_CORE", Defines.CONFUSION_CORE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "CONFUSION_CORE", ClayTechItems.CONFUSION_CORE, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.CONFUSION_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ADVANCED_CONFUSION_CORE", Defines.ADVANCED_CONFUSION_CORE, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ADVANCED_CONFUSION_CORE", ClayTechItems.ADVANCED_CONFUSION_CORE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, Recipes.ADVANCED_CONFUSION_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "SLOWNESS_CORE", Defines.SLOWNESS_CORE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "SLOWNESS_CORE", ClayTechItems.SLOWNESS_CORE, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.SLOWNESS_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "ADVANCED_SLOWNESS_CORE", Defines.ADVANCED_SLOWNESS_CORE, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ADVANCED_SLOWNESS_CORE", ClayTechItems.ADVANCED_SLOWNESS_CORE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, Recipes.ADVANCED_SLOWNESS_CORE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "POISON_EYE", Defines.POISON_EYE, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "POISON_EYE", ClayTechItems.POISON_EYE, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.POISON_EYE, false); - Slimefunutils.registerItem(Defines.C_MATERIALS, "BLACK_ROCK_BLOCK", Defines.BLACK_ROCK_BLOCK, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "BLACK_ROCK_BLOCK", ClayTechItems.BLACK_ROCK_BLOCK, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.BLACK_ROCK_BLOCK, false); - Slimefunutils.registerItem(Defines.C_WEAPONS, "BLIND_SWORD", Defines.BLIND_SWORD, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_WEAPONS, "BLIND_SWORD", ClayTechItems.BLIND_SWORD, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.BLIND_SWORD, false); - Slimefunutils.registerItem(Defines.C_WEAPONS, "FOUR_BOW", Defines.FOUR_BOW, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_WEAPONS, "FOUR_BOW", ClayTechItems.FOUR_BOW, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.FOUR_BOW, false); - Slimefunutils.registerItem(Defines.C_WEAPONS, "POISON_SWORD", Defines.POISON_SWORD, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_WEAPONS, "POISON_SWORD", ClayTechItems.POISON_SWORD, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.POISON_SWORD, false); Research weapon_requires = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_EX_BASIC_WEAPONS"), 9904, Lang.readResearchesText("CLAYTECH_BEFORE_AFFECT_WEAPONS"), 50); - weapon_requires.addItems(SlimefunItem.getByItem(Defines.BLIND_CORE), - SlimefunItem.getByItem(Defines.CONFUSION_CORE), SlimefunItem.getByItem(Defines.SLOWNESS_CORE), - SlimefunItem.getByItem(Defines.POISON_CORE), SlimefunItem.getByItem(Defines.POISON_EYE), - SlimefunItem.getByItem(Defines.BLACK_ROCK_BLOCK)); + weapon_requires.addItems(SlimefunItem.getByItem(ClayTechItems.BLIND_CORE), + SlimefunItem.getByItem(ClayTechItems.CONFUSION_CORE), SlimefunItem.getByItem(ClayTechItems.SLOWNESS_CORE), + SlimefunItem.getByItem(ClayTechItems.POISON_CORE), SlimefunItem.getByItem(ClayTechItems.POISON_EYE), + SlimefunItem.getByItem(ClayTechItems.BLACK_ROCK_BLOCK)); weapon_requires.register(); Research weapons_basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_BASIC_WEAPONS"), 9905, Lang.readResearchesText("CLAYTECH_AFFECT_WEAPONS"), 50); - weapons_basic.addItems(SlimefunItem.getByItem(Defines.BLIND_SWORD), - SlimefunItem.getByItem(Defines.POISON_SWORD)); + weapons_basic.addItems(SlimefunItem.getByItem(ClayTechItems.BLIND_SWORD), + SlimefunItem.getByItem(ClayTechItems.POISON_SWORD)); weapons_basic.register(); Research advancedweapon_requires = new Research( new NamespacedKey(ClayTech.plugin, "CLAYTECH_EX_ADVANCED_WEAPONS"), 9906, Lang.readResearchesText("CLAYTECH_BEFORE_ADVANCED_AFFECT_WEAPONS"), 75); - advancedweapon_requires.addItems(SlimefunItem.getByItem(Defines.ADVANCED_BLIND_CORE), - SlimefunItem.getByItem(Defines.ADVANCED_CONFUSION_CORE), - SlimefunItem.getByItem(Defines.ADVANCED_SLOWNESS_CORE), - SlimefunItem.getByItem(Defines.ADVANCED_POISON_CORE)); + advancedweapon_requires.addItems(SlimefunItem.getByItem(ClayTechItems.ADVANCED_BLIND_CORE), + SlimefunItem.getByItem(ClayTechItems.ADVANCED_CONFUSION_CORE), + SlimefunItem.getByItem(ClayTechItems.ADVANCED_SLOWNESS_CORE), + SlimefunItem.getByItem(ClayTechItems.ADVANCED_POISON_CORE)); advancedweapon_requires.register(); Research advancedweapon = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_ADVANCED_WEAPONS"), 9906, Lang.readResearchesText("CLAYTECH_ADVANCED_AFFECT_WEAPONS"), 100); - advancedweapon.addItems(SlimefunItem.getByItem(Defines.FOUR_BOW)); + advancedweapon.addItems(SlimefunItem.getByItem(ClayTechItems.FOUR_BOW)); advancedweapon.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/Railways.java b/src/main/java/club/claycoffee/ClayTech/items/Railways.java index e3ecf7d..be285cb 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Railways.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Railways.java @@ -4,7 +4,7 @@ import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.Recipes; import club.claycoffee.ClayTech.TRecipe; import club.claycoffee.ClayTech.utils.Lang; @@ -15,18 +15,18 @@ public class Railways { public Railways() { - Slimefunutils.registerItem(Defines.C_OTHER, "CLAY_HIGHSPEED_RAILWAY", Defines.HIGHSPEED_RAILWAY, "notresearch", + Slimefunutils.registerItem(ClayTechItems.C_OTHER, "CLAY_HIGHSPEED_RAILWAY", ClayTechItems.HIGHSPEED_RAILWAY, "notresearch", 10, TRecipe.CLAY_CRAFTING_TABLE, Recipes.HIGHSPEED_RAILWAY, false); - ItemStack elem8 = Defines.ELECTRIC_MOTOR_8; + ItemStack elem8 = ClayTechItems.ELECTRIC_MOTOR_8; elem8.setAmount(8); SlimefunItemStack motor_8 = new SlimefunItemStack("ELECTRIC_MOTOR_8", elem8); - SlimefunItem motor_8_i = new SlimefunItem(Defines.C_OTHER, motor_8, TRecipe.CLAY_CRAFTING_TABLE, + SlimefunItem motor_8_i = new SlimefunItem(ClayTechItems.C_OTHER, motor_8, TRecipe.CLAY_CRAFTING_TABLE, Recipes.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); - railway_basic.addItems(SlimefunItem.getByItem(Defines.HIGHSPEED_RAILWAY), - SlimefunItem.getByItem(Defines.ELECTRIC_MOTOR_8)); + railway_basic.addItems(SlimefunItem.getByItem(ClayTechItems.HIGHSPEED_RAILWAY), + SlimefunItem.getByItem(ClayTechItems.ELECTRIC_MOTOR_8)); railway_basic.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/items/Skulls.java b/src/main/java/club/claycoffee/ClayTech/items/Skulls.java index 025c9d1..f92e271 100644 --- a/src/main/java/club/claycoffee/ClayTech/items/Skulls.java +++ b/src/main/java/club/claycoffee/ClayTech/items/Skulls.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.utils.Lang; import club.claycoffee.ClayTech.utils.Slimefunutils; import me.mrCookieSlime.Slimefun.Lists.RecipeType; @@ -16,48 +16,48 @@ public class Skulls { public Skulls() { // 合成方式 ItemStack[] ClayCoffeeHeadRecipe = { new ItemStack(Material.DIAMOND_BLOCK), new ItemStack(Material.GOLD_BLOCK), - new ItemStack(Material.DIAMOND_BLOCK), Defines.ARTIFICIAL_GOLD_INGOT, Defines.MAGIC_CLAY, - Defines.ARTIFICIAL_GOLD_INGOT, new ItemStack(Material.DIAMOND_BLOCK), + new ItemStack(Material.DIAMOND_BLOCK), ClayTechItems.ARTIFICIAL_GOLD_INGOT, ClayTechItems.MAGIC_CLAY, + ClayTechItems.ARTIFICIAL_GOLD_INGOT, new ItemStack(Material.DIAMOND_BLOCK), new ItemStack(Material.GOLD_BLOCK), new ItemStack(Material.DIAMOND_BLOCK) }; ItemStack[] OtherHeadRecipe = { new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.GOLD_BLOCK), - new ItemStack(Material.IRON_BLOCK), Defines.ARTIFICIAL_GOLD_NUGGET, Defines.MAGIC_CLAY, - Defines.ARTIFICIAL_GOLD_NUGGET, new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.GOLD_BLOCK), + new ItemStack(Material.IRON_BLOCK), ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.MAGIC_CLAY, + ClayTechItems.ARTIFICIAL_GOLD_NUGGET, new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.GOLD_BLOCK), new ItemStack(Material.IRON_BLOCK) }; ItemStack[] OtherHeadRecipe2 = { new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.GOLD_BLOCK), - new ItemStack(Material.IRON_BLOCK), Defines.ARTIFICIAL_GOLD_NUGGET, Defines.CLAY_STICK, - Defines.ARTIFICIAL_GOLD_NUGGET, new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.GOLD_BLOCK), + new ItemStack(Material.IRON_BLOCK), ClayTechItems.ARTIFICIAL_GOLD_NUGGET, ClayTechItems.CLAY_STICK, + ClayTechItems.ARTIFICIAL_GOLD_NUGGET, new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.GOLD_BLOCK), new ItemStack(Material.IRON_BLOCK) }; ItemStack[] ClockRecipe = { new ItemStack(Material.IRON_INGOT), new ItemStack(Material.IRON_INGOT), - new ItemStack(Material.IRON_INGOT), new ItemStack(Material.IRON_INGOT), Defines.MAGIC_CLAY, + new ItemStack(Material.IRON_INGOT), new ItemStack(Material.IRON_INGOT), ClayTechItems.MAGIC_CLAY, new ItemStack(Material.IRON_INGOT), new ItemStack(Material.IRON_INGOT), new ItemStack(Material.BLACK_DYE), new ItemStack(Material.IRON_INGOT) }; ItemStack[] LanternRecipe = { new ItemStack(Material.OAK_LOG), new ItemStack(Material.OAK_LOG), new ItemStack(Material.OAK_LOG), new ItemStack(Material.OAK_LOG), new ItemStack(Material.GLOWSTONE), - new ItemStack(Material.OAK_LOG), new ItemStack(Material.OAK_LOG), Defines.MAGIC_CLAY, + new ItemStack(Material.OAK_LOG), new ItemStack(Material.OAK_LOG), ClayTechItems.MAGIC_CLAY, new ItemStack(Material.OAK_LOG) }; // 注册物品 - Slimefunutils.registerItem(Defines.C_DECORATES, "CLAYCOFFEE_HEAD", Defines.CLAYCOFFEE_HEAD, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DECORATES, "CLAYCOFFEE_HEAD", ClayTechItems.CLAYCOFFEE_HEAD, "notresearch", 10, RecipeType.ANCIENT_ALTAR, ClayCoffeeHeadRecipe, false); - Slimefunutils.registerItem(Defines.C_DECORATES, "STALIN_HEAD", Defines.STALIN_HEAD, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DECORATES, "STALIN_HEAD", ClayTechItems.STALIN_HEAD, "notresearch", 10, RecipeType.ANCIENT_ALTAR, OtherHeadRecipe, false); - Slimefunutils.registerItem(Defines.C_DECORATES, "MARX_HEAD", Defines.MARX_HEAD, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DECORATES, "MARX_HEAD", ClayTechItems.MARX_HEAD, "notresearch", 10, RecipeType.ANCIENT_ALTAR, OtherHeadRecipe2, false); - Slimefunutils.registerItem(Defines.C_DECORATES, "CLOCK_C", Defines.CLOCK_C, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DECORATES, "CLOCK_C", ClayTechItems.CLOCK_C, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, ClockRecipe, false); - Slimefunutils.registerItem(Defines.C_DECORATES, "LANTERN_C", Defines.LANTERN_C, "notresearch", 10, + Slimefunutils.registerItem(ClayTechItems.C_DECORATES, "LANTERN_C", ClayTechItems.LANTERN_C, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, LanternRecipe, false); // 注册研究 Research skull_basic = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_SKULL_BASIC"), 9907, Lang.readResearchesText("CLAYTECH_SKULL_I"), 50); - skull_basic.addItems(SlimefunItem.getByItem(Defines.CLAYCOFFEE_HEAD), - SlimefunItem.getByItem(Defines.STALIN_HEAD), SlimefunItem.getByItem(Defines.MARX_HEAD)); + skull_basic.addItems(SlimefunItem.getByItem(ClayTechItems.CLAYCOFFEE_HEAD), + SlimefunItem.getByItem(ClayTechItems.STALIN_HEAD), SlimefunItem.getByItem(ClayTechItems.MARX_HEAD)); skull_basic.register(); Research skull_basic2 = new Research(new NamespacedKey(ClayTech.plugin, "CLAYTECH_SKULL_BASIC"), 9914, Lang.readResearchesText("CLAYTECH_DECORATES_I"), 50); - skull_basic2.addItems(SlimefunItem.getByItem(Defines.CLOCK_C), SlimefunItem.getByItem(Defines.LANTERN_C)); + skull_basic2.addItems(SlimefunItem.getByItem(ClayTechItems.CLOCK_C), SlimefunItem.getByItem(ClayTechItems.LANTERN_C)); skull_basic2.register(); } } diff --git a/src/main/java/club/claycoffee/ClayTech/listener/ClayTechListener.java b/src/main/java/club/claycoffee/ClayTech/listener/ClayTechListener.java index bb35cf1..d459bfc 100644 --- a/src/main/java/club/claycoffee/ClayTech/listener/ClayTechListener.java +++ b/src/main/java/club/claycoffee/ClayTech/listener/ClayTechListener.java @@ -36,7 +36,7 @@ import org.bukkit.event.entity.EntityExplodeEvent; import club.claycoffee.ClayTech.ClayTech; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.api.listeners.PlayerUseItemEvent; import club.claycoffee.ClayTech.utils.Affect; import club.claycoffee.ClayTech.utils.ClayItem; @@ -51,16 +51,18 @@ public class ClayTechListener implements Listener { public void BlockBreakEvent(BlockBreakEvent e) { if (!e.isCancelled()) { if (e.getPlayer().getGameMode() == GameMode.SURVIVAL) { - Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.OAK_LEAVES), Defines.LEMON, + Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.OAK_LEAVES), ClayTechItems.LEMON, new ItemStack(Material.SHEARS), 10, e); try { // 这里放其他事件 - Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.GRASS), Defines.DIRTY_TEA, + Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.GRASS), ClayTechItems.DIRTY_TEA, new ItemStack(Material.SHEARS), 10, e); - Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.WHEAT), Defines.FLOUR, + Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.WHEAT), ClayTechItems.FLOUR, new ItemStack(Material.SHEARS), 15, 20, e); - Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.POTATOES), Defines.STARCH, + Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.POTATOES), ClayTechItems.STARCH, new ItemStack(Material.SHEARS), 15, 20, e); + Food.CheckDestroy(e.getPlayer(), e.getBlock(), new ItemStack(Material.POTATOES), ClayTechItems.SWEET_POTATO, + new ItemStack(Material.SHEARS), 25, 30, e); } catch (NullPointerException err) { } } @@ -71,6 +73,10 @@ public void BlockBreakEvent(BlockBreakEvent e) { @EventHandler(priority = EventPriority.HIGHEST) public void PlayerInteractEvent(PlayerInteractEvent e) { if (e.getAction() == Action.RIGHT_CLICK_AIR) { + if(Utils.ExitsInList(Lang.readGeneralText("CantEat"), Utils.getLore(e.getItem()))) { + e.getPlayer().sendMessage(Lang.readGeneralText("CantEatMessage")); + return; + } if(e.getItem().getItemMeta().getDisplayName().equalsIgnoreCase(Lang.readItemText("TNT_EXPLOSION_CREATER"))) { Bukkit.getPluginManager().callEvent(new PlayerUseItemEvent(e.getPlayer(),e.getItem())); boolean pass = false; @@ -120,38 +126,39 @@ public void run() { } Player p = e.getPlayer(); if (e.hasItem()) { - Food.DrinkCheck(p, e.getItem(), Defines.CLAY_COFFEE, 5, + Food.DrinkCheck(p, e.getItem(), ClayTechItems.CLAY_COFFEE, 5, new PotionEffect[] { new PotionEffect(PotionEffectType.NIGHT_VISION, 3600, 1) }); try { // 这里放其他食物/饮料8!! - Food.DrinkCheck(p, e.getItem(), Defines.LEMON_POWDER_DRINK, 6, + Food.DrinkCheck(p, e.getItem(), ClayTechItems.LEMON_POWDER_DRINK, 6, new PotionEffect[] { new PotionEffect(PotionEffectType.CONFUSION, 200, 3) }); - Food.DrinkCheck(p, e.getItem(), Defines.TEA_DRINK, 6, + Food.DrinkCheck(p, e.getItem(), ClayTechItems.TEA_DRINK, 6, new PotionEffect[] { new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 600, 2) }); - Food.DrinkCheck(p, e.getItem(), Defines.LEMON_TEA_DRINK, 12, + Food.DrinkCheck(p, e.getItem(), ClayTechItems.LEMON_TEA_DRINK, 12, new PotionEffect[] { new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 1200, 2) }); - Food.FoodCheck(p, e.getItem(), Defines.CHICKEN_FOOT, 8); - Food.FoodCheck(p, e.getItem(), Defines.RAW_BREAD, 4); - Food.FoodCheck(p, e.getItem(), Defines.RAW_VEGETABLE, 1); - Food.FoodCheck(p, e.getItem(), Defines.LEMON, 1, + Food.FoodCheck(p, e.getItem(), ClayTechItems.CHICKEN_FOOT, 8); + Food.FoodCheck(p, e.getItem(), ClayTechItems.RAW_BREAD, 4); + Food.FoodCheck(p, e.getItem(), ClayTechItems.RAW_VEGETABLE, 1); + Food.FoodCheck(p, e.getItem(), ClayTechItems.LEMON, 1, new PotionEffect[] { new PotionEffect(PotionEffectType.CONFUSION, 200, 3) }); - Food.FoodCheck(p, e.getItem(), Defines.SPICY_CHICKEN_BURGER, 15, + Food.FoodCheck(p, e.getItem(), ClayTechItems.SPICY_CHICKEN_BURGER, 15, new PotionEffect[] { new PotionEffect(PotionEffectType.getById(5), 400, 1) }); - Food.FoodCheck(p, e.getItem(), Defines.BABA_BURGER, -15, + Food.FoodCheck(p, e.getItem(), ClayTechItems.BABA_BURGER, -15, new PotionEffect[] { new PotionEffect(PotionEffectType.POISON, 3600, 5) }); - Food.FoodCheck(p, e.getItem(), Defines.SNAIL_BAD, -20, + Food.FoodCheck(p, e.getItem(), ClayTechItems.SNAIL_BAD, -20, new PotionEffect[] { new PotionEffect(PotionEffectType.POISON, 8000, 9) }); - Food.FoodCheck(p, e.getItem(), Defines.CHOCOLATE, 15, + Food.FoodCheck(p, e.getItem(), ClayTechItems.CHOCOLATE, 15, new PotionEffect[] { new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 600, 2) }); - Food.FoodCheck(p, e.getItem(), Defines.SNAIL_FOOD, 12, + Food.FoodCheck(p, e.getItem(), ClayTechItems.SNAIL_FOOD, 12, new PotionEffect[] { new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 600, 2) }); - Food.FoodCheck(p, e.getItem(), Defines.HONEY_SWEET, 8); + Food.FoodCheck(p, e.getItem(), ClayTechItems.HONEY_SWEET, 8); + Food.FoodCheck(p, e.getItem(), ClayTechItems.COOKED_SWEET_POTATO, 6); } catch (NullPointerException err) { } - Food.WashCheck(p, e.getItem(), Defines.DIRTY_DRINK_BOTTLE, Defines.DRINK_BOTTLE); + Food.WashCheck(p, e.getItem(), ClayTechItems.DIRTY_DRINK_BOTTLE, ClayTechItems.DRINK_BOTTLE); try { // 这里放其他清理Event!! - Food.WashCheck(p, e.getItem(), Defines.DIRTY_TEA, Defines.RAW_TEA); + Food.WashCheck(p, e.getItem(), ClayTechItems.DIRTY_TEA, ClayTechItems.RAW_TEA); } catch (NullPointerException err) { } } @@ -197,10 +204,10 @@ public void EntityExplodeEvent(EntityExplodeEvent e) { @EventHandler(priority = EventPriority.HIGHEST) public void PlayerFishEvent(PlayerFishEvent e) { if (e.getState() == State.CAUGHT_FISH) { - Food.FishItemCheck(e, 1, 10, Defines.SNAIL_HEALTHY); + Food.FishItemCheck(e, 1, 10, ClayTechItems.SNAIL_HEALTHY); try { // 这里放其他食物/饮料8!! - Food.FishItemCheck(e, 11, 20, Defines.SNAIL_BAD); + Food.FishItemCheck(e, 11, 20, ClayTechItems.SNAIL_BAD); } catch (NullPointerException err) { } diff --git a/src/main/java/club/claycoffee/ClayTech/utils/ClayItem.java b/src/main/java/club/claycoffee/ClayTech/utils/ClayItem.java index bcddf1d..292de26 100644 --- a/src/main/java/club/claycoffee/ClayTech/utils/ClayItem.java +++ b/src/main/java/club/claycoffee/ClayTech/utils/ClayItem.java @@ -8,7 +8,7 @@ public class ClayItem { public static boolean hasDurability(ItemStack item) { for(String each : Utils.getLoreList(item)) { - if(each.startsWith("§b"+Lang.readGeneralText("Durability"))) { + if(each.startsWith(Lang.readGeneralText("Durability"))) { return true; } } @@ -17,8 +17,8 @@ public static boolean hasDurability(ItemStack item) { public static int getDurability(ItemStack item) { if(hasDurability(item)) { for(String each : Utils.getLoreList(item)) { - if(each.startsWith("§b"+Lang.readGeneralText("Durability"))) { - return new Integer(each.replaceFirst("§b"+Lang.readGeneralText("Durability")+":", "").replace(" §6", "")).intValue(); + if(each.startsWith(Lang.readGeneralText("Durability"))) { + return new Integer(each.replaceFirst(Lang.readGeneralText("Durability")+":", "").replace(" §6", "")).intValue(); } } } @@ -36,8 +36,8 @@ public static boolean setDurability(ItemStack item,int durability) { List Lore = Utils.getLoreList(item); int i = 0; for(String each : Lore) { - if(each.startsWith("§b"+Lang.readGeneralText("Durability"))) { - each = each.replace("§6"+getDurability(item), "§6"+durability); + if(each.startsWith(Lang.readGeneralText("Durability"))) { + each = each.replace(""+getDurability(item), ""+durability); Lore.set(i, each); break; } diff --git a/src/main/java/club/claycoffee/ClayTech/utils/Food.java b/src/main/java/club/claycoffee/ClayTech/utils/Food.java index 08852f1..ae47d5e 100644 --- a/src/main/java/club/claycoffee/ClayTech/utils/Food.java +++ b/src/main/java/club/claycoffee/ClayTech/utils/Food.java @@ -14,7 +14,7 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.event.player.PlayerFishEvent; -import club.claycoffee.ClayTech.Defines; +import club.claycoffee.ClayTech.ClayTechItems; import club.claycoffee.ClayTech.api.listeners.PlayerDrinkEvent; import club.claycoffee.ClayTech.api.listeners.PlayerEatEvent; import club.claycoffee.ClayTech.api.listeners.PlayerWashEvent; @@ -32,7 +32,7 @@ public static void DrinkCheck(Player p, ItemStack HandItem, ItemStack food, int if (Utils.IsItemContain(i, food)) { i.setItem(Utils.GetItemIndex(i, HoldItem), HoldItem); } - i.addItem(Defines.DIRTY_DRINK_BOTTLE); + i.addItem(ClayTechItems.DIRTY_DRINK_BOTTLE); if (p.getFoodLevel() + incraseFoodLevel > 20) { p.setFoodLevel(20); p.setSaturation(p.getSaturation() + (p.getFoodLevel() + incraseFoodLevel - 20)); @@ -61,7 +61,7 @@ public static void DrinkCheck(Player p, ItemStack HandItem, ItemStack food, int if (Utils.IsItemContain(i, food)) { i.setItem(Utils.GetItemIndex(i, HoldItem), HoldItem); } - i.addItem(Defines.DIRTY_DRINK_BOTTLE); + i.addItem(ClayTechItems.DIRTY_DRINK_BOTTLE); if (p.getFoodLevel() + incraseFoodLevel > 20) { p.setFoodLevel(20); p.setSaturation(p.getSaturation() + (p.getFoodLevel() + incraseFoodLevel - 20)); diff --git a/src/main/resources/en-UK.yml b/src/main/resources/en-UK.yml index 1c83f85..8d9da9c 100644 --- a/src/main/resources/en-UK.yml +++ b/src/main/resources/en-UK.yml @@ -22,7 +22,9 @@ General: TNT_EXPLOSION_CREATER_SUCCESS: "&aTNT exploded successfully." TNT_EXPLOSION_CREATER_FATAL: "&cTNT exploded failed.Might residence?" TNT_EXPLOSION_CREATER_CD: "&cPlease wait for the CD.." - Durability: "Durability" + Durability: "&bDurability" + CantEat: "&7Can't eat" + CantEatMessage: "&cYou can't eat this item." Categories: Basic: "&bClayTech - Basic" Weapons: "&bClayTech - Weapons" @@ -294,6 +296,15 @@ Items: - "&bWill affect the durability" - "&bWon't break containers." - "&bDurability: &632" + SWEET_POTATO: "&eSweet Potato" + SWEET_POTATO_LORE: + - "&6Sweet Potato" + - "&7Gain this by harvesting potatoes" + - "&7Can't eat" + COOKED_SWEET_POTATO: "&eRoasted Sweet Potato" + COOKED_SWEET_POTATO_LORE: + - "&6Roasted Sweet Potato" + - "&7Increase 6 hunger value after eating" # End Items Researches: CLAYTECH_ARMORS_I: "Basic Effect Armors" diff --git a/src/main/resources/en-US.yml b/src/main/resources/en-US.yml index 1c83f85..8d9da9c 100644 --- a/src/main/resources/en-US.yml +++ b/src/main/resources/en-US.yml @@ -22,7 +22,9 @@ General: TNT_EXPLOSION_CREATER_SUCCESS: "&aTNT exploded successfully." TNT_EXPLOSION_CREATER_FATAL: "&cTNT exploded failed.Might residence?" TNT_EXPLOSION_CREATER_CD: "&cPlease wait for the CD.." - Durability: "Durability" + Durability: "&bDurability" + CantEat: "&7Can't eat" + CantEatMessage: "&cYou can't eat this item." Categories: Basic: "&bClayTech - Basic" Weapons: "&bClayTech - Weapons" @@ -294,6 +296,15 @@ Items: - "&bWill affect the durability" - "&bWon't break containers." - "&bDurability: &632" + SWEET_POTATO: "&eSweet Potato" + SWEET_POTATO_LORE: + - "&6Sweet Potato" + - "&7Gain this by harvesting potatoes" + - "&7Can't eat" + COOKED_SWEET_POTATO: "&eRoasted Sweet Potato" + COOKED_SWEET_POTATO_LORE: + - "&6Roasted Sweet Potato" + - "&7Increase 6 hunger value after eating" # End Items Researches: CLAYTECH_ARMORS_I: "Basic Effect Armors" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e393efa..879146c 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: nightly-20200314 +version: nightly-20200315 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 3108a66..925a077 100644 --- a/src/main/resources/zh-CN.yml +++ b/src/main/resources/zh-CN.yml @@ -22,7 +22,9 @@ General: TNT_EXPLOSION_CREATER_SUCCESS: "&aTNT成功爆炸。" TNT_EXPLOSION_CREATER_FATAL: "&cTNT爆炸失败。可能是由于领地保护等原因。" TNT_EXPLOSION_CREATER_CD: "&c请等待冷却.." - Durability: "耐久" + Durability: "&b耐久" + CantEat: "&7不可食用" + CantEatMessage: "&c您不能食用本物品。" Categories: Basic: "&b粘土科技 - 基础" Weapons: "&b粘土科技 - 武器" @@ -294,6 +296,15 @@ Items: - "&b每次使用后会减1耐久." - "&b(不会破坏容器)" - "&b耐久: &632" + SWEET_POTATO: "&e红芋" + SWEET_POTATO_LORE: + - "&6红芋" + - "&7收获马铃薯有几率获得" + - "&7不可食用" + COOKED_SWEET_POTATO: "&e烤红芋" + COOKED_SWEET_POTATO_LORE: + - "&6烤红芋" + - "&7食用后增加6点饱食度" # End Items Researches: CLAYTECH_ARMORS_I: "基础效果装备" diff --git a/src/main/resources/zh-TW.yml b/src/main/resources/zh-TW.yml index c155e04..e900622 100644 --- a/src/main/resources/zh-TW.yml +++ b/src/main/resources/zh-TW.yml @@ -22,7 +22,9 @@ General: TNT_EXPLOSION_CREATER_SUCCESS: "&aTNT成功爆炸。" TNT_EXPLOSION_CREATER_FATAL: "&cTNT爆炸失敗。可能是由於領地保護等原因。" TNT_EXPLOSION_CREATER_CD: "&c請等待冷卻.." - Durability: "耐久" + Durability: "&b耐久" + CantEat: "&7不可食用" + CantEatMessage: "&c您不能食用本物品。" Categories: Basic: "&b粘土科技 - 基礎" Weapons: "&b粘土科技 - 武器" @@ -294,6 +296,15 @@ Items: - "&b每次使用後會减1耐久." - "&b(不會破壞容器)" - "&b耐久: &632" + SWEET_POTATO: "&e紅芋" + SWEET_POTATO_LORE: + - "&6紅芋" + - "&7收獲馬鈴薯有幾率獲得" + - "&7不可食用" + COOKED_SWEET_POTATO: "&e烤紅芋" + COOKED_SWEET_POTATO_LORE: + - "&6烤紅芋" + - "&7食用後增加6點飽食度" # End Items Researches: CLAYTECH_ARMORS_I: "基礎效果裝備" diff --git a/src/main/resources/changelogs.txt b/src/test/resources/changelogs.txt similarity index 100% rename from src/main/resources/changelogs.txt rename to src/test/resources/changelogs.txt diff --git a/src/main/resources/changelogs_ansi.txt b/src/test/resources/changelogs_ansi.txt similarity index 100% rename from src/main/resources/changelogs_ansi.txt rename to src/test/resources/changelogs_ansi.txt