Skip to content

Commit

Permalink
[U] 1.1.0-SNAPSHOT-4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClayCoffee
ClayCoffee committed Mar 25, 2020
1 parent 20adddb commit fc7d119
Show file tree
Hide file tree
Showing 28 changed files with 192 additions and 137 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>club.claycoffee</groupId>
<artifactId>ClayTech</artifactId>
<version>1.1.0-SNAPSHOT-3</version>
<version>1.1.0-SNAPSHOT-4</version>
<build>
<plugins>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/club/claycoffee/ClayTech/ClayTech.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class ClayTech extends JavaPlugin implements SlimefunAddon {
public static Map<Inventory, Block> RunningLaunchersG = new HashMap<Inventory, Block>();
public static Map<Inventory, Block> RunningInjectors = new HashMap<Inventory, Block>();
public static Map<Inventory, Block> RunningInjectorsOxygen = new HashMap<Inventory, Block>();
public static DataYML planetDataYML;
private static DataYML planetDataYML;

public static ClayTech getInstance() {
return plugin;
Expand Down Expand Up @@ -111,7 +111,7 @@ public static String getOverworld() {
public static DataYML getPlanetYML() {
return planetYML;
}

public static DataYML getPlanetDataYML() {
return planetDataYML;
}
Expand Down Expand Up @@ -306,7 +306,7 @@ SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.BATTERY, new ItemStack(Material.CRAF
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.ELECTRIC_MOTOR, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.PROGRAMMABLE_ANDROID,
SlimefunItems.WITHER_PROOF_OBSIDIAN };
ItemStack[] ClayExperimentTableBasic = { ClayTechItems.CLAY_ALLOY_INGOT, SlimefunItems.ELECTRIC_MOTOR,
ClayTechItems.CLAY_ALLOY_INGOT, SlimefunItems.ADVANCED_CIRCUIT_BOARD, ClayTechItems.CLAY_FOOD_CAULDRON,
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/club/claycoffee/ClayTech/ClayTechItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,12 @@ public class ClayTechItems {
public static final ItemStack KREEP_INGOT = Utils.setLore(
Utils.newItemD(Material.IRON_INGOT, Lang.readItemText("KREEP_INGOT")), Lang.readItemLore("KREEP_INGOT"));
public static final ItemStack PLANET_BASE_SIGNER = Utils.setLore(
Utils.newItemD(Material.OBSIDIAN, Lang.readItemText("PLANET_BASE_SIGNER")), Lang.readItemLore("PLANET_BASE_SIGNER"));
Utils.newItemD(Material.OBSIDIAN, Lang.readItemText("PLANET_BASE_SIGNER")),
Lang.readItemLore("PLANET_BASE_SIGNER"));
public static final ItemStack TUBE = Utils.newItemD(Material.BONE, Lang.readItemText("TUBE"));
public static final ItemStack OXYGEN_DISTRIBUTER = Utils.setLore(
Utils.newItemD(Material.FIREWORK_STAR, Lang.readItemText("OXYGEN_DISTRIBUTER")), Lang.readItemLore("OXYGEN_DISTRIBUTER"));
Utils.newItemD(Material.FIREWORK_STAR, Lang.readItemText("OXYGEN_DISTRIBUTER")),
Lang.readItemLore("OXYGEN_DISTRIBUTER"));

public static final ItemStack CLAY_FUEL = Utils.setDisplayName(
SkullItem.fromHash("3ce2dad9baf7eaba7e80d4d0f9fac0aab01a76b12fb71c3d2af2a16fdd4c7383"),
Expand Down
59 changes: 32 additions & 27 deletions src/main/java/club/claycoffee/ClayTech/ClayTechMachineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,8 @@ ClayTechItems.MAGIC_CLAY, new ItemStack(Material.TNT), new ItemStack(Material.FL
null, null, null, null };
public final static ItemStack[] ELEMENT_SILICON = { null, null, null, null, new ItemStack(Material.SAND, 10), null,
null, null, null };
public final static ItemStack[] BLISTERING_CORE = { SlimefunItems.BLISTERING_INGOT_3,
SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BLISTERING_INGOT_3,
SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BLISTERING_INGOT_3,
SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BLISTERING_INGOT_3 };
public final static ItemStack[] BLISTERING_CORE = { null, ClayTechItems.CLAY_FUSION_INGOT, null, null,
SlimefunItems.BLISTERING_INGOT_3, null, null, ClayTechItems.CLAY_FUSION_INGOT, null };
public final static ItemStack[] ELEMENT_UNIT = { SlimefunItems.DAMASCUS_STEEL_INGOT,
SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT,
null, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT,
Expand All @@ -133,9 +131,9 @@ ClayTechItems.MAGIC_CLAY, new ItemStack(Material.TNT), new ItemStack(Material.FL
public final static ItemStack[] REINFORCED_ALLOY_PICKAXE = { SlimefunItems.REINFORCED_ALLOY_INGOT,
SlimefunItems.REINFORCED_ALLOY_INGOT, SlimefunItems.REINFORCED_ALLOY_INGOT, null,
SlimefunItems.REINFORCED_ALLOY_INGOT, null, null, SlimefunItems.REINFORCED_ALLOY_INGOT, null };
public final static ItemStack[] CLAY_FUSION_INGOT = { SlimefunItems.SYNTHETIC_DIAMOND,
SlimefunItems.SYNTHETIC_EMERALD, SlimefunItems.SYNTHETIC_SAPPHIRE, SlimefunItems.REINFORCED_ALLOY_INGOT,
ClayTechItems.MAGIC_CLAY, SlimefunItems.REINFORCED_ALLOY_INGOT, null, null, null };
public final static ItemStack[] CLAY_FUSION_INGOT = { SlimefunItems.GOLD_12K, SlimefunItems.SYNTHETIC_EMERALD,
SlimefunItems.SYNTHETIC_SAPPHIRE, SlimefunItems.REINFORCED_ALLOY_INGOT, ClayTechItems.MAGIC_CLAY,
SlimefunItems.REINFORCED_ALLOY_INGOT, null, null, null };
public final static ItemStack[] CLAY_ALLOY_INGOT = { SlimefunItems.REINFORCED_ALLOY_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.CARBONADO, SlimefunItems.REDSTONE_ALLOY,
ClayTechItems.MAGIC_CLAY, SlimefunItems.GOLD_24K, null, null, null };
Expand All @@ -161,25 +159,24 @@ ClayTechItems.MAGIC_CLAY, new ItemStack(Material.TNT), new ItemStack(Material.FL
SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.WITHER_PROOF_OBSIDIAN,
SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.WITHER_PROOF_OBSIDIAN,
SlimefunItems.WITHER_PROOF_OBSIDIAN };
public final static ItemStack[] ROCKET_ENGINE_SHELL = { ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
public final static ItemStack[] ROCKET_ENGINE_SHELL = { SlimefunItems.DAMASCUS_STEEL_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT };
public final static ItemStack[] FUEL_TANK = { ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.MAGIC_CLAY,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT };
SlimefunItems.DAMASCUS_STEEL_INGOT, ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT };
public final static ItemStack[] FUEL_TANK = { SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT,
SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT, ClayTechItems.MAGIC_CLAY, SlimefunItems.TIN_INGOT,
SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT };
public final static ItemStack[] ROCKET_ENGINE = { ClayTechItems.ROCKET_ENGINE_SHELL,
ClayTechItems.ROCKET_ENGINE_SHELL, ClayTechItems.ROCKET_ENGINE_SHELL, ClayTechItems.MOTOR_CORE,
ClayTechItems.FUEL_TANK, ClayTechItems.MOTOR_CORE, ClayTechItems.ARTIFICIAL_GOLD_BLOCK,
ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ARTIFICIAL_GOLD_BLOCK };
public final static ItemStack[] ROCKET_ANTENNA = { ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.COPPER_WIRE,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT };
public final static ItemStack[] ROCKET_ANTENNA = { SlimefunItems.DAMASCUS_STEEL_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
SlimefunItems.COPPER_WIRE, ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT };
public final static ItemStack[] ROCKET_CPU = { ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.ROCKET_ANTENNA, SlimefunItems.PROGRAMMABLE_ANDROID_3, ClayTechItems.ROCKET_ANTENNA,
ClayTechItems.ROCKET_ANTENNA, SlimefunItems.PROGRAMMABLE_ANDROID, ClayTechItems.ROCKET_ANTENNA,
ClayTechItems.ROCKET_ENGINE_SHELL, ClayTechItems.ROCKET_ENGINE_SHELL, ClayTechItems.ROCKET_ENGINE_SHELL };
public final static ItemStack[] ROCKET_CONTROL_CORE = { ClayTechItems.ARTIFICIAL_GOLD_BLOCK,
ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ARTIFICIAL_GOLD_BLOCK, ClayTechItems.ROCKET_ENGINE_SHELL,
Expand All @@ -205,10 +202,9 @@ ClayTechItems.MAGIC_CLAY, new ItemStack(Material.TNT), new ItemStack(Material.FL
ClayTechItems.ROCKET_STEEL_PLATE, ClayTechItems.ROCKET_STEEL_PLATE, ClayTechItems.ROCKET_ENGINE,
ClayTechItems.ROCKET_STEEL_PLATE };

public final static ItemStack[] OXYGEN_TANK = { ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_STICK,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT };
public final static ItemStack[] OXYGEN_TANK = { SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT,
SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT, ClayTechItems.CLAY_STICK, SlimefunItems.TIN_INGOT,
SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT, SlimefunItems.TIN_INGOT };
public final static ItemStack[] SPACESUIT_OXYGEN_TANK = { ClayTechItems.OXYGEN_TANK, ClayTechItems.OXYGEN_TANK,
ClayTechItems.OXYGEN_TANK, ClayTechItems.OXYGEN_TANK, ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN,
ClayTechItems.OXYGEN_TANK, ClayTechItems.OXYGEN_TANK, ClayTechItems.OXYGEN_TANK,
Expand All @@ -228,8 +224,17 @@ ClayTechItems.MAGIC_CLAY, new ItemStack(Material.TNT), new ItemStack(Material.FL
null };
public final static ItemStack[] KREEP_INGOT = { null, null, null, null, ClayTechItems.KREEP_ROCK, null, null, null,
null };
public final static ItemStack[] RAW_CHICKEN_FOOT = { null, null, null, null, new ItemStack(Material.CHICKEN), null, null, null, null };;
public final static ItemStack[] PLANET_BASE_SIGNER = {SlimefunItems.STEEL_PLATE,ClayTechItems.ROCKET_ANTENNA,SlimefunItems.STEEL_PLATE,SlimefunItems.HARDENED_GLASS,SlimefunItems.PROGRAMMABLE_ANDROID,SlimefunItems.HARDENED_GLASS,ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN,SlimefunItems.ELECTRIC_MOTOR,ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN};
public final static ItemStack[] TUBE = {SlimefunItems.PLASTIC_SHEET,null,SlimefunItems.PLASTIC_SHEET,SlimefunItems.PLASTIC_SHEET,null,SlimefunItems.PLASTIC_SHEET,SlimefunItems.PLASTIC_SHEET,null,SlimefunItems.PLASTIC_SHEET};
public final static ItemStack[] OXYGEN_DISTRIBUTER = {SlimefunItems.REINFORCED_ALLOY_INGOT,ClayTechItems.TUBE,SlimefunItems.REINFORCED_ALLOY_INGOT,ClayTechItems.SPACESUIT_OXYGEN_TANK,ClayTechItems.SPACESUIT_OXYGEN_TANK,ClayTechItems.SPACESUIT_OXYGEN_TANK,ClayTechItems.KREEP_INGOT,ClayTechItems.SPACESUIT_OXYGEN_TANK,ClayTechItems.KREEP_INGOT};
public final static ItemStack[] RAW_CHICKEN_FOOT = { null, null, null, null, new ItemStack(Material.CHICKEN), null,
null, null, null };;
public final static ItemStack[] PLANET_BASE_SIGNER = { SlimefunItems.STEEL_PLATE, ClayTechItems.ROCKET_ANTENNA,
SlimefunItems.STEEL_PLATE, SlimefunItems.HARDENED_GLASS, SlimefunItems.PROGRAMMABLE_ANDROID,
SlimefunItems.HARDENED_GLASS, ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN, SlimefunItems.ELECTRIC_MOTOR,
ClayTechItems.TEMPERATURE_RESISTANCE_OBSIDIAN };
public final static ItemStack[] TUBE = { SlimefunItems.PLASTIC_SHEET, null, SlimefunItems.PLASTIC_SHEET,
SlimefunItems.PLASTIC_SHEET, null, SlimefunItems.PLASTIC_SHEET, SlimefunItems.PLASTIC_SHEET, null,
SlimefunItems.PLASTIC_SHEET };
public final static ItemStack[] OXYGEN_DISTRIBUTER = { SlimefunItems.REINFORCED_ALLOY_INGOT, ClayTechItems.TUBE,
SlimefunItems.REINFORCED_ALLOY_INGOT, ClayTechItems.SPACESUIT_OXYGEN_TANK,
ClayTechItems.SPACESUIT_OXYGEN_TANK, ClayTechItems.SPACESUIT_OXYGEN_TANK, ClayTechItems.KREEP_INGOT,
ClayTechItems.SPACESUIT_OXYGEN_TANK, ClayTechItems.KREEP_INGOT };
}
4 changes: 2 additions & 2 deletions src/main/java/club/claycoffee/ClayTech/api/ClayTechManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static boolean isClayTechItem(ItemStack item) {
return true;
} else if (isSpaceSuit(is)) {
return true;
} else if (isOxygenDistributer(is)){
} else if (isOxygenDistributer(is)) {
return true;
}
}
Expand Down Expand Up @@ -72,7 +72,7 @@ public static boolean isSpaceSuit(ItemStack item) {
}
return false;
}

public static boolean isOxygenDistributer(ItemStack item) {
if (item == null)
return false;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/club/claycoffee/ClayTech/api/Planet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void register() {
}
}
ClayTech.getPlanets().add(this);

if (Bukkit.getWorld(this.planetName) == null) {
// Register
WorldCreator newWorld = new WorldCreator(this.planetName);
Expand All @@ -93,7 +93,6 @@ public void register() {
newWorld = newWorld.generateStructures(false);
newWorld = newWorld.generator(this.planetWorld);
newWorld.createWorld();


// 多世界注册
if (Bukkit.getPluginManager().isPluginEnabled("Multiverse-Core")) {
Expand Down
1 change: 0 additions & 1 deletion ...java/club/claycoffee/ClayTech/implementation/Planets/populators/MoonDiamondPopulator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.bukkit.generator.BlockPopulator;
import org.jetbrains.annotations.NotNull;


public class MoonDiamondPopulator extends BlockPopulator {

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...n/java/club/claycoffee/ClayTech/implementation/Planets/populators/MoonKreepPopulator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ public void populate(@NotNull World world, @NotNull Random random, @NotNull Chun
int count = 0;
while (random.nextDouble() < 0.8D && count <= 4) {
if (source.getBlock(x, y, z).getType() == Material.STONE) {
if(!SlimefunPlugin.getRegistry().getWorlds().containsKey(world.getName())) {
if (!SlimefunPlugin.getRegistry().getWorlds().containsKey(world.getName())) {
BlockStorage bs = new BlockStorage(world);
SlimefunPlugin.getRegistry().getWorlds().put(world.getName(), bs);
}
source.getBlock(x, y, z).setType(ClayTechItems.KREEP_ROCK.getType());
BlockStorage.addBlockInfo(source.getBlock(x, y, z), "id", "KREEP_ROCK",true);
BlockStorage.addBlockInfo(source.getBlock(x, y, z), "id", "KREEP_ROCK", true);
count++;

}

switch (random.nextInt(6)) {
case 0:
x = Math.min(x + 1, 15);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/club/claycoffee/ClayTech/implementation/items/FoodMakingStaff.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public FoodMakingStaff() {
new ItemStack(Material.BAMBOO), null };

Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_CHICKEN_FOOT", ClayTechItems.RAW_CHICKEN_FOOT,
"notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CHALKING_MACHINE, ClayTechMachineRecipes.RAW_CHICKEN_FOOT, false);
"notresearch", 10, ClayTechRecipeType.CLAY_FOOD_CHALKING_MACHINE,
ClayTechMachineRecipes.RAW_CHICKEN_FOOT, false);
Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_BREAD", ClayTechItems.RAW_BREAD, "notresearch",
10, RecipeType.ENHANCED_CRAFTING_TABLE, recipec, false);
Slimefunutils.registerItem(ClayTechItems.C_FOODMATERIALS, "RAW_VEGETABLE", ClayTechItems.RAW_VEGETABLE,
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/club/claycoffee/ClayTech/implementation/items/Golden_things.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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), 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), new ItemStack(Material.GOLD_INGOT) };
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,
Expand All @@ -36,13 +36,17 @@ public Golden_things() {
ClayTechItems.ARTIFICIAL_GOLD_BLOCK };

Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_NUGGET",
ClayTechItems.ARTIFICIAL_GOLD_NUGGET, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipec, false);
ClayTechItems.ARTIFICIAL_GOLD_NUGGET, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipec,
false);
Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_INGOT_O",
ClayTechItems.ARTIFICIAL_GOLD_INGOT_O, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, reciped, false);
ClayTechItems.ARTIFICIAL_GOLD_INGOT_O, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, reciped,
false);
Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_INGOT",
ClayTechItems.ARTIFICIAL_GOLD_INGOT, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipee, false);
ClayTechItems.ARTIFICIAL_GOLD_INGOT, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipee,
false);
Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "ARTIFICIAL_GOLD_BLOCK",
ClayTechItems.ARTIFICIAL_GOLD_BLOCK, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipef, false);
ClayTechItems.ARTIFICIAL_GOLD_BLOCK, "notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, recipef,
false);
Slimefunutils.registerItem(ClayTechItems.C_FOOD, "ARTIFICIAL_ENCHANTED_GOLDEN_APPLE",
ClayTechItems.ARTIFICIAL_ENCHANTED_GOLDEN_APPLE, "notresearch", 10, RecipeType.ANCIENT_ALTAR, recipeg,
false);
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/club/claycoffee/ClayTech/implementation/items/RocketMakings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,20 @@ public RocketMakings() {
SlimefunItem.getByItem(ClayTechItems.CLAY_ROCKET_FUEL_INJECTOR),
SlimefunItem.getByItem(ClayTechItems.CLAY_SPACESUIT_OXYGEN_INJECTOR));
ms1.register();



Slimefunutils.registerItem(ClayTechItems.C_OTHER, "PLANET_BASE_SIGNER", ClayTechItems.PLANET_BASE_SIGNER,
"notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.PLANET_BASE_SIGNER,
false);
Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "TUBE", ClayTechItems.TUBE,
"notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.TUBE,
false);
Slimefunutils.registerItem(ClayTechItems.C_MATERIALS, "TUBE", ClayTechItems.TUBE, "notresearch", 10,
ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.TUBE, false);
Slimefunutils.registerItem(ClayTechItems.C_OTHER, "OXYGEN_DISTRIBUTER", ClayTechItems.OXYGEN_DISTRIBUTER,
"notresearch", 10, ClayTechRecipeType.CLAY_CRAFTING_TABLE, ClayTechMachineRecipes.OXYGEN_DISTRIBUTER,
false);

Research bs1 = new Research(new NamespacedKey(ClayTech.getInstance(), "CLAYTECH_BASE_1"), 9930,
Lang.readResearchesText("CLAYTECH_BASE_I"), 50);
bs1.addItems(SlimefunItem.getByItem(ClayTechItems.PLANET_BASE_SIGNER),
SlimefunItem.getByItem(ClayTechItems.TUBE),
SlimefunItem.getByItem(ClayTechItems.OXYGEN_DISTRIBUTER));
SlimefunItem.getByItem(ClayTechItems.TUBE), SlimefunItem.getByItem(ClayTechItems.OXYGEN_DISTRIBUTER));
bs1.register();

}
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/club/claycoffee/ClayTech/implementation/items/Rockets.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
public class Rockets {
public Rockets() {
// 平台
ItemStack[] rocketlauncher = {ClayTechItems.CLAY_FUSION_INGOT,ClayTechItems.CLAY_FUSION_INGOT,ClayTechItems.CLAY_FUSION_INGOT,ClayTechItems.CLAY_FUSION_INGOT,SlimefunItems.PROGRAMMABLE_ANDROID,ClayTechItems.CLAY_FUSION_INGOT,ClayTechItems.CLAY_FUSION_INGOT,ClayTechItems.CLAY_FUSION_INGOT,ClayTechItems.CLAY_FUSION_INGOT};

ItemStack[] rocketlauncher = { ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, SlimefunItems.PROGRAMMABLE_ANDROID,
ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT, ClayTechItems.CLAY_FUSION_INGOT,
ClayTechItems.CLAY_FUSION_INGOT };

Slimefunutils.registerItem(ClayTechItems.C_MACHINES, "ROCKET_LAUNCHER", ClayTechItems.ROCKET_LAUNCHER,
"notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, rocketlauncher,
false);
"notresearch", 10, RecipeType.ENHANCED_CRAFTING_TABLE, rocketlauncher, false);

Research ms2 = new Research(new NamespacedKey(ClayTech.getInstance(), "CLAYTECH_UNIVERSE_MACHINE_2"), 9929,
Lang.readResearchesText("CLAYTECH_UNIVERSE_MACHINE_II"), 55);
Expand Down
Loading

0 comments on commit fc7d119

Please sign in to comment.