mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

[CI skip] Reduced technical debt

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-02-09 23:13:15 +01:00
parent 2530014cda
commit e53746990e
7 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/github/thebusybiscuit/slimefun4/core/services/LocalizationService.java
View File

@ -157,16 +157,17 @@ public class LocalizationService extends SlimefunLocalization {
}
public double getProgress(Language lang) {
double defaultKeys = getTotalKeys(languages.get(SupportedLanguage.ENGLISH.getID()));
int defaultKeys = getTotalKeys(languages.get(SupportedLanguage.ENGLISH.getID()));
if (defaultKeys == 0) return 0;
return DoubleHandler.fixDouble(100.0 * (getTotalKeys(lang) / defaultKeys));
return DoubleHandler.fixDouble(100.0 * (getTotalKeys(lang) / (double) defaultKeys));
}
private double getTotalKeys(Language lang) {
private int getTotalKeys(Language lang) {
return getKeys(lang.getMessages(), lang.getResearches(), lang.getResources(), lang.getCategories());
}
private double getKeys(FileConfiguration... files) {
private int getKeys(FileConfiguration... files) {
int keys = 0;
for (FileConfiguration cfg : files) {

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/android/ProgrammableAndroid.java
View File

@ -93,7 +93,7 @@ public abstract class ProgrammableAndroid extends SimpleSlimefunItem<BlockTicker
registerFuel(new MachineFuel(1, new ItemStack(mat)));
}
}
else if (getTier() == 2){
else if (getTier() == 2) {
registerFuel(new MachineFuel(100, new ItemStack(Material.LAVA_BUCKET)));
registerFuel(new MachineFuel(200, SlimefunItems.BUCKET_OF_OIL));
registerFuel(new MachineFuel(500, SlimefunItems.BUCKET_OF_FUEL));

20
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
View File

@ -184,7 +184,7 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
public final class SlimefunItemSetup {
private SlimefunItemSetup() {}
public static void setup() {
@ -2302,7 +2302,6 @@ public final class SlimefunItemSetup {
}
.register(true);
new ProgrammableAndroid(Categories.ELECTRICITY, (SlimefunItemStack) SlimefunItems.PROGRAMMABLE_ANDROID_3, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {SlimefunItems.PLASTIC_SHEET, SlimefunItems.ANDROID_MEMORY_CORE, SlimefunItems.PLASTIC_SHEET, SlimefunItems.NUCLEAR_REACTOR, SlimefunItems.PROGRAMMABLE_ANDROID_2, new ItemStack(Material.CHEST), SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.POWER_CRYSTAL, SlimefunItems.BLISTERING_INGOT_3}) {
@ -2444,7 +2443,7 @@ public final class SlimefunItemSetup {
.register(true, new RainbowTicker(MaterialCollections.getAllTerracottaColors()));
// Christmas
new SlimefunItem(Categories.CHRISTMAS, (SlimefunItemStack) SlimefunItems.RAINBOW_WOOL_XMAS, RecipeType.ANCIENT_ALTAR,
new ItemStack[] {new ItemStack(Material.RED_DYE), SlimefunItems.CHRISTMAS_COOKIE, new ItemStack(Material.GREEN_DYE), new ItemStack(Material.WHITE_WOOL), SlimefunItems.RUNE_RAINBOW, new ItemStack(Material.WHITE_WOOL), new ItemStack(Material.GREEN_DYE), SlimefunItems.CHRISTMAS_COOKIE, new ItemStack(Material.RED_DYE)},
new CustomItem(SlimefunItems.RAINBOW_WOOL_XMAS, 2))
@ -2454,7 +2453,7 @@ public final class SlimefunItemSetup {
new ItemStack[] {new ItemStack(Material.RED_DYE), SlimefunItems.CHRISTMAS_COOKIE, new ItemStack(Material.GREEN_DYE), new ItemStack(Material.WHITE_STAINED_GLASS), SlimefunItems.RUNE_RAINBOW, new ItemStack(Material.WHITE_STAINED_GLASS), new ItemStack(Material.GREEN_DYE), SlimefunItems.CHRISTMAS_COOKIE, new ItemStack(Material.RED_DYE)},
new CustomItem(SlimefunItems.RAINBOW_GLASS_XMAS, 2))
.register(true, new RainbowTicker(Material.RED_STAINED_GLASS, Material.GREEN_STAINED_GLASS));
new SlimefunItem(Categories.CHRISTMAS, (SlimefunItemStack) SlimefunItems.RAINBOW_GLASS_PANE_XMAS, RecipeType.ANCIENT_ALTAR,
new ItemStack[] {new ItemStack(Material.RED_DYE), SlimefunItems.CHRISTMAS_COOKIE, new ItemStack(Material.GREEN_DYE), new ItemStack(Material.WHITE_STAINED_GLASS_PANE), SlimefunItems.RUNE_RAINBOW, new ItemStack(Material.WHITE_STAINED_GLASS_PANE), new ItemStack(Material.GREEN_DYE), SlimefunItems.CHRISTMAS_COOKIE, new ItemStack(Material.RED_DYE)},
new CustomItem(SlimefunItems.RAINBOW_GLASS_PANE_XMAS, 2))
@ -2466,7 +2465,7 @@ public final class SlimefunItemSetup {
.register(true, new RainbowTicker(Material.RED_TERRACOTTA, Material.GREEN_TERRACOTTA));
// Valentines Day
new SlimefunItem(Categories.VALENTINES_DAY, (SlimefunItemStack) SlimefunItems.RAINBOW_WOOL_VALENTINE, RecipeType.ANCIENT_ALTAR,
new ItemStack[] {new ItemStack(Material.RED_DYE), new ItemStack(Material.POPPY), new ItemStack(Material.PINK_DYE), new ItemStack(Material.WHITE_WOOL), SlimefunItems.RUNE_RAINBOW, new ItemStack(Material.WHITE_WOOL), new ItemStack(Material.PINK_DYE), new ItemStack(Material.POPPY), new ItemStack(Material.RED_DYE)},
new CustomItem(SlimefunItems.RAINBOW_WOOL_VALENTINE, 2))
@ -2508,16 +2507,16 @@ public final class SlimefunItemSetup {
new ItemStack[] {new ItemStack(Material.ORANGE_DYE), new ItemStack(Material.PUMPKIN), new ItemStack(Material.BLACK_DYE), new ItemStack(Material.WHITE_TERRACOTTA), SlimefunItems.RUNE_RAINBOW, new ItemStack(Material.WHITE_TERRACOTTA), new ItemStack(Material.BLACK_DYE), new ItemStack(Material.PUMPKIN), new ItemStack(Material.ORANGE_DYE)},
new CustomItem(SlimefunItems.RAINBOW_CLAY_HALLOWEEN, 2))
.register(true, new RainbowTicker(Material.ORANGE_TERRACOTTA, Material.BLACK_TERRACOTTA));
new SlimefunItem(Categories.TECH_MISC, (SlimefunItemStack) SlimefunItems.WITHER_PROOF_GLASS, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {SlimefunItems.LEAD_INGOT, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.LEAD_INGOT, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.HARDENED_GLASS, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.LEAD_INGOT, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.LEAD_INGOT},
new CustomItem(SlimefunItems.WITHER_PROOF_GLASS, 4))
.register(true);
new GEOScannerBlock(Categories.GPS, (SlimefunItemStack) SlimefunItems.GPS_GEO_SCANNER, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, null, SlimefunItems.ELECTRO_MAGNET, null, SlimefunItems.STEEL_INGOT, SlimefunItems.STEEL_INGOT, SlimefunItems.ELECTRO_MAGNET, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ELECTRO_MAGNET})
.register(true);
new PortableGEOScanner(Categories.GPS, (SlimefunItemStack) SlimefunItems.PORTABLE_GEO_SCANNER, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {SlimefunItems.ELECTRO_MAGNET, new ItemStack(Material.COMPASS), SlimefunItems.ELECTRO_MAGNET, SlimefunItems.STEEL_INGOT, SlimefunItems.GPS_MARKER_TOOL, SlimefunItems.STEEL_INGOT, SlimefunItems.SOLDER_INGOT, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.SOLDER_INGOT})
.register(true);
@ -2536,7 +2535,7 @@ public final class SlimefunItemSetup {
}
}.registerChargeableBlock(true, 200);
new GEOMiner(Categories.GPS, (SlimefunItemStack) SlimefunItems.GEO_MINER, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {new ItemStack(Material.DIAMOND_PICKAXE), SlimefunItems.MEDIUM_CAPACITOR, new ItemStack(Material.DIAMOND_PICKAXE), SlimefunItems.REINFORCED_ALLOY_INGOT, SlimefunItems.OIL_PUMP, SlimefunItems.REINFORCED_ALLOY_INGOT, null, SlimefunItems.ELECTRIC_MOTOR, null}) {
@ -2941,7 +2940,7 @@ public final class SlimefunItemSetup {
public int getEnergyConsumption() {
return 10;
}
}.registerChargeableBlock(true, 256);
new ReactorAccessPort(Categories.CARGO, (SlimefunItemStack) SlimefunItems.REACTOR_ACCESS_PORT, RecipeType.ENHANCED_CRAFTING_TABLE,
@ -2952,7 +2951,6 @@ public final class SlimefunItemSetup {
new ItemStack[] {null, SlimefunItems.MEDIUM_CAPACITOR, null, new ItemStack(Material.BUCKET), SlimefunItems.CARGO_MOTOR, new ItemStack(Material.BUCKET), null, SlimefunItems.OIL_PUMP, null})
.registerChargeableBlock(true, 512);
new TrashCan(Categories.CARGO, (SlimefunItemStack) SlimefunItems.TRASH_CAN, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, SlimefunItems.PORTABLE_DUSTBIN, null, SlimefunItems.LEAD_INGOT, SlimefunItems.CARGO_MOTOR, SlimefunItems.LEAD_INGOT, SlimefunItems.ALUMINUM_INGOT, SlimefunItems.LEAD_INGOT, SlimefunItems.ALUMINUM_INGOT})
.register(true);

1
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoManagerBlock.java
View File

@ -49,6 +49,7 @@ public class CargoManagerBlock extends SlimefunItem {
@Override
public void onRightClick(PlayerRightClickEvent e) {
Optional<Block> block = e.getClickedBlock();
if (block.isPresent()) {
Player p = e.getPlayer();
Block b = block.get();

17
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/EnhancedFurnace.java
View File

@ -2,6 +2,7 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import java.util.concurrent.ThreadLocalRandom;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.Furnace;
import org.bukkit.inventory.ItemStack;
@ -51,19 +52,21 @@ public class EnhancedFurnace extends SimpleSlimefunItem<BlockTicker> {
@Override
public void tick(Block b, SlimefunItem item, Config data) {
if (!(b.getState() instanceof Furnace)) {
if (b.getType() != Material.FURNACE) {
// The Furnace has been destroyed, we can clear the block data
BlockStorage.clearBlockInfo(b);
}
else if (((Furnace) b.getState()).getCookTime() > 0) {
else {
Furnace furnace = (Furnace) b.getState();
if (furnace.getCookTime() > 0) {
int newCookTime = furnace.getCookTime() + getSpeed() * 10;
int newCookTime = furnace.getCookTime() + getSpeed() * 10;
if (newCookTime > 200) furnace.setCookTime((short) 188);
else furnace.setCookTime((short) newCookTime);
if (newCookTime > 200) furnace.setCookTime((short) 188);
else furnace.setCookTime((short) newCookTime);
furnace.update(true, false);
furnace.update(true, false);
}
}
}

2
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/InfusedHopper.java
View File

@ -44,7 +44,7 @@ public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
Location l = b.getLocation().add(0.5, 1.2, 0.5);
boolean sound = false;
for (Entity item : b.getWorld().getNearbyEntities(l, 3.5D, 3.5D, 3.5D, n -> n instanceof Item && n.isValid() && !n.hasMetadata("no_pickup") && n.getLocation().distanceSquared(l) > 0.1)) {
for (Entity item : b.getWorld().getNearbyEntities(l, 3.5D, 3.5D, 3.5D, n -> n instanceof Item && n.isValid() && !n.hasMetadata("no_pickup") && n.getLocation().distanceSquared(l) > 0.25)) {
item.setVelocity(new Vector(0, 0.1, 0));
item.teleport(l);
sound = true;

2
src/main/java/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java
View File

@ -201,6 +201,7 @@ public final class SlimefunManager {
}
SlimefunItem sfItem = SlimefunItem.getByItem(strippedItem);
if (sfItem instanceof Soulbound && !sfItem.isDisabled()) {
return true;
}
@ -208,6 +209,7 @@ public final class SlimefunManager {
ItemMeta im = item.getItemMeta();
return (im.hasLore() && im.getLore().contains(ChatColor.GRAY + "Soulbound"));
}
return false;
}
}