mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Added Electric Crucible

Browse Source
This commit is contained in:
BuildTools 2016-11-24 17:36:46 +01:00
parent 7aa493a96d
commit ef748fe01e
3 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java
View File

@ -554,6 +554,7 @@ public class SlimefunItems {
public static ItemStack HEATED_PRESSURE_CHAMBER = new CustomItem(new MaterialData(Material.STAINED_GLASS, (byte) 8), "&cHeated Pressure Chamber", "", "&4End-Game Machine", "&8\u21E8 &7Speed: 1x", "&8\u21E8 &e\u26A1 &710 J/s");
public static ItemStack HEATED_PRESSURE_CHAMBER_2 = new CustomItem(new MaterialData(Material.STAINED_GLASS, (byte) 8), "&cHeated Pressure Chamber &7- &eII", "", "&4End-Game Machine", "&8\u21E8 &7Speed: 5x", "&8\u21E8 &e\u26A1 &744 J/s");
public static ItemStack ELECTRIC_SMELTERY = new CustomItem(new MaterialData(Material.FURNACE), "&cElectric Smeltery", "", "&4Alloys-Only, doesn't smelt Dust into Ingots", "", "&4End-Game Machine", "&8\u21E8 &7Speed: 1x", "&8\u21E8 &e\u26A1 &720 J/s");
public static ItemStack ELECTRIC_CRUCIBLE = new CustomItem(new MaterialData(Material.STAINED_CLAY, (byte) 14), "&cElectric Crucible", "", "&4End-Game Machine", "&8\u21E8 &7Speed: 1x", "&8\u21E8 &e\u26A1 &730 J/s");
public static ItemStack CARBON_PRESS = new CustomItem(new MaterialData(Material.STAINED_GLASS, (byte) 15), "&cCarbon Press", "", "&4End-Game Machine", "&8\u21E8 &7Speed: 1x", "&8\u21E8 &e\u26A1 &720 J/s");
public static ItemStack CARBON_PRESS_2 = new CustomItem(new MaterialData(Material.STAINED_GLASS, (byte) 15), "&cCarbon Press &7- &eII", "", "&4End-Game Machine", "&8\u21E8 &7Speed: 3x", "&8\u21E8 &e\u26A1 &750 J/s");
@ -698,8 +699,7 @@ public class SlimefunItems {
BOOSTED_URANIUM = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjgzN2NhMTJmMjIyZjQ3ODcxOTZhMTdiOGFiNjU2OTg1Zjg0MDRjNTA3NjdhZGJjYjZlN2YxNDI1NGZlZSJ9fX0="), "&2Boosted Uranium", "", "&2Radiation Level: HIGH", "&4&oHazmat Suit required");
PROGRAMMABLE_ANDROID = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzUwM2NiN2VkODQ1ZTdhNTA3ZjU2OWFmYzY0N2M0N2FjNDgzNzcxNDY1YzlhNjc5YTU0NTk0Yzc2YWZiYSJ9fX0="), "&cProgrammable Android &7(Normal)", "", "&8\u21E8 &7Function: None", "&8\u21E8 &7Fuel Efficiency: 1.0x");
PROGRAMMABLE_ANDROID_MINER = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTYzOGEyODU0MWFiM2FlMGE3MjNkNTU3ODczOGUwODc1ODM4OGVjNGMzMzI0N2JkNGNhMTM0ODJhZWYzMzQifX19"), "&cProgrammable Android &7(Miner)", "", "&8\u21E8 &7Function: Mining", "&8\u21E8 &7Fuel Efficiency: 1.0x");
PROGRAMMABLE_ANDROID_FARMER = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjlkMzMzNTdlODQxODgyM2JmNzgzZGU5MmRlODAyOTFiNGViZDM5MmFlYzg3MDY2OThlMDY4OTZkNDk4ZjYifX19"), "&cProgrammable Android &7(Farmer)", "", "&8\u21E8 &7Function: Farming", "&8\u21E8 &7Fuel Efficiency: 1.0x");
PROGRAMMABLE_ANDROID_MINER = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTYzOGEyODU0MWFiM2FlMGE3MjNkNTU3ODczOGUwODc1ODM4OGVjNGMzMzI0N2JkNGNhMTM0ODJcruciblekNDk4ZjYifX19"), "&cProgrammable Android &7(Farmer)", "", "&8\u21E8 &7Function: Farming", "&8\u21E8 &7Fuel Efficiency: 1.0x");
PROGRAMMABLE_ANDROID_WOODCUTTER = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDMyYTgxNDUxMDE0MjIwNTE2OWExYWQzMmYwYTc0NWYxOGU5Y2I2YzY2ZWU2NGVjYTJlNjViYWJkZWY5ZmYifX19"), "&cProgrammable Android &7(Woodcutter)", "", "&8\u21E8 &7Function: Woodcutting", "&8\u21E8 &7Fuel Efficiency: 1.0x");
PROGRAMMABLE_ANDROID_BUTCHER = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2I0NzJkZjBhZDlhM2JlODhmMmU1ZDVkNDIyZDAyYjExNmQ2NGQ4ZGYxNDc1ZWQzMmU1NDZhZmM4NGIzMSJ9fX0="), "&cProgrammable Android &7(Butcher)", "", "&8\u21E8 &7Function: Slaughtering", "&8\u21E8 &7Damage: 4", "&8\u21E8 &7Fuel Efficiency: 1.0x");
PROGRAMMABLE_ANDROID_FISHERMAN = new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzQ1ZTg3MzNhNzMxMTQzMzNiOThiMzYwMTc1MTI0MTcyMmY0NzEzZTFhMWE1ZDM2ZmJiMTMyNDkzZjFjNyJ9fX0="), "&cProgrammable Android &7(Fisherman)", "", "&8\u21E8 &7Function: Fishing", "&8\u21E8 &7Success Rate: 10%", "&8\u21E8 &7Fuel Efficiency: 1.0x");

36
src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -3374,6 +3374,42 @@ public class SlimefunSetup {
}.registerChargeableBlock(true, 512);
new AContainer(Categories.ELECTRICITY, SlimefunItems.ELECTRIC_CRUCIBLE, "ELECTRIC_CRUCIBLE", RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[]{SlimefunItems.LEAD_INGOT, SlimefunItems.CRUCIBLE, SlimefunItems.LEAD_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.HEATING_COIL, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.LEAD_INGOT, SlimefunItems.BIG_CAPACITOR, SlimefunItems.LEAD_INGOT}) {
@Override
public String getInventoryTitle() {
return "&4Electric Crucible";
}
@Override
public ItemStack getProgressBar() {
return new ItemStack(Material.BLAZE_POWDER);
}
@Override
public void registerDefaultRecipes() {
registerRecipe(10, new ItemStack[]{new ItemStack(Material.BUCKET), new ItemStack(Material.COBBLESTONE, 16)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
registerRecipe(6, new ItemStack[]{new ItemStack(Material.BUCKET), new ItemStack(Material.HARD_CLAY, 8)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
registerRecipe(10, new ItemStack[]{new ItemStack(Material.BUCKET), new ItemStack(Material.LEAVES, 16)}, new ItemStack[]{new ItemStack(Material.WATER_BUCKET)});
}
@Override
public int getEnergyConsumption() {
return 15;
}
@Override
public int getSpeed() {
return 4;
}
@Override
public String getMachineIdentifier() {
return "ELECTRIC_CRUCIBLE";
}
}.registerChargeableBlock(true, 1024);
new AContainer(Categories.ELECTRICITY, SlimefunItems.ELECTRIC_ORE_GRINDER, "ELECTRIC_ORE_GRINDER", RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, new ItemStack(Material.DIAMOND_PICKAXE), null, SlimefunItems.GILDED_IRON, SlimefunItems.HEATING_COIL, SlimefunItems.GILDED_IRON, SlimefunItems.GILDED_IRON, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.GILDED_IRON}) {

38
src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java
View File

@ -86,41 +86,41 @@ public class ItemListener implements Listener {
}
else if (BlockStorage.hasBlockInfo(e.getClickedBlock())) {
p.sendMessage(" ");
p.sendMessage("&d" + e.getClickedBlock().getType() + ":" + e.getClickedBlock().getData() + " &e@ X: " + e.getClickedBlock().getX() + " Y: " + e.getClickedBlock().getY() + " Z: " + e.getClickedBlock().getZ());
p.sendMessage("&dID: " + "&e" + BlockStorage.checkID(e.getClickedBlock()));
p.sendMessage("§d" + e.getClickedBlock().getType() + ":" + e.getClickedBlock().getData() + " §e@ X: " + e.getClickedBlock().getX() + " Y: " + e.getClickedBlock().getY() + " Z: " + e.getClickedBlock().getZ());
p.sendMessage("§dID: " + "§e" + BlockStorage.checkID(e.getClickedBlock()));
if (e.getClickedBlock().getState() instanceof Skull) {
p.sendMessage("&dSkull: " + "&2\u2714");
p.sendMessage(" &dRotation: &e" + ((Skull) e.getClickedBlock().getState()).getRotation().toString());
p.sendMessage("§dSkull: " + "§2\u2714");
p.sendMessage(" §dRotation: §e" + ((Skull) e.getClickedBlock().getState()).getRotation().toString());
}
if (BlockStorage.getStorage(e.getClickedBlock().getWorld()).hasInventory(e.getClickedBlock().getLocation())) {
p.sendMessage("&dInventory: " + "&2\u2714");
p.sendMessage("§dInventory: " + "§2\u2714");
}
else {
p.sendMessage("&dInventory: " + "&4\u2718");
p.sendMessage("§dInventory: " + "§4\u2718");
}
if (BlockStorage.check(e.getClickedBlock()).isTicking()) {
p.sendMessage("&dTicking: " + "&2\u2714");
p.sendMessage(" &dAsync: &e" + (BlockStorage.check(e.getClickedBlock()).getTicker().isSynchronized() ? "&4\u2718": "&2\u2714"));
p.sendMessage(" &dTimings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock()) + "ms");
p.sendMessage(" &dTotal Timings: &e" + SlimefunStartup.ticker.getTimings(BlockStorage.checkID(e.getClickedBlock())) + "ms");
p.sendMessage(" &dChunk Timings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms");
p.sendMessage("§dTicking: " + "§2\u2714");
p.sendMessage(" §dAsync: §e" + (BlockStorage.check(e.getClickedBlock()).getTicker().isSynchronized() ? "§4\u2718": "§2\u2714"));
p.sendMessage(" §dTimings: §e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock()) + "ms");
p.sendMessage(" §dTotal Timings: §e" + SlimefunStartup.ticker.getTimings(BlockStorage.checkID(e.getClickedBlock())) + "ms");
p.sendMessage(" §dChunk Timings: §e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms");
}
else if (BlockStorage.check(e.getClickedBlock()).getEnergyTicker() != null) {
p.sendMessage("&dTicking: " + "&b~ &3(Indirect)");
p.sendMessage(" &dTimings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock()) + "ms");
p.sendMessage(" &dChunk Timings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms");
p.sendMessage("§dTicking: " + "§b~ §3(Indirect)");
p.sendMessage(" §dTimings: §e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock()) + "ms");
p.sendMessage(" §dChunk Timings: §e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms");
}
else {
p.sendMessage("&dTicking: " + "&4\u2718");
p.sendMessage("§dTicking: " + "§4\u2718");
}
if (ChargableBlock.isChargable(e.getClickedBlock())) {
p.sendMessage("&dChargable: " + "&2\u2714");
p.sendMessage(" &dEnergy: &e" + ChargableBlock.getCharge(e.getClickedBlock()) + " / " + ChargableBlock.getMaxCharge(e.getClickedBlock()));
p.sendMessage("§dChargable: " + "§2\u2714");
p.sendMessage(" §dEnergy: §e" + ChargableBlock.getCharge(e.getClickedBlock()) + " / " + ChargableBlock.getMaxCharge(e.getClickedBlock()));
}
else {
p.sendMessage("&dChargable: " + "&4\u2718");
p.sendMessage("§dChargable: " + "§4\u2718");
}
p.sendMessage("&6" + BlockStorage.getBlockInfoAsJson(e.getClickedBlock()));
p.sendMessage("§6" + BlockStorage.getBlockInfoAsJson(e.getClickedBlock()));
p.sendMessage(" ");
}
break;