mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
[CI skip] Reduced technical debt
This commit is contained in:
parent
2530014cda
commit
e53746990e
@ -157,16 +157,17 @@ public class LocalizationService extends SlimefunLocalization {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public double getProgress(Language lang) {
|
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;
|
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());
|
return getKeys(lang.getMessages(), lang.getResearches(), lang.getResources(), lang.getCategories());
|
||||||
}
|
}
|
||||||
|
|
||||||
private double getKeys(FileConfiguration... files) {
|
private int getKeys(FileConfiguration... files) {
|
||||||
int keys = 0;
|
int keys = 0;
|
||||||
|
|
||||||
for (FileConfiguration cfg : files) {
|
for (FileConfiguration cfg : files) {
|
||||||
|
@ -93,7 +93,7 @@ public abstract class ProgrammableAndroid extends SimpleSlimefunItem<BlockTicker
|
|||||||
registerFuel(new MachineFuel(1, new ItemStack(mat)));
|
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(100, new ItemStack(Material.LAVA_BUCKET)));
|
||||||
registerFuel(new MachineFuel(200, SlimefunItems.BUCKET_OF_OIL));
|
registerFuel(new MachineFuel(200, SlimefunItems.BUCKET_OF_OIL));
|
||||||
registerFuel(new MachineFuel(500, SlimefunItems.BUCKET_OF_FUEL));
|
registerFuel(new MachineFuel(500, SlimefunItems.BUCKET_OF_FUEL));
|
||||||
|
@ -2302,7 +2302,6 @@ public final class SlimefunItemSetup {
|
|||||||
}
|
}
|
||||||
.register(true);
|
.register(true);
|
||||||
|
|
||||||
|
|
||||||
new ProgrammableAndroid(Categories.ELECTRICITY, (SlimefunItemStack) SlimefunItems.PROGRAMMABLE_ANDROID_3, RecipeType.ENHANCED_CRAFTING_TABLE,
|
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}) {
|
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}) {
|
||||||
|
|
||||||
@ -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})
|
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);
|
.registerChargeableBlock(true, 512);
|
||||||
|
|
||||||
|
|
||||||
new TrashCan(Categories.CARGO, (SlimefunItemStack) SlimefunItems.TRASH_CAN, RecipeType.ENHANCED_CRAFTING_TABLE,
|
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})
|
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);
|
.register(true);
|
||||||
|
@ -49,6 +49,7 @@ public class CargoManagerBlock extends SlimefunItem {
|
|||||||
@Override
|
@Override
|
||||||
public void onRightClick(PlayerRightClickEvent e) {
|
public void onRightClick(PlayerRightClickEvent e) {
|
||||||
Optional<Block> block = e.getClickedBlock();
|
Optional<Block> block = e.getClickedBlock();
|
||||||
|
|
||||||
if (block.isPresent()) {
|
if (block.isPresent()) {
|
||||||
Player p = e.getPlayer();
|
Player p = e.getPlayer();
|
||||||
Block b = block.get();
|
Block b = block.get();
|
||||||
|
@ -2,6 +2,7 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
|
|||||||
|
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
import java.util.concurrent.ThreadLocalRandom;
|
||||||
|
|
||||||
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.Furnace;
|
import org.bukkit.block.Furnace;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
@ -51,19 +52,21 @@ public class EnhancedFurnace extends SimpleSlimefunItem<BlockTicker> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void tick(Block b, SlimefunItem item, Config data) {
|
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
|
// The Furnace has been destroyed, we can clear the block data
|
||||||
BlockStorage.clearBlockInfo(b);
|
BlockStorage.clearBlockInfo(b);
|
||||||
}
|
}
|
||||||
else if (((Furnace) b.getState()).getCookTime() > 0) {
|
else {
|
||||||
Furnace furnace = (Furnace) b.getState();
|
Furnace furnace = (Furnace) b.getState();
|
||||||
|
|
||||||
int newCookTime = furnace.getCookTime() + getSpeed() * 10;
|
if (furnace.getCookTime() > 0) {
|
||||||
|
int newCookTime = furnace.getCookTime() + getSpeed() * 10;
|
||||||
|
|
||||||
if (newCookTime > 200) furnace.setCookTime((short) 188);
|
if (newCookTime > 200) furnace.setCookTime((short) 188);
|
||||||
else furnace.setCookTime((short) newCookTime);
|
else furnace.setCookTime((short) newCookTime);
|
||||||
|
|
||||||
furnace.update(true, false);
|
furnace.update(true, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
|
|||||||
Location l = b.getLocation().add(0.5, 1.2, 0.5);
|
Location l = b.getLocation().add(0.5, 1.2, 0.5);
|
||||||
boolean sound = false;
|
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.setVelocity(new Vector(0, 0.1, 0));
|
||||||
item.teleport(l);
|
item.teleport(l);
|
||||||
sound = true;
|
sound = true;
|
||||||
|
@ -201,6 +201,7 @@ public final class SlimefunManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SlimefunItem sfItem = SlimefunItem.getByItem(strippedItem);
|
SlimefunItem sfItem = SlimefunItem.getByItem(strippedItem);
|
||||||
|
|
||||||
if (sfItem instanceof Soulbound && !sfItem.isDisabled()) {
|
if (sfItem instanceof Soulbound && !sfItem.isDisabled()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -208,6 +209,7 @@ public final class SlimefunManager {
|
|||||||
ItemMeta im = item.getItemMeta();
|
ItemMeta im = item.getItemMeta();
|
||||||
return (im.hasLore() && im.getLore().contains(ChatColor.GRAY + "Soulbound"));
|
return (im.hasLore() && im.getLore().contains(ChatColor.GRAY + "Soulbound"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user