From 841b2003bb02007c2621bdb4325ec3bd47548052 Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Wed, 24 Jun 2020 21:33:22 +0300 Subject: [PATCH 01/32] Added 1.13 compability for auto drier. --- .../slimefun4/implementation/SlimefunItems.java | 2 +- .../slimefun4/implementation/setup/SlimefunItemSetup.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java index 6131fd18a..0c9c7ae9b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java @@ -803,7 +803,7 @@ public final class SlimefunItems { else { TABLE_SAW = null; MAKESHIFT_SMELTERY = new SlimefunItemStack("MAKESHIFT_SMELTERY", Material.FURNACE, "&eMakeshift Smeltery", "", "&rImprovised version of the Smeltery", "&rthat only allows you to", "&rsmelt dusts into ingots"); - AUTO_DRIER = null; + AUTO_DRIER = new SlimefunItemStack("AUTO_DRIER", Material.FURNACE, "&eAuto Drier", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(10)); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java index 1579b5dc5..1e033269b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java @@ -1966,11 +1966,9 @@ public final class SlimefunItemSetup { }.register(plugin); - if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_14)) { - new AutoDrier(categories.electricity, SlimefunItems.AUTO_DRIER, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {null, null, null, SlimefunItems.HEATING_COIL, new ItemStack(Material.SMOKER), SlimefunItems.HEATING_COIL, null, new ItemStack(Material.CAMPFIRE), null}) - .register(plugin); - } + new AutoDrier(categories.electricity, SlimefunItems.AUTO_DRIER, RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[] {null, null, null, SlimefunItems.HEATING_COIL, new ItemStack(Material.SMOKER), SlimefunItems.HEATING_COIL, null, new ItemStack(Material.CAMPFIRE), null}) + .register(plugin); new ElectricPress(categories.electricity, SlimefunItems.ELECTRIC_PRESS, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {new ItemStack(Material.PISTON), SlimefunItems.ELECTRIC_MOTOR, new ItemStack(Material.PISTON), null, SlimefunItems.MEDIUM_CAPACITOR, null, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.DAMASCUS_STEEL_INGOT}) { From 6276029aec0d213f38531a62851b9440445093c6 Mon Sep 17 00:00:00 2001 From: Luu7 Date: Thu, 25 Jun 2020 01:46:53 +0000 Subject: [PATCH 02/32] Translate messages_es.yml via GitLocalize --- src/main/resources/languages/messages_es.yml | 533 ++++++++++--------- 1 file changed, 269 insertions(+), 264 deletions(-) diff --git a/src/main/resources/languages/messages_es.yml b/src/main/resources/languages/messages_es.yml index e78e376e5..d69e40244 100644 --- a/src/main/resources/languages/messages_es.yml +++ b/src/main/resources/languages/messages_es.yml @@ -1,248 +1,138 @@ --- -android: - scripts: - already-uploaded: "&4Este script ya ha sido subido." - editor: Editor de Guión - enter-name: - - - - "&ePor favor, escribe en el chat el nombre para tu script." - instructions: - ATTACK_ANIMALS: "&4Atacar &c(Animales)" - ATTACK_ANIMALS_ADULT: "&4Atacar &c(Animales &7[Adultos]&c)" - ATTACK_MOBS: "&4Atacar &c(Mobs Hostiles)" - ATTACK_MOBS_ANIMALS: "&4Atacar &c(Mobs Hostiles y Animales)" - CATCH_FISH: "&bPescar" - CHOP_TREE: "&cTalar y Replantar" - DIG_DOWN: "&bCavar abajo" - DIG_FORWARD: "&bCavar adelante" - DIG_UP: "&bCavar arriba" - FARM_DOWN: "&bCosechar y Replantar &7(En el bloque de abajo)" - FARM_EXOTIC_DOWN: "&bCosechar y Replantar Avanzado &7(En el bloque de abajo)" - FARM_EXOTIC_FORWARD: "&bCosechar y Replantar Avanzado" - FARM_FORWARD: "&bCosechar y Replantar" - GO_DOWN: "&7Mover hacia abajo" - GO_FORWARD: "&7Mover hacia adelante" - GO_UP: "&7Mover hacia arriba" - INTERFACE_FUEL: "&9Extraer el combustible de la interfaz que se mira." - INTERFACE_ITEMS: "&9Empujar el contenido del inventario a la interfaz que se - mira." - MOVE_AND_DIG_DOWN: "&bMover y Cavar abajo" - MOVE_AND_DIG_FORWARD: "&bMover y Cavar adelante" - MOVE_AND_DIG_UP: "&bMover y Cavar arriba" - REPEAT: "&9Repetir Script" - START: "&2Iniciar Script" - TURN_LEFT: "&7Girar a la izquierda" - TURN_RIGHT: "&7Girar a la derecha" - WAIT: "&eEsperar 0.5s" - rating: - already: "&4¡Ya has calificado este script!" - own: "&4¡No puedes calificar tu propio script!" - uploaded: - - "&bSubiendo..." - - "&a¡Script cargado correctamente!" - started: "&7Tu androide ha comenzado a correr el script." - stopped: "&7Tu androide ha pausado el script." -anvil: - not-working: "&4¡No puedes usar objetos de Slimefun en un yunque!" -backpack: - already-open: "&cPerdón, ¡Esta mochila esta abierta en otro lugar!" - no-stack: "&cNo puedes juntar mochilas." commands: + help: Muestra estos mensajes de ayuda. cheat: Te da objetos con trucos. give: Da a alguien algún objeto de Slimefun. guide: Obtén la guia de Slimefun. - help: Muestra estos mensajes de ayuda. + timings: Información del lag de tu servidor. + teleporter: Ve los Waypoints de otros jugadores. + versions: Lista los Addons instalados. + search: Busca en la guía el término dado. open_guide: Abre la guía de Slimefun sin usar el libro. + stats: Muestra algunos Stats de un Jugador. research: description: Desbloquea/Reinicia el conocimiento para un jugador. reset: "&cHas reiniciado el conocimiento de %player%." reset-target: "&cTu conocimiento fue reiniciado." - search: Busca en la guía el término dado. - stats: Muestra algunos Stats de un Jugador. - teleporter: Ve los Waypoints de otros jugadores. - timings: Información del lag de tu servidor. - versions: Lista los Addons instalados. backpack: description: Obtén una copia de una mochila existente invalid-id: "&4¡El ID ha de ser un número positivo!" player-never-joined: "&4¡Ningún jugador con ese nombre pudo ser encontrado!" backpack-does-not-exist: "&4¡La mochila especificada no existe!" restored-backpack-given: "&a¡Tu mochila ha sido restaurada y añadida a tu inventario!" -gps: - deathpoint: "&4Punto de Muerte &7%date%" - geo: - scan-required: "&4?GEO-Scan requerido! &c¡Escanea este chunk usando un GEO-Scanner - primero!" - insufficient-complexity: - - "&4Complejidad de red GPS insuficiente: &c%complexity%" - - "&4a) No tienes una red GPS armada aún." - - "&4b) Tu red GPS no es lo suficientemente compleja." - waypoint: - added: "&aNuevo waypoint agregado exitosamente." - max: "&4Has alcanzado el máximo número de waypoints permitidos." - new: "&ePor favor, escribe en el chat el nombre de tu nuevo waypoint. &7(¡Se permiten - códigos de color!)" guide: - back: - guide: Volver a la guía de Slimefun - settings: Volver al panel de configuración - title: Volver + search: + message: "&b¿Qué te gustaría buscar?" + name: "&7Busca..." + tooltip: "&bClick para buscar un item" + inventory: 'Buscando: %item%' + lore: + - "&b¿Qué te gustaría buscar?" + - "&7Escribe en el chat el término que quieres buscar." cheat: no-multiblocks: "&4¡No puedes obtener los Multiblocks, tienes que construirlos!" - credits: - commit: Contribución - commits: Contribuciones - profile-link: Clic para visitar su perfil en GitHub. - roles: - developer: "&6Desarrollador" - resourcepack: "&cArtista de Resourcepack" - translator: "&9Traductor" - wiki: "&3Editor de Wiki" languages: + updated: "&aTu lenguaje fue cambiado a: &b%lang%" + translations: + name: "&a¿Falta algo?" + lore: Clic para agregar tu propia traducción. select: Clic para seleccionar este idioma. select-default: Clic para seleccionar el idioma predeterminado. selected-language: 'Actualmente seleccionado:' - translations: - lore: Clic para agregar tu propia traducción. - name: "&a¿Falta algo?" - updated: "&aTu lenguaje fue cambiado a: &b%lang%" + title: + main: Guía de Slimefun. + settings: Configuración e Información. + languages: Selecciona tu idioma. + credits: Colaboradores de Slimefun4 + wiki: Wiki de Slimefun4 + addons: Complementos para Slimefun4 + bugs: Reportes de Bugs + source: Código base + credits: + commit: Contribución + commits: Contribuciones + roles: + developer: "&6Desarrollador" + wiki: "&3Editor de Wiki" + resourcepack: "&cArtista de Resourcepack" + translator: "&9Traductor" + profile-link: Clic para visitar su perfil en GitHub. + pages: + previous: Página anterior + next: Página siguiente + tooltips: + open-category: Clic para abrir + versions-notice: "¡Esto es muy importante cuando se reportan bugs!" + wiki: Ve este objeto en la wiki oficial de Slimefun + recipes: + machine: Recetas hechas en esta máquina + miner: Recursos que puedes obtener con el Miner + generator: Tipos de combustible disponibles + gold-pan: Recursos que puedes obtener + back: + title: Volver + guide: Volver a la guía de Slimefun + settings: Volver al panel de configuración locked: BLOQUEADO locked-category: - Para desbloquear esta categoría deberás - desbloquear todos los objetos de las - siguientes categorías - pages: - next: Página siguiente - previous: Página anterior - search: - inventory: 'Buscando: %item%' - lore: - - "&b¿Qué te gustaría buscar?" - - "&7Escribe en el chat el término que quieres buscar." - message: "&b¿Qué te gustaría buscar?" - name: "&7Busca..." - tooltip: "&bClick para buscar un item" - title: - addons: Complementos para Slimefun4 - bugs: Reportes de Bugs - credits: Colaboradores de Slimefun4 - languages: Selecciona tu idioma. - main: Guía de Slimefun. - settings: Configuración e Información. - source: Código base - wiki: Wiki de Slimefun4 - tooltips: - open-category: Clic para abrir - recipes: - generator: Tipos de combustible disponibles - gold-pan: Recursos que puedes obtener - machine: Recetas hechas en esta máquina - miner: Recursos que puedes obtener con el Miner - versions-notice: "¡Esto es muy importante cuando se reportan bugs!" - wiki: Ve este objeto en la wiki oficial de Slimefun -inventory: - no-access: "&4No tienes permitido el acceso a este bloque." -languages: - af: Africano - ar: Árabe - be: Bielorruso - bg: Búlgaro - cs: Checo - da: Danés - de: Alemán - default: Predeterminado - el: Griego - en: Inglés - es: Español - fa: Persa - fi: Finés - fr: Francés - he: Hebreo - hr: Croata - hu: Húngaro - id: Indonesio - it: Italiano - ja: Japonés - ko: Coreano - lv: Letón - mk: Macedónio - ms: Malayo - nl: Holandés - 'no': Noruego - pl: Polaco - pt: Portugués (Portugal) - pt-BR: Portugués (Brasil) - ro: Rumano - ru: Ruso - sk: Esloveno - sr: Serbio - sv: Sueco - th: Tailandés - tr: Turco - uk: Ucraniano - vi: Vietnamita - zh-CN: Chino (China) - zh-TW: Chino (Taiwan) -machines: - ANCIENT_ALTAR: - not-enough-pedestals: "&4El Altar no está rodeado por la cantidad correcta de - pedestales &c(%pedestals% / 8)" - unknown-catalyst: "&4¡Catalyst desconocido! &cUsa la receta correcta!" - unknown-recipe: "&4¡Receta desconocida! &c¡Usa la receta correcta!" - ANCIENT_PEDESTAL: - obstructed: "&4¡El Pedestal está obstruido! &c¡Quita lo que se encuentra encima!" - CARGO_NODES: - must-be-placed: "&4¡Tiene que ponerse sobre un cofre o máquina!" - ELEVATOR: - click-to-teleport: "&eClic &7para ir a este piso:" - current-floor: "&eTe encuentras en este piso:" - enter-name: "&7Por favor, escribe en el chat el nombre para el piso deseado. &r(¡Se - permiten códigos de color!)" - named: "&2Has dado nombre a este piso: &r%floor%" - no-destinations: "&4No se han encontrado destinos." - pick-a-floor: "&3- Selecciona un piso -" - full-inventory: "&e¡Perdón, mi inventario esta lleno!" - GPS_CONTROL_PANEL: - title: GPS - Panel de Control - transmitters: Visor General de Transmisores - waypoints: Visor de Waypoints - HOLOGRAM_PROJECTOR: - enter-text: "&7Por favor, escribe en el chat el texto deseado. &r(¡Se permiten - códigos de color!)" - inventory-title: Editor de Holograma - ignition-chamber-no-flint: "&cEl Ignition Chamber no tiene pedernal." - in-use: "&cEl inventario de este bloque esta siendo usado por otro jugador." - pattern-not-found: "&eLo siento, no puedo reconocer esta receta. Por favor coloca - el objeto en el patrón correcto dentro del dispensador." - TELEPORTER: - cancelled: "&4¡Teletransportación cancelada!" - gui: - time: Tiempo estimado - title: Tus waypoints - tooltip: Click para teletransportarte - invulnerability: "&b&l¡Tienes 30 segundos de invulnerabilidad!" - teleported: "&3¡Teletransportado!" - teleporting: "&3Teletransportando..." - unknown-material: "&eLo siento, no puedo reconocer el objeto en mi dispensador. - Por favor coloca algo que si conozca." - wrong-item: "&eLo siento, no puedo reconocer el objeto con el que me has hecho clic. - Revisa las recetas y mira que objetos puedes usar." - INDUSTRIAL_MINER: - no-fuel: "&c¡Tu Industrial Miner se ha quedado sin combustible! Pon combustible - en el cofre de encima." - piston-facing: "&c¡Tu Industrial Miner requiere pistones para mirar hacia arriba!" - piston-space: "&c¡Los dos pistones han de tener un bloque de aire encima de ellos!" - destroyed: "&cAl parecer tu Industrial Miner ha sido destruido..." - already-running: "&c¡Este Industrial Miner ya está en funcionamiento!" - full-chest: "&c¡El cofre de tu Industrial Miner está lleno!" - no-permission: "&4¡No tienes permisos para operar un Industrial Miner aquí!" - finished: "&e?¡Tu Industrial Miner ha acabado! ¡Obtuvo un total de %ores% mineral(es)!" messages: - cannot-place: "&c¡No puedes colocar ese bloque ahí!" - diet-cookie: "&eEmpiezas a sentirte muy ligero ..." + not-researched: "&4No tienes conocimiento suficiente para entender esto." + not-enough-xp: "&4No tienes suficiente XP para desbloquear esto." + unlocked: '&bHas desbloqueado &7"%research%"' + only-players: "&4Este comando es solo para jugadores." + unknown-player: "&4Jugador desconocido: &c%player%" + no-permission: "&4No tienes el permiso requerido para hacer esto." + usage: "&4Uso: &c%usage%" + not-online: "&c¡&4%player% &cno está conectado!" + not-valid-item: "&c¡&4%item% &cno es un objeto válido!" + not-valid-amount: "&c¡&4%amount% &cno es un valor válido: tiene que ser mayor a + 0!" + given-item: '&bTe han dado &a%amount% &7"%item%&7"' + give-item: '&bLe has dado a %player%, &a%amount% &7"%item%&7"' + not-valid-research: "&c¡&4%research% &cno es un conocimiento válido!" + give-research: '&bLe has dado a %player% la investigación &7"%research%&7"' + hungry: "&c¡Tienes demasiada hambre para hacer eso!" + mode-change: 'El modo de &b%device% ha cambiado a: &9%mode%' disabled-in-world: "&4&lEste item ha sido desactivado en el mundo." disabled-item: "&4&l¡Este item ha sido desactivado! ¿Cómo es que lo tienes?" + no-tome-yourself: "&cNo puedes usar el &4Tome of Knowledge &cen ti mismo..." + multimeter: "&bEnergía almacenada: &3%stored% &b/ &3%capacity%" + talisman: + anvil: "&a&oEl talismán salvó tu herramienta de ser destruida." + miner: "&a&oTu talismán ha duplicado los minerales." + hunter: "&a&oTu talismán ha duplicado el botín" + lava: "&a&oTu talismán ha evitado que te quemes en lava." + water: "&a&oTu talismán ha evitado que mueras ahogado." + angel: "&a&oTu talismán ha evitado que sufras daño por caída." + fire: "&a&oTu talismán ha evitado que te rostices hasta la muerte." + magician: "&a&oTu talismán te ha dado un encantamiento adicional." + traveller: "&a&oTu talismán te ha dado un impulso de velocidad." + warrior: "&a&oTu talismán te ha hecho más fuerte por un tiempo." + knight: "&a&oTu talismán te ha dado 5 segundos de regeneración." + whirlwind: "&a&oTu talismán ha reflejado un proyectil." + wizard: "&a&oTu talismán te ha dado un mayor nivel de fortuna, pero pudo disminuír + el nivel de otros encantamientos." + soulbound-rune: + fail: "&cSolo puedes ligar un objeto a tu alma." + success: "&a¡Has ligado este objeto a tu alma exitosamente! No lo perderás al + morir." + research: + start: "&7Los espíritus antiguos susurran palabras crípticas en tu oído..." + progress: "&7Empiezas a pensar sobre &b%research% &e(%progress%)" fire-extinguish: "&7Has dejado de quemarte." + cannot-place: "&c¡No puedes colocar ese bloque ahí!" + no-pvp: "&c¡No puedes pelear aquí!" + radiation: "&4¡Te has expuesto a radiación mortal! &c¡Desaste del objeto radiactivo + o equipate un traje HazMat!" + opening-guide: "&bAbriendo la guía, esto puede tomar unos segundos..." + opening-backpack: "&bAbriendo la mochila, esto podría tomar unos segundos..." + no-iron-golem-heal: "&cEso no es un lingote de hierro. ¡No puedes usar esto para + sanar a los Golems de Hierro!" + link-prompt: "&eHaga clic aquí:" + diet-cookie: "&eEmpiezas a sentirte muy ligero ..." fortune-cookie: - "&7¡Ayuda, estoy atrapado en una fábrica de galletas de la fortuna!" - "&7Morirás mañana... por un Creeper." @@ -256,56 +146,171 @@ messages: - "&742. La respuesta es 42." - "&7Un Walshy al día mantendrá alejados los problemas." - "&7¡Nunca caves hacia abajo!" - give-item: '&bLe has dado a %player%, &a%amount% &7"%item%&7"' - given-item: '&bTe han dado &a%amount% &7"%item%&7"' - give-research: '&bLe has dado a %player% la investigación &7"%research%&7"' - hungry: "&c¡Tienes demasiada hambre para hacer eso!" - link-prompt: "&eHaga clic aquí:" - mode-change: 'El modo de &b%device% ha cambiado a: &9%mode%' - multimeter: "&bEnergía almacenada: &3%stored% &b/ &3%capacity%" - no-iron-golem-heal: "&cEso no es un lingote de hierro. ¡No puedes usar esto para - sanar a los Golems de Hierro!" - no-permission: "&4No tienes el permiso requerido para hacer esto." - no-pvp: "&c¡No puedes pelear aquí!" - not-enough-xp: "&4No tienes suficiente XP para desbloquear esto." - no-tome-yourself: "&cNo puedes usar el &4Tome of Knowledge &cen ti mismo..." - not-online: "&c¡&4%player% &cno está conectado!" - not-researched: "&4No tienes conocimiento suficiente para entender esto." - not-valid-amount: "&c¡&4%amount% &cno es un valor válido: tiene que ser mayor a - 0!" - not-valid-item: "&c¡&4%item% &cno es un objeto válido!" - not-valid-research: "&c¡&4%research% &cno es un conocimiento válido!" - only-players: "&4Este comando es solo para jugadores." - opening-backpack: "&bAbriendo la mochila, esto podría tomar unos segundos..." - opening-guide: "&bAbriendo la guía, esto puede tomar unos segundos..." - radiation: "&4¡Te has expuesto a radiación mortal! &c¡Desaste del objeto radiactivo - o equipate un traje HazMat!" - research: - progress: "&7Empiezas a pensar sobre &b%research% &e(%progress%)" - start: "&7Los espíritus antiguos susurran palabras crípticas en tu oído..." - soulbound-rune: - fail: "&cSolo puedes ligar un objeto a tu alma." - success: "&a¡Has ligado este objeto a tu alma exitosamente! No lo perderás al - morir." - talisman: - angel: "&a&oTu talismán ha evitado que sufras daño por caída." - anvil: "&a&oEl talismán salvó tu herramienta de ser destruida." - fire: "&a&oTu talismán ha evitado que te rostices hasta la muerte." - hunter: "&a&oTu talismán ha duplicado el botín" - knight: "&a&oTu talismán te ha dado 5 segundos de regeneración." - lava: "&a&oTu talismán ha evitado que te quemes en lava." - magician: "&a&oTu talismán te ha dado un encantamiento adicional." - miner: "&a&oTu talismán ha duplicado los minerales." - traveller: "&a&oTu talismán te ha dado un impulso de velocidad." - warrior: "&a&oTu talismán te ha hecho más fuerte por un tiempo." - water: "&a&oTu talismán ha evitado que mueras ahogado." - whirlwind: "&a&oTu talismán ha reflejado un proyectil." - wizard: "&a&oTu talismán te ha dado un mayor nivel de fortuna, pero pudo disminuír - el nivel de otros encantamientos." - unknown-player: "&4Jugador desconocido: &c%player%" - unlocked: '&bHas desbloqueado &7"%research%"' - usage: "&4Uso: &c%usage%" -miner: - no-ores: "&ePerdón, ¡No encuentro ningún mineral cerca!" + - "&7¡Solo un raspón!" + - "&7¡Siempre mira el lado bueno de la vida!" + - "&7Esta era un bizcocho y no una galleta" + - "&7¡Los signos de neón son lo MEJOR!" +machines: + pattern-not-found: "&eLo siento, no puedo reconocer esta receta. Por favor coloca + el objeto en el patrón correcto dentro del dispensador." + unknown-material: "&eLo siento, no puedo reconocer el objeto en mi dispensador. + Por favor coloca algo que si conozca." + wrong-item: "&eLo siento, no puedo reconocer el objeto con el que me has hecho clic. + Revisa las recetas y mira que objetos puedes usar." + full-inventory: "&e¡Perdón, mi inventario esta lleno!" + in-use: "&cEl inventario de este bloque esta siendo usado por otro jugador." + ignition-chamber-no-flint: "&cEl Ignition Chamber no tiene pedernal." + ANCIENT_ALTAR: + not-enough-pedestals: "&4El Altar no está rodeado por la cantidad correcta de + pedestales &c(%pedestals% / 8)" + unknown-catalyst: "&4¡Catalyst desconocido! &cUsa la receta correcta!" + unknown-recipe: "&4¡Receta desconocida! &c¡Usa la receta correcta!" + ANCIENT_PEDESTAL: + obstructed: "&4¡El Pedestal está obstruido! &c¡Quita lo que se encuentra encima!" + HOLOGRAM_PROJECTOR: + enter-text: "&7Por favor, escribe en el chat el texto deseado. &r(¡Se permiten + códigos de color!)" + inventory-title: Editor de Holograma + ELEVATOR: + no-destinations: "&4No se han encontrado destinos." + pick-a-floor: "&3- Selecciona un piso -" + current-floor: "&eTe encuentras en este piso:" + click-to-teleport: "&eClic &7para ir a este piso:" + enter-name: "&7Por favor, escribe en el chat el nombre para el piso deseado. &r(¡Se + permiten códigos de color!)" + named: "&2Has dado nombre a este piso: &r%floor%" + TELEPORTER: + teleporting: "&3Teletransportando..." + teleported: "&3¡Teletransportado!" + cancelled: "&4¡Teletransportación cancelada!" + invulnerability: "&b&l¡Tienes 30 segundos de invulnerabilidad!" + gui: + title: Tus waypoints + tooltip: Click para teletransportarte + time: Tiempo estimado + CARGO_NODES: + must-be-placed: "&4¡Tiene que ponerse sobre un cofre o máquina!" + GPS_CONTROL_PANEL: + title: GPS - Panel de Control + transmitters: Visor General de Transmisores + waypoints: Visor de Waypoints + INDUSTRIAL_MINER: + no-fuel: "&c¡Tu Industrial Miner se ha quedado sin combustible! Pon combustible + en el cofre de encima." + piston-facing: "&c¡Tu Industrial Miner requiere pistones para mirar hacia arriba!" + piston-space: "&c¡Los dos pistones han de tener un bloque de aire encima de ellos!" + destroyed: "&cAl parecer tu Industrial Miner ha sido destruido..." + already-running: "&c¡Este Industrial Miner ya está en funcionamiento!" + full-chest: "&c¡El cofre de tu Industrial Miner está lleno!" + no-permission: "&4¡No tienes permisos para operar un Industrial Miner aquí!" + finished: "&e?¡Tu Industrial Miner ha acabado! ¡Obtuvo un total de %ores% mineral(es)!" +anvil: + not-working: "&4¡No puedes usar objetos de Slimefun en un yunque!" +backpack: + already-open: "&cPerdón, ¡Esta mochila esta abierta en otro lugar!" + no-stack: "&cNo puedes juntar mochilas." workbench: not-enhanced: "&4No puedes usar objetos de Slimefun en una mesa de crafteo normal." +gps: + deathpoint: "&4Punto de Muerte &7%date%" + waypoint: + new: "&ePor favor, escribe en el chat el nombre de tu nuevo waypoint. &7(¡Se permiten + códigos de color!)" + added: "&aNuevo waypoint agregado exitosamente." + max: "&4Has alcanzado el máximo número de waypoints permitidos." + insufficient-complexity: + - "&4Complejidad de red GPS insuficiente: &c%complexity%" + - "&4a) No tienes una red GPS armada aún." + - "&4b) Tu red GPS no es lo suficientemente compleja." + geo: + scan-required: "&4?GEO-Scan requerido! &c¡Escanea este chunk usando un GEO-Scanner + primero!" +inventory: + no-access: "&4No tienes permitido el acceso a este bloque." +android: + started: "&7Tu androide ha comenzado a correr el script." + stopped: "&7Tu androide ha pausado el script." + scripts: + already-uploaded: "&4Este script ya ha sido subido." + instructions: + START: "&2Iniciar Script" + REPEAT: "&9Repetir Script" + WAIT: "&eEsperar 0.5s" + GO_FORWARD: "&7Mover hacia adelante" + GO_UP: "&7Mover hacia arriba" + GO_DOWN: "&7Mover hacia abajo" + TURN_LEFT: "&7Girar a la izquierda" + TURN_RIGHT: "&7Girar a la derecha" + DIG_UP: "&bCavar arriba" + DIG_FORWARD: "&bCavar adelante" + DIG_DOWN: "&bCavar abajo" + MOVE_AND_DIG_UP: "&bMover y Cavar arriba" + MOVE_AND_DIG_FORWARD: "&bMover y Cavar adelante" + MOVE_AND_DIG_DOWN: "&bMover y Cavar abajo" + ATTACK_MOBS_ANIMALS: "&4Atacar &c(Mobs Hostiles y Animales)" + ATTACK_MOBS: "&4Atacar &c(Mobs Hostiles)" + ATTACK_ANIMALS: "&4Atacar &c(Animales)" + ATTACK_ANIMALS_ADULT: "&4Atacar &c(Animales &7[Adultos]&c)" + CHOP_TREE: "&cTalar y Replantar" + CATCH_FISH: "&bPescar" + FARM_FORWARD: "&bCosechar y Replantar" + FARM_DOWN: "&bCosechar y Replantar &7(En el bloque de abajo)" + FARM_EXOTIC_FORWARD: "&bCosechar y Replantar Avanzado" + FARM_EXOTIC_DOWN: "&bCosechar y Replantar Avanzado &7(En el bloque de abajo)" + INTERFACE_ITEMS: "&9Empujar el contenido del inventario a la interfaz que se + mira." + INTERFACE_FUEL: "&9Extraer el combustible de la interfaz que se mira." + enter-name: + - + - "&ePor favor, escribe en el chat el nombre para tu script." + uploaded: + - "&bSubiendo..." + - "&a¡Script cargado correctamente!" + rating: + own: "&4¡No puedes calificar tu propio script!" + already: "&4¡Ya has calificado este script!" + editor: Editor de Guión +languages: + default: Predeterminado + en: Inglés + de: Alemán + fr: Francés + it: Italiano + es: Español + pl: Polaco + sv: Sueco + nl: Holandés + cs: Checo + hu: Húngaro + lv: Letón + ru: Ruso + sk: Esloveno + zh-TW: Chino (Taiwan) + vi: Vietnamita + id: Indonesio + zh-CN: Chino (China) + el: Griego + he: Hebreo + pt: Portugués (Portugal) + pt-BR: Portugués (Brasil) + ar: Árabe + af: Africano + da: Danés + fi: Finés + uk: Ucraniano + ms: Malayo + 'no': Noruego + ja: Japonés + fa: Persa + th: Tailandés + ro: Rumano + bg: Búlgaro + ko: Coreano + tr: Turco + hr: Croata + mk: Macedónio + sr: Serbio + be: Bielorruso + tl: Tagalog +miner: + no-ores: "&ePerdón, ¡No encuentro ningún mineral cerca!" From bdf738938b17bb12317737b729a809c73c6452fc Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 01:46:54 +0000 Subject: [PATCH 03/32] Translate messages_es.yml via GitLocalize From 365f809d01ff8299b419dd54354a4f22c9b565cb Mon Sep 17 00:00:00 2001 From: Vravinite Date: Thu, 25 Jun 2020 01:46:55 +0000 Subject: [PATCH 04/32] Translate messages_es.yml via GitLocalize From 813e72b5b4c16fa6cff083e5050308c75613d506 Mon Sep 17 00:00:00 2001 From: Vravinite Date: Thu, 25 Jun 2020 02:10:20 +0000 Subject: [PATCH 05/32] Translate researches_es.yml via GitLocalize --- .../resources/languages/researches_es.yml | 422 +++++++++--------- 1 file changed, 212 insertions(+), 210 deletions(-) diff --git a/src/main/resources/languages/researches_es.yml b/src/main/resources/languages/researches_es.yml index d27fed9d9..92a533964 100644 --- a/src/main/resources/languages/researches_es.yml +++ b/src/main/resources/languages/researches_es.yml @@ -1,236 +1,238 @@ --- slimefun: - 24k_gold_block: El Dorado - advanced_android: Androides Avanzados - advanced_butcher_android: Androides Avanzados - Carnicero - advanced_circuit_board: Placa de Circuito Avanzada - advanced_electric_smeltery: Fundición Eléctrica Avanzada - advanced_farmer_android: Androides Avanzados - Granjero - advanced_fisherman_android: Androides Avanzados - Pescador - advanced_output_node: Nodo de Salida Avanzado - alloys: Aleaciones Avanzadas - ancient_altar: Altar Antiguo - ancient_runes: Runas Elementales - android_interfaces: Interfaz de Androide - android_memory_core: Núcleo de Memoria - angel_talisman: Talismán del Ángel - animal_growth_accelerator: Manipulación del Crecimiento Animal - anvil_talisman: Talismán del Herrero - armored_jetboots: Botas Jet Blindadas - armored_jetpack: Jetpack Blindado + walking_sticks: Bastones + portable_crafter: Mesa de Crafteo Portatil + fortune_cookie: Galleta de la Fortuna + portable_dustbin: Bote de Basura Portatil + meat_jerky: Carne Seca armor_forge: Forja de Armaduras - auto_anvil: Yunque Automático - auto_breeder: Auto-Alimentacion - auto_drier: Un día seco - auto_enchanting: Encantar y Desencantar Automático - automated_crafting_chamber: Crafteo Automatizado - automated_panning_machine: Gold Pan Automatizado - automatic_ignition_chamber: Cámara de Ignición Automática - backpacks: Mochilas + glowstone_armor: Armadura de Piedra Luminosa + lumps: Masas y Magia + ender_backpack: Mochila Ender + ender_armor: Armadura de Ender + magic_eye_of_ender: Ojo Mágico de Ender + magic_sugar: Azúcar Mágica + monster_jerky: Jamón de Monstruo + slime_armor: Armadura de Slime + sword_of_beheading: Espada Decapitadora basic_circuit_board: Placa de Circuito Básico + advanced_circuit_board: Placa de Circuito Avanzada + smeltery: Taller de Fundición + steel: Edad de Acero + misc_power_items: Objetos importantes relacionados con la energía battery: Tu primera Batería - better_carbon_press: Prensa de Carbón Mejorada - better_crop_growth_accelerator: Acelerador de Cultivos Mejorado - better_electric_crucibles: Crisoles Calientes - better_electric_furnace: Horno Eléctrico Mejorado - better_food_fabricator: Fabricación de Alimentos Mejorado - better_freezer: Congelador Mejorado - better_gps_transmitters: Transmisores Mejorados - better_heated_pressure_chamber: Maquina de Presión Caliente Mejorada - better_solar_generators: Paneles Solares Mejorados - bio_reactor: Reactor Biológico - blade_of_vampires: Espada Vampírica - blistering_ingots: Radiación Burbujeante - block_placer: Colocador de Bloques - boosted_uranium: Círculo Interminable - boots_of_the_stomper: Botas del Mamút - bound_armor: Armadura Ligada - bound_backpack: Almacenamiento Ligado - bound_tools: Herramientas Ligadas - bound_weapons: Armas Ligadas - bronze: Creación de Bronce - butcher_androids: Androides Carniceros + steel_plate: Placa de Acero + steel_thruster: Propulsor de Acero + parachute: Paracaídas + grappling_hook: Gancho + jetpacks: Jetpacks + multitools: Multi Herramientas + solar_panel_and_helmet: Energía solar + elemental_staff: Bastónes Elementales + grind_stone: Piedra de Moler cactus_armor: Armadura de Cactus - capacitors: Capacitador LVL I - carbonado: Diamantes Negros - carbonado_furnace: Horno de Carbonado - carbonado_tools: Máquinas de Punta - carbon_press: Prensa de Carbón - cargo_basics: Fundamentos de Cargas - cargo_nodes: Configuración de Carga - chainmail_armor: Armadura de Cota de Malla - charging_bench: Mesa de Carga - coal_generator: Generador de Carbón - cobalt_pickaxe: Pico Veloz - combustion_reactor: Reactor de Combustión - common_talisman: Talismán Común - composter: Compostando Tierra + gold_pan: Colador + magical_book_cover: Portada de Libro Mágico + slimefun_metals: Nuevos Metales + ore_crusher: Duplicador de Minerales + bronze: Creación de Bronce + alloys: Aleaciones Avanzadas compressor_and_carbon: Creaciones de Carbón - cooler: Bebidas Portables - copper_wire: Conductividad de Baja Potencia - crop_growth_accelerator: Acelerador de Cultivos - crucible: Crisol - crushed_ore: Purificación de Minerales + gilded_iron_armor: Armadura de Hierro Brillante + synthetic_diamond: Diamantes Sintéticos + pressure_chamber: Cámara de Presión + synthetic_sapphire: Zafiros Sintéticos damascus_steel: Acero de Damasco damascus_steel_armor: Armadura de Damasco - diet_cookie: Galleta Dietética - duct_tape: Cinta Adhesiva - electric_crucible: Crisól Electrificado - electric_furnaces: Horno Eléctrico - electric_ingot_machines: Fabricación Eléctrica de Lingotes + reinforced_alloy: Aleación Reforzada + carbonado: Diamantes Negros + magic_workbench: Mesa de Trabajo Mágica + wind_staff: Bastón de Aire + reinforced_armor: Armadura Reforzada + ore_washer: Tamizador + gold_carats: Oro Puro + silicon: Silicon Valley + fire_staff: Vara de Fuego + smelters_pickaxe: Pico Fundidor + common_talisman: Talismán Común + anvil_talisman: Talismán del Herrero + miner_talisman: Talismán del Minero + hunter_talisman: Talismán del Cazador + lava_talisman: Talismán del Caminante de Lava + water_talisman: Talismán del Pez + angel_talisman: Talismán del Ángel + fire_talisman: Talismán del Bombero + lava_crystal: Situación Ardiente + magician_talisman: Talismán del Mago + traveller_talisman: Talismán del Explorador + warrior_talisman: Talismán del Guerrero + knight_talisman: Talismán del Caballero + gilded_iron: Hierro Brillante + synthetic_emerald: Gema Falsa + chainmail_armor: Armadura de Cota de Malla + whirlwind_talisman: Talismán del Tornado + wizard_talisman: Talismán del Hechizero + lumber_axe: Hacha de Leñador + hazmat_suit: Traje Haz-Mat + uranium: Radioactivo + crushed_ore: Purificación de Minerales + redstone_alloy: Aleación de Redstone + carbonado_tools: Máquinas de Punta + first_aid: Primeros Auxilios + gold_armor: Armadura Resplandeciente + night_vision_googles: Lentes de Visión Nocturna + pickaxe_of_containment: Pico de Contención + hercules_pickaxe: Pico de Hércules + table_saw: Sierra + slime_steel_armor: Armadura de Acero Pegajoso + blade_of_vampires: Espada Vampírica + water_staff: Bastón de Agua + 24k_gold_block: El Dorado + composter: Compostando Tierra + farmer_shoes: Zapatos de Granjero + explosive_tools: Herramientas Explosivas + automated_panning_machine: Gold Pan Automatizado + boots_of_the_stomper: Botas del Mamút + pickaxe_of_the_seeker: Pico del Buscador + backpacks: Mochilas + woven_backpack: Mochila Tejida + crucible: Crisol + gilded_backpack: 'Mochila Reforzada ' + armored_jetpack: Jetpack Blindado + ender_talismans: Talismán de Ender + nickel_and_cobalt: Aún más Minerales + magnet: Metales Magnéticos + infused_magnet: Imánes Aleados + cobalt_pickaxe: Pico Veloz + essence_of_afterlife: Necromancia + bound_backpack: Almacenamiento Ligado + jetboots: Botas Jet + armored_jetboots: Botas Jet Blindadas + seismic_axe: Hacha Sísmica + pickaxe_of_vein_mining: Pico de Menas + bound_weapons: Armas Ligadas + bound_tools: Herramientas Ligadas + bound_armor: Armadura Ligada + juicer: Bebidas Deliciosas + repaired_spawner: Spawners Reparados + enhanced_furnace: Horno Mejorado + more_enhanced_furnaces: Mejores Hornos + high_tier_enhanced_furnaces: Horno de Alto Nivel + reinforced_furnace: Horno Reforzado + carbonado_furnace: Horno de Carbonado electric_motor: Calentando Motores + block_placer: Colocador de Bloques + scroll_of_dimensional_teleposition: Volteando cosas por aquí + special_bows: Robin Hood + tome_of_knowledge_sharing: Compartiendo con amigos + flask_of_knowledge: Almacenamiento de EXP + hardened_glass: Resistiendo Explosiones + golden_apple_juice: Poción Dorada + cooler: Bebidas Portables + ancient_altar: Altar Antiguo + wither_proof_obsidian: Obsidiana contra Withers + ancient_runes: Runas Elementales + special_runes: Runas Púrpuras + infernal_bonemeal: Polvo de Hueso Infernal + rainbow_blocks: Bloques Arcoíris + infused_hopper: Tolva Aleada + wither_proof_glass: Vidrio contra Withers + duct_tape: Cinta Adhesiva + plastic_sheet: Plástico + android_memory_core: Núcleo de Memoria + oil: Aceite + fuel: Combustible + hologram_projector: Hologramas + capacitors: Capacitador LVL I + high_tier_capacitors: Capacitador LVL II + solar_generators: Generador Solar + electric_furnaces: Horno Eléctrico electric_ore_grinding: Triturar y Moler - electric_press: Prensa Eléctrica - electric_smeltery: Fundición Eléctrica - elemental_staff: Bastónes Elementales + heated_pressure_chamber: Máquina de Presión Caliente + coal_generator: Generador de Carbón + bio_reactor: Reactor Biológico + auto_enchanting: Encantar y Desencantar Automático + auto_anvil: Yunque Automático + multimeter: Medidor de Potencia + gps_setup: Configuración GPS Básica + gps_emergency_transmitter: Waypoint GPS de Emergencia + programmable_androids: Androide Programable + android_interfaces: Interfaz de Androide + geo_scanner: GEO-Escaner + combustion_reactor: Reactor de Combustión + teleporter: Componentes Base de Teletransportador + teleporter_activation_plates: Activación de Teletransportador + better_solar_generators: Paneles Solares Mejorados + better_gps_transmitters: Transmisores Mejorados elevator: Elevadores - elytra: Elytras + energized_solar_generator: Energía Solar a Tiempo Completo + energized_gps_transmitter: Transmisor de Punta + energy_regulator: Redes Energéticas 101 + butcher_androids: Androides Carniceros + organic_food: Comida Organica + auto_breeder: Auto-Alimentacion + advanced_android: Androides Avanzados + advanced_butcher_android: Androides Avanzados - Carnicero + advanced_fisherman_android: Androides Avanzados - Pescador + animal_growth_accelerator: Manipulación del Crecimiento Animal + xp_collector: Recolector de EXP + organic_fertilizer: Fertilizante Orgánico + crop_growth_accelerator: Acelerador de Cultivos + better_crop_growth_accelerator: Acelerador de Cultivos Mejorado + reactor_essentials: Esenciales de Reactores + nuclear_reactor: Planta de Energía Nuclear + freezer: Congelador + cargo_basics: Fundamentos de Cargas + cargo_nodes: Configuración de Carga + electric_ingot_machines: Fabricación Eléctrica de Lingotes + high_tier_electric_ingot_machines: Lingotes Super Rápidos + automated_crafting_chamber: Crafteo Automatizado + better_food_fabricator: Fabricación de Alimentos Mejorado + reactor_access_port: Interactua con tú Reactor + fluid_pump: Bomba de Liquidos + better_freezer: Congelador Mejorado + boosted_uranium: Círculo Interminable + trash_can: Basurero + advanced_output_node: Nodo de Salida Avanzado + carbon_press: Prensa de Carbón + electric_smeltery: Fundición Eléctrica + better_electric_furnace: Horno Eléctrico Mejorado + better_carbon_press: Prensa de Carbón Mejorada empowered_android: Androides Potenciados empowered_butcher_android: Androides Potenciados - Carnicero empowered_fisherman_android: Androides Potenciados - Pescador - ender_armor: Armadura de Ender - ender_backpack: Mochila Ender - ender_talismans: Talismán de Ender - energized_gps_transmitter: Transmisor de Punta - energized_solar_generator: Energía Solar a Tiempo Completo - energy_regulator: Redes Energéticas 101 - enhanced_furnace: Horno Mejorado - essence_of_afterlife: Necromancia - explosive_tools: Herramientas Explosivas - farmer_shoes: Zapatos de Granjero - fire_staff: Vara de Fuego - fire_talisman: Talismán del Bombero - first_aid: Primeros Auxilios - flask_of_knowledge: Almacenamiento de EXP - fluid_pump: Bomba de Liquidos - fortune_cookie: Galleta de la Fortuna - freezer: Congelador - fuel: Combustible - geo_miner: GEO-Minador - geo_scanner: GEO-Escaner - gilded_backpack: 'Mochila Reforzada ' - gilded_iron: Hierro Brillante - gilded_iron_armor: Armadura de Hierro Brillante - glowstone_armor: Armadura de Piedra Luminosa - gold_armor: Armadura Resplandeciente - gold_carats: Oro Puro - golden_apple_juice: Poción Dorada - gold_pan: Colador - gps_emergency_transmitter: Waypoint GPS de Emergencia - gps_setup: Configuración GPS Básica - grappling_hook: Gancho - grind_stone: Piedra de Moler - hardened_glass: Resistiendo Explosiones - hazmat_suit: Traje Haz-Mat - heated_pressure_chamber: Máquina de Presión Caliente - hercules_pickaxe: Pico de Hércules - high_tier_capacitors: Capacitador LVL II high_tier_carbon_press: Carbón Prensado Definitivo - high_tier_electric_ingot_machines: Lingotes Super Rápidos - high_tier_enhanced_furnaces: Horno de Alto Nivel - hologram_projector: Hologramas - hunter_talisman: Talismán del Cazador - infernal_bonemeal: Polvo de Hueso Infernal - infused_hopper: Tolva Aleada - infused_magnet: Imánes Aleados - jetboots: Botas Jet - jetpacks: Jetpacks - juicer: Bebidas Deliciosas - kelp_cookie: Algas Sabrosas - knight_talisman: Talismán del Caballero - lava_crystal: Situación Ardiente + wither_assembler: Mata Withers Automatizado + better_heated_pressure_chamber: Maquina de Presión Caliente Mejorada + elytra: Elytras + special_elytras: Elytras Especiales + electric_crucible: Crisól Electrificado + better_electric_crucibles: Crisoles Calientes + advanced_electric_smeltery: Fundición Eléctrica Avanzada + advanced_farmer_android: Androides Avanzados - Granjero lava_generator: Generador de Lava - lava_talisman: Talismán del Caminante de Lava - lightning_rune: Runa de Rayos - lumber_axe: Hacha de Leñador - lumps: Masas y Magia - magical_book_cover: Portada de Libro Mágico - magic_eye_of_ender: Ojo Mágico de Ender - magician_talisman: Talismán del Mago - magic_sugar: Azúcar Mágica - magic_workbench: Mesa de Trabajo Mágica - magnesium_generator: Poder de Magnesio - magnet: Metales Magnéticos - makeshift_smeltery: Fundición Improvisada - meat_jerky: Carne Seca - miner_talisman: Talismán del Minero - misc_power_items: Objetos importantes relacionados con la energía - monster_jerky: Jamón de Monstruo - more_enhanced_furnaces: Mejores Hornos - multimeter: Medidor de Potencia - multitools: Multi Herramientas - nether_gold_pan: Colador del Nether nether_ice: Refrigerante de Hielo del Nether nether_star_reactor: Reactor de Estrella del Nether - nickel_and_cobalt: Aún más Minerales - night_vision_googles: Lentes de Visión Nocturna - nuclear_reactor: Planta de Energía Nuclear - oil: Aceite - ore_crusher: Duplicador de Minerales - ore_washer: Tamizador - organic_fertilizer: Fertilizante Orgánico - organic_food: Comida Organica + blistering_ingots: Radiación Burbujeante + automatic_ignition_chamber: Cámara de Ignición Automática output_chest: Cofre de Salida de Máquinas Básicas - parachute: Paracaídas - pickaxe_of_containment: Pico de Contención - pickaxe_of_the_seeker: Pico del Buscador - pickaxe_of_vein_mining: Pico de Menas - plastic_sheet: Plástico - portable_crafter: Mesa de Crafteo Portatil - portable_dustbin: Bote de Basura Portatil - pressure_chamber: Cámara de Presión - programmable_androids: Androide Programable + copper_wire: Conductividad de Baja Potencia radiant_backpack: Mochila Radiante - rainbow_blocks: Bloques Arcoíris - reactor_access_port: Interactua con tú Reactor - reactor_essentials: Esenciales de Reactores - redstone_alloy: Aleación de Redstone - reinforced_alloy: Aleación Reforzada - reinforced_armor: Armadura Reforzada - reinforced_furnace: Horno Reforzado - repaired_spawner: Spawners Reparados - scroll_of_dimensional_teleposition: Volteando cosas por aquí - seismic_axe: Hacha Sísmica - silicon: Silicon Valley - slime_armor: Armadura de Slime - slimefun_metals: Nuevos Metales - slime_steel_armor: Armadura de Acero Pegajoso - smelters_pickaxe: Pico Fundidor - smeltery: Taller de Fundición - solar_generators: Generador Solar - solar_panel_and_helmet: Energía solar - soulbound_rune: Runa de Alma - special_bows: Robin Hood - special_elytras: Elytras Especiales - special_runes: Runas Púrpuras - steel: Edad de Acero - steel_plate: Placa de Acero - steel_thruster: Propulsor de Acero + auto_drier: Un día seco + diet_cookie: Galleta Dietética storm_staff: Bastón de las Tormentas - sword_of_beheading: Espada Decapitadora - synthetic_diamond: Diamantes Sintéticos - synthetic_emerald: Gema Falsa - synthetic_sapphire: Zafiros Sintéticos - table_saw: Sierra - teleporter: Componentes Base de Teletransportador - teleporter_activation_plates: Activación de Teletransportador - tome_of_knowledge_sharing: Compartiendo con amigos + soulbound_rune: Runa de Alma + geo_miner: GEO-Minador + lightning_rune: Runa de Rayos totem_of_undying: Tótem de la Inmortalidad - trash_can: Basurero - traveller_talisman: Talismán del Explorador + charging_bench: Mesa de Carga + nether_gold_pan: Colador del Nether + electric_press: Prensa Eléctrica + magnesium_generator: Poder de Magnesio + kelp_cookie: Algas Sabrosas + makeshift_smeltery: Fundición Improvisada tree_growth_accelerator: Árboles Veloces - uranium: Radioactivo - walking_sticks: Bastones - warrior_talisman: Talismán del Guerrero - water_staff: Bastón de Agua - water_talisman: Talismán del Pez - whirlwind_talisman: Talismán del Tornado - wind_staff: Bastón de Aire - wither_assembler: Mata Withers Automatizado - wither_proof_glass: Vidrio contra Withers - wither_proof_obsidian: Obsidiana contra Withers - wizard_talisman: Talismán del Hechizero - woven_backpack: Mochila Tejida - xp_collector: Recolector de EXP industrial_miner: Minería Industrial advanced_industrial_miner: Minería Mejorada + magical_zombie_pills: De-Zombificación + auto_brewer: Alquimia Industrial From c1755965369c265cdb48fdf06255de2080af69bc Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 05:33:02 +0300 Subject: [PATCH 06/32] Improve the handling of non-registered worlds --- .../mrCookieSlime/Slimefun/SlimefunPlugin.java | 16 +++++----------- .../mrCookieSlime/Slimefun/api/BlockStorage.java | 4 ++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index f91cf72d5..40c9d5213 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -391,21 +391,15 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { } }); - for (World world : Bukkit.getWorlds()) { + // Save all registered Worlds + getRegistry().getWorlds().forEach((world, storage) -> { try { - BlockStorage storage = BlockStorage.getStorage(world); - - if (storage != null) { - storage.save(true); - } - else { - getLogger().log(Level.SEVERE, "Could not save Slimefun Blocks for World \"{0}\"", world.getName()); - } + storage.save(true); } catch (Exception x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world.getName() + "' for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); } - } + }); for (UniversalBlockMenu menu : registry.getUniversalInventories().values()) { menu.save(); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index 9797a9bc8..58f1224e5 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -480,6 +480,10 @@ public class BlockStorage { public static void setBlockInfo(Location l, Config cfg, boolean updateTicker) { BlockStorage storage = getStorage(l.getWorld()); + if (storage == null) { + Slimefun.getLogger().warning("Could not set Block info for non-registered World '" + l.getWorld().getName() + "'. Is some plugin trying to store data in a fake world?"); + return; + } storage.storage.put(l, cfg); String id = cfg.getString("id"); From bb3650e9e767203f9f61d1f5279cc0c95ed0cc33 Mon Sep 17 00:00:00 2001 From: Nameless Date: Thu, 25 Jun 2020 02:41:25 +0000 Subject: [PATCH 07/32] Translate messages_zh-CN.yml via GitLocalize --- .../resources/languages/messages_zh-CN.yml | 515 +++++++++--------- 1 file changed, 260 insertions(+), 255 deletions(-) diff --git a/src/main/resources/languages/messages_zh-CN.yml b/src/main/resources/languages/messages_zh-CN.yml index 88a35b3d3..080186a7d 100644 --- a/src/main/resources/languages/messages_zh-CN.yml +++ b/src/main/resources/languages/messages_zh-CN.yml @@ -1,238 +1,133 @@ --- -android: - scripts: - already-uploaded: "&4这个脚本已经上传过了." - editor: 脚本编辑器 - enter-name: - - - - "&e给你的脚本起个名字吧" - instructions: - ATTACK_ANIMALS: "&4攻击 &c(动物)" - ATTACK_ANIMALS_ADULT: "&4攻击 &c(成年动物)" - ATTACK_MOBS: "&4攻击 &c(怪物)" - ATTACK_MOBS_ANIMALS: "&4攻击 &c(怪物 & 动物)" - CATCH_FISH: "&b钓鱼" - CHOP_TREE: "&c砍树并补种树苗" - DIG_DOWN: "&b向下挖" - DIG_FORWARD: "&b向前挖" - DIG_UP: "&b向上挖" - FARM_DOWN: "&b自动采收并补种下面的作物" - FARM_EXOTIC_DOWN: "&b自动采收并补种下面的作物 &7(支持异域花园植物)" - FARM_EXOTIC_FORWARD: "&b自动采收并补种作物 &7(支持异域花园植物)" - FARM_FORWARD: "&b自动采收并补种作物" - GO_DOWN: "&7向下走" - GO_FORWARD: "&7向前走" - GO_UP: "&7向上走" - INTERFACE_FUEL: "&c从面前的容器中拿出燃料" - INTERFACE_ITEMS: "&9将物品栏里的物品放入面前的容器" - MOVE_AND_DIG_DOWN: "&b向下挖并移动" - MOVE_AND_DIG_FORWARD: "&b向前挖并移动" - MOVE_AND_DIG_UP: "&b向上挖并移动" - REPEAT: "&9重复运行脚本" - START: "&2运行脚本" - TURN_LEFT: "&7左转" - TURN_RIGHT: "&7右转" - WAIT: "&e等待 0.5s" - rating: - already: "&4你已经给这个脚本留下评价了!" - own: "&4你不能评价你自己的脚本!" - uploaded: - - "&b上传中..." - - "&a脚本上传成功!" - started: "&7你的机器人开始运行脚本" - stopped: "&7你的机器人暂停运行了脚本" -anvil: - not-working: "&4你不能在铁砧里使用 Slimefun 的物品" -backpack: - already-open: "&c抱歉, 这个背包已在别处打开了!" - no-stack: "&c你不能同时手持两个背包" commands: - backpack: - backpack-does-not-exist: "&4你指定的背包不存在!" - description: 获取你其中一个背包的拷贝 - invalid-id: "&4背包 ID 必须为非负数!" - player-never-joined: "&4找不到叫这个名字的玩家!" - restored-backpack-given: "&a你的背包已被恢复并且已经放入了你的物品栏!" + help: 展示此帮助页面 cheat: 使用作弊模式获取 Slimefun 的物品 give: 给某人 Slimefun 物品 guide: 给你自己一本 Slimefun 指南 - help: 展示此帮助页面 + timings: 查看关于 Slimefun 的耗能信息 + teleporter: 查看其他玩家的公开传送点 + versions: 列出已安装的扩展插件 + search: 搜索 Slimefun 物品 open_guide: 使用命令打开 Slimefun 指南 + stats: 查看玩家的统计数据 research: description: 解锁/重置玩家的研究 reset: "&c你已重置了 %player% 的所有研究" reset-target: "&c你的所有研究已被重置" - search: 搜索 Slimefun 物品 - stats: 查看玩家的统计数据 - teleporter: 查看其他玩家的公开传送点 - timings: 查看关于 Slimefun 的耗能信息 - versions: 列出已安装的扩展插件 -gps: - deathpoint: "&4死亡地点 &7%date%" - geo: - scan-required: "&4需要先进行 GEO 地形扫描! &c请先使用 GEO 地形扫描器!" - insufficient-complexity: - - "&4GPS网络复杂度不足: &c%complexity%" - - "&4a) 你还没有设置一个 GPS 网络" - - "&4b) 你的 GPS 网络复杂度不够, 多放置几个 GPS 信号发射机" - waypoint: - added: "&a成功添加了新的传送点" - max: "&4你已到达设置传送点个数的最大上限" - new: "&e给你的路径点起个名字吧 &7(支持彩色代码!)" + backpack: + description: 获取你其中一个背包的拷贝 + invalid-id: "&4背包 ID 必须为非负数!" + player-never-joined: "&4找不到叫这个名字的玩家!" + backpack-does-not-exist: "&4你指定的背包不存在!" + restored-backpack-given: "&a你的背包已被恢复并且已经放入了你的物品栏!" guide: - back: - guide: 返回 Slimefun 指南 - settings: 返回设置面板 - title: 返回 + search: + message: "&b你想要搜索什么?" + name: "&7搜索..." + tooltip: "&b单击搜索物品" + inventory: '正在搜索: %item%' + lore: + - "&b你想要搜索什么?" + - "&7将要搜索的物品的名字输入在聊天栏上" cheat: no-multiblocks: "&4你不能在作弊模式下直接获得多方块结构的机器, 你必须自己建造!" - credits: - commit: 提交 - commits: 提交次数 - profile-link: 单击访问TA们的 Github 个人主页 - roles: - developer: "&6开发者" - resourcepack: "&c材质制作者" - translator: "&9翻译者" - wiki: "&3Wiki 编辑者" languages: + updated: "&a你的语言已设为: &b%lang%" + translations: + name: "&a少了些什么?" + lore: 单击添加你自己的翻译 select: 单击选中此语言 select-default: 单击选中默认语言 selected-language: '目前使用的语言:' - translations: - lore: 单击添加你自己的翻译 - name: "&a少了些什么?" - updated: "&a你的语言已设为: &b%lang%" + title: + main: Slimefun 指南 + settings: 设置 & 关于 + languages: 选择你想要的语言 + credits: Slimefun4 贡献者 + wiki: Slimefun4 维基 + addons: Slimefun4 扩展 + bugs: 问题反馈 + source: 源代码 + credits: + commit: 提交 + commits: 提交次数 + roles: + developer: "&6开发者" + wiki: "&3Wiki 编辑者" + resourcepack: "&c材质制作者" + translator: "&9翻译者" + profile-link: 单击访问TA们的 Github 个人主页 + pages: + previous: 上一页 + next: 下一页 + tooltips: + open-category: 单击打开 + versions-notice: 在反馈问题时这些很重要! + wiki: 在官方 Slimefun 维基上查看此物品 + recipes: + machine: 此机器可用的合成配方 + miner: 此采矿机可以获得的资源 + generator: 可用的燃料种类 + gold-pan: 你可以获得的资源 + back: + title: 返回 + guide: 返回 Slimefun 指南 + settings: 返回设置面板 locked: 已锁定 locked-category: - 为了解锁这一类别 - 你需要先解锁以下 - 类别里的所有物品 - pages: - next: 下一页 - previous: 上一页 - search: - inventory: '正在搜索: %item%' - lore: - - "&b你想要搜索什么?" - - "&7将要搜索的物品的名字输入在聊天栏上" - message: "&b你想要搜索什么?" - name: "&7搜索..." - tooltip: "&b单击搜索物品" - title: - addons: Slimefun4 扩展 - bugs: 问题反馈 - credits: Slimefun4 贡献者 - languages: 选择你想要的语言 - main: Slimefun 指南 - settings: 设置 & 关于 - source: 源代码 - wiki: Slimefun4 维基 - tooltips: - open-category: 单击打开 - recipes: - generator: 可用的燃料种类 - gold-pan: 你可以获得的资源 - machine: 此机器可用的合成配方 - miner: 此采矿机可以获得的资源 - versions-notice: 在反馈问题时这些很重要! - wiki: 在官方 Slimefun 维基上查看此物品 -inventory: - no-access: "&4你没有权限使用这个方块" -languages: - af: 南非语 - ar: 阿拉伯语 - be: 白俄罗斯语 - bg: 保加利亚语 - cs: 捷克语 - da: 丹麦语 - de: 德语 - default: 服务器默认语言 - el: 希腊语 - en: 英语 - es: 西班牙语 - fa: 波斯语 - fi: 芬兰语 - fr: 法语 - he: 希伯来语 - hr: 克罗地亚语 - hu: 匈牙利语 - id: 印尼语 - it: 意大利语 - ja: 日语 - ko: 韩语 - lv: 拉脱维亚语 - mk: 马其顿语 - ms: 马来西亚语 - nl: 荷兰语 - 'no': 挪威语 - pl: 波兰语 - pt: 葡萄牙语 (葡萄牙) - pt-BR: 葡萄牙语 (巴西) - ro: 罗马尼亚语 - ru: 俄语 - sk: 斯洛伐克文 - sr: 塞尔维亚语 - sv: 瑞典语 - th: 泰语 - tr: 土耳其语 - uk: 乌克兰语 - vi: 越南文 - zh-CN: 简体中文 (中国) - zh-TW: 繁体中文 (台湾) -machines: - ANCIENT_ALTAR: - not-enough-pedestals: "&4古代基座不足. 目前已摆放的基座数: &c(%pedestals% / 8)" - unknown-catalyst: "&4无效的催化剂! &c请按照合成配方正确摆放物品!" - unknown-recipe: "&4未知合成表! &c请使用正确的合成配方!" - ANCIENT_PEDESTAL: - obstructed: "&4基座被挡住了! &c把基座上面的东西移开!" - CARGO_NODES: - must-be-placed: "&4必须放置在箱子或机器上!" - ELEVATOR: - click-to-teleport: "&e单击 &7传送至楼层:" - current-floor: "&e你现在所在的楼层:" - enter-name: "&7请为你的楼层起个名字吧! &r(支持颜色代码)" - named: "&2成功将此层命名为: &r%floor%" - no-destinations: "&4找不到目的地" - pick-a-floor: "&3- 选择一个楼层 -" - full-inventory: "&e抱歉, 物品栏已经满了!" - GPS_CONTROL_PANEL: - title: GPS - 控制面板 - transmitters: 信号发射器概览 - waypoints: 传送点列表 - HOLOGRAM_PROJECTOR: - enter-text: "&7请写下想显示在全息文本上的话. &r(支持颜色代码)" - inventory-title: 全息图像编辑器 - ignition-chamber-no-flint: "&c自动点火机缺少打火石." - INDUSTRIAL_MINER: - already-running: "&c这个工业矿机正在运行!" - destroyed: "&c你的工业矿机被拆除了." - finished: "&e你的工业矿机采矿已完成! 总共开采了 %ores% 个矿石!" - full-chest: "&c你的工业矿机的箱子已经满了!" - no-fuel: "&c你的工业矿机没有燃料了! 将燃料放入它上面的箱子里." - no-permission: "&4你没有权限在此操作此工业矿机!" - piston-facing: "&c你的工业矿机需要放置一个向上的活塞!" - piston-space: "&c两个活塞的上方需要没有方块阻挡!" - in-use: "&c这个机器正在被其他玩家使用." - pattern-not-found: "&e抱歉, 你记错合成表了吧. 这不是一个正确的合成配方, 请检查发射器里放置物品的顺序." - TELEPORTER: - cancelled: "&4传送被取消!" - gui: - time: 预计时间 - title: 你的传送点 - tooltip: 单击传送 - invulnerability: "&b&l你获得了 30 秒的无敌效果!" - teleported: "&3传送成功!" - teleporting: "&3传送中..." - unknown-material: "&e抱歉, 我无法识别在发射器里的物品. 请按照合成配方放置物品." - wrong-item: "&e抱歉, 我无法识别你右键的物品. 检查指南书看看哪些物品可以使用." messages: - cannot-place: "&c你不能在这里放置方块!" - diet-cookie: "&e你感觉变轻了..." + not-researched: "&4你没有足够的学识来理解它" + not-enough-xp: "&4你没有足够的经验来解锁这个研究" + unlocked: '&b成功解锁研究 &7"%research%"' + only-players: "&4这个指令只能在游戏内使用" + unknown-player: "&4未知玩家: &c%player%" + no-permission: "&4你没有足够的权限做这个" + usage: "&4用法: &c%usage%" + not-online: "&4%player% &c不在线" + not-valid-item: "&4%item% &c不是一个有效的物品名!" + not-valid-amount: "&4%amount% &ci不是一个有效的数字 : 它必须大于 0!" + given-item: '&b你获得了 &a%amount% &7"%item%&7"' + give-item: '&b成功给予玩家 %player% &a%amount% &7"%item%&7"' + not-valid-research: "&4%research% &c不是一个有效的研究名!" + give-research: '&b你成功解锁了玩家 %player% 的研究 &7"%research%&7"' + hungry: "&c你太饿了, 先吃点东西再试试吧!" + mode-change: "&b%device% 的模式已切换为: &9%mode%" disabled-in-world: "&4&l这个物品在此世界已被禁用" disabled-item: "&4&l这个物品已经被禁用了! 你是怎么得到它的?" + no-tome-yourself: "&c你不能对你自己使用 &4学识巨著 &c..." + multimeter: "&b已储存的能源: &3%stored% &b/ &3%capacity%" + talisman: + anvil: "&a&o你的护身符使你的工具免于损坏" + miner: "&a&o你的护身符使矿物双倍掉落了" + hunter: "&a&o你的护身符使掉落物双倍掉落了" + lava: "&a&o你的护身符将你从岩浆中救了出来" + water: "&a&o你的护身符使你免于溺水" + angel: "&a&o你的护身符使你在信仰之跃时不受伤害" + fire: "&a&o你的护身符使你免受火焰伤害" + magician: "&a&o你的护身符赠送了你额外的附魔" + traveller: "&a&o你的护身符让你跑起来更快了" + warrior: "&a&o你的护身符使你在一段时间内变强了" + knight: "&a&o你的护身符给予了你 5 秒的生命恢复" + whirlwind: "&a&o你的护身符反弹了所有的弹射物" + wizard: "&a&o你的护身符使一个附魔的等级提高了, 同时其他附魔等级将会下降" + soulbound-rune: + fail: "&c一次只能灵魂绑定一个物品." + success: "&a物品绑定成功! 在你死亡后此物品将不会掉落." + research: + start: "&7古老的灵魂正向你诉说神秘的话语!" + progress: "&7你开始慢慢理解研究 &b%research% &e(%progress%)" fire-extinguish: "&7你灭掉了身上的火" + cannot-place: "&c你不能在这里放置方块!" + no-pvp: "&c你不能在这里 PVP!" + radiation: "&4你已经暴露在致命的辐射之下! &c快把辐射物品丢掉或者穿上防化服!" + opening-guide: "&b正在打开指南书, 请稍等..." + opening-backpack: "&b正在打开背包, 请稍等...." + no-iron-golem-heal: "&c这不是铁锭. 你不能用这个治疗铁傀儡!" + link-prompt: "&e单击此处:" + diet-cookie: "&e你感觉变轻了..." fortune-cookie: - "&7救救我! 我被困在了幸运饼干工厂里!" - "&7你明天将会死在... 苦力怕的手下" @@ -244,51 +139,161 @@ messages: - "&742. 答案是 42." - "&7一天一 Walshy, 麻烦远离我." - "&7永远不要直接往下挖!" - give-item: '&b成功给予玩家 %player% &a%amount% &7"%item%&7"' - given-item: '&b你获得了 &a%amount% &7"%item%&7"' - give-research: '&b你成功解锁了玩家 %player% 的研究 &7"%research%&7"' - hungry: "&c你太饿了, 先吃点东西再试试吧!" - link-prompt: "&e单击此处:" - mode-change: "&b%device% 的模式已切换为: &9%mode%" - multimeter: "&b已储存的能源: &3%stored% &b/ &3%capacity%" - no-iron-golem-heal: "&c这不是铁锭. 你不能用这个治疗铁傀儡!" - no-permission: "&4你没有足够的权限做这个" - no-pvp: "&c你不能在这里 PVP!" - not-enough-xp: "&4你没有足够的经验来解锁这个研究" - no-tome-yourself: "&c你不能对你自己使用 &4学识巨著 &c..." - not-online: "&4%player% &c不在线" - not-researched: "&4你没有足够的学识来理解它" - not-valid-amount: "&4%amount% &ci不是一个有效的数字 : 它必须大于 0!" - not-valid-item: "&4%item% &c不是一个有效的物品名!" - not-valid-research: "&4%research% &c不是一个有效的研究名!" - only-players: "&4这个指令只能在游戏内使用" - opening-backpack: "&b正在打开背包, 请稍等...." - opening-guide: "&b正在打开指南书, 请稍等..." - radiation: "&4你已经暴露在致命的辐射之下! &c快把辐射物品丢掉或者穿上防化服!" - research: - progress: "&7你开始慢慢理解研究 &b%research% &e(%progress%)" - start: "&7古老的灵魂正向你诉说神秘的话语!" - soulbound-rune: - fail: "&c一次只能灵魂绑定一个物品." - success: "&a物品绑定成功! 在你死亡后此物品将不会掉落." - talisman: - angel: "&a&o你的护身符使你在信仰之跃时不受伤害" - anvil: "&a&o你的护身符使你的工具免于损坏" - fire: "&a&o你的护身符使你免受火焰伤害" - hunter: "&a&o你的护身符使掉落物双倍掉落了" - knight: "&a&o你的护身符给予了你 5 秒的生命恢复" - lava: "&a&o你的护身符将你从岩浆中救了出来" - magician: "&a&o你的护身符赠送了你额外的附魔" - miner: "&a&o你的护身符使矿物双倍掉落了" - traveller: "&a&o你的护身符让你跑起来更快了" - warrior: "&a&o你的护身符使你在一段时间内变强了" - water: "&a&o你的护身符使你免于溺水" - whirlwind: "&a&o你的护身符反弹了所有的弹射物" - wizard: "&a&o你的护身符使一个附魔的等级提高了, 同时其他附魔等级将会下降" - unknown-player: "&4未知玩家: &c%player%" - unlocked: '&b成功解锁研究 &7"%research%"' - usage: "&4用法: &c%usage%" -miner: - no-ores: "&e抱歉, 周围找不到矿石了!" + - "&7只是点皮肉伤!" + - "&7要总是看着生活中光明的一面!" + - "&7这一块其实是饼干而不是曲奇" + - "&7霓虹灯亮起来了!" +machines: + pattern-not-found: "&e抱歉, 你记错合成表了吧. 这不是一个正确的合成配方, 请检查发射器里放置物品的顺序." + unknown-material: "&e抱歉, 我无法识别在发射器里的物品. 请按照合成配方放置物品." + wrong-item: "&e抱歉, 我无法识别你右键的物品. 检查指南书看看哪些物品可以使用." + full-inventory: "&e抱歉, 物品栏已经满了!" + in-use: "&c这个机器正在被其他玩家使用." + ignition-chamber-no-flint: "&c自动点火机缺少打火石." + ANCIENT_ALTAR: + not-enough-pedestals: "&4古代基座不足. 目前已摆放的基座数: &c(%pedestals% / 8)" + unknown-catalyst: "&4无效的催化剂! &c请按照合成配方正确摆放物品!" + unknown-recipe: "&4未知合成表! &c请使用正确的合成配方!" + ANCIENT_PEDESTAL: + obstructed: "&4基座被挡住了! &c把基座上面的东西移开!" + HOLOGRAM_PROJECTOR: + enter-text: "&7请写下想显示在全息文本上的话. &r(支持颜色代码)" + inventory-title: 全息图像编辑器 + ELEVATOR: + no-destinations: "&4找不到目的地" + pick-a-floor: "&3- 选择一个楼层 -" + current-floor: "&e你现在所在的楼层:" + click-to-teleport: "&e单击 &7传送至楼层:" + enter-name: "&7请为你的楼层起个名字吧! &r(支持颜色代码)" + named: "&2成功将此层命名为: &r%floor%" + TELEPORTER: + teleporting: "&3传送中..." + teleported: "&3传送成功!" + cancelled: "&4传送被取消!" + invulnerability: "&b&l你获得了 30 秒的无敌效果!" + gui: + title: 你的传送点 + tooltip: 单击传送 + time: 预计时间 + CARGO_NODES: + must-be-placed: "&4必须放置在箱子或机器上!" + GPS_CONTROL_PANEL: + title: GPS - 控制面板 + transmitters: 信号发射器概览 + waypoints: 传送点列表 + INDUSTRIAL_MINER: + no-fuel: "&c你的工业矿机没有燃料了! 将燃料放入它上面的箱子里." + piston-facing: "&c你的工业矿机需要放置一个向上的活塞!" + piston-space: "&c两个活塞的上方需要没有方块阻挡!" + destroyed: "&c你的工业矿机被拆除了." + already-running: "&c这个工业矿机正在运行!" + full-chest: "&c你的工业矿机的箱子已经满了!" + no-permission: "&4你没有权限在此操作此工业矿机!" + finished: "&e你的工业矿机采矿已完成! 总共开采了 %ores% 个矿石!" +anvil: + not-working: "&4你不能在铁砧里使用 Slimefun 的物品" +backpack: + already-open: "&c抱歉, 这个背包已在别处打开了!" + no-stack: "&c你不能同时手持两个背包" workbench: not-enhanced: "&4你不能在普通的工作台上使用 Slimefun 物品" +gps: + deathpoint: "&4死亡地点 &7%date%" + waypoint: + new: "&e给你的路径点起个名字吧 &7(支持彩色代码!)" + added: "&a成功添加了新的传送点" + max: "&4你已到达设置传送点个数的最大上限" + insufficient-complexity: + - "&4GPS网络复杂度不足: &c%complexity%" + - "&4a) 你还没有设置一个 GPS 网络" + - "&4b) 你的 GPS 网络复杂度不够, 多放置几个 GPS 信号发射机" + geo: + scan-required: "&4需要先进行 GEO 地形扫描! &c请先使用 GEO 地形扫描器!" +inventory: + no-access: "&4你没有权限使用这个方块" +android: + started: "&7你的机器人开始运行脚本" + stopped: "&7你的机器人暂停运行了脚本" + scripts: + already-uploaded: "&4这个脚本已经上传过了." + instructions: + START: "&2运行脚本" + REPEAT: "&9重复运行脚本" + WAIT: "&e等待 0.5s" + GO_FORWARD: "&7向前走" + GO_UP: "&7向上走" + GO_DOWN: "&7向下走" + TURN_LEFT: "&7左转" + TURN_RIGHT: "&7右转" + DIG_UP: "&b向上挖" + DIG_FORWARD: "&b向前挖" + DIG_DOWN: "&b向下挖" + MOVE_AND_DIG_UP: "&b向上挖并移动" + MOVE_AND_DIG_FORWARD: "&b向前挖并移动" + MOVE_AND_DIG_DOWN: "&b向下挖并移动" + ATTACK_MOBS_ANIMALS: "&4攻击 &c(怪物 & 动物)" + ATTACK_MOBS: "&4攻击 &c(怪物)" + ATTACK_ANIMALS: "&4攻击 &c(动物)" + ATTACK_ANIMALS_ADULT: "&4攻击 &c(成年动物)" + CHOP_TREE: "&c砍树并补种树苗" + CATCH_FISH: "&b钓鱼" + FARM_FORWARD: "&b自动采收并补种作物" + FARM_DOWN: "&b自动采收并补种下面的作物" + FARM_EXOTIC_FORWARD: "&b自动采收并补种作物 &7(支持异域花园植物)" + FARM_EXOTIC_DOWN: "&b自动采收并补种下面的作物 &7(支持异域花园植物)" + INTERFACE_ITEMS: "&9将物品栏里的物品放入面前的容器" + INTERFACE_FUEL: "&c从面前的容器中拿出燃料" + enter-name: + - + - "&e给你的脚本起个名字吧" + uploaded: + - "&b上传中..." + - "&a脚本上传成功!" + rating: + own: "&4你不能评价你自己的脚本!" + already: "&4你已经给这个脚本留下评价了!" + editor: 脚本编辑器 +languages: + default: 服务器默认语言 + en: 英语 + de: 德语 + fr: 法语 + it: 意大利语 + es: 西班牙语 + pl: 波兰语 + sv: 瑞典语 + nl: 荷兰语 + cs: 捷克语 + hu: 匈牙利语 + lv: 拉脱维亚语 + ru: 俄语 + sk: 斯洛伐克文 + zh-TW: 繁体中文 (台湾) + vi: 越南文 + id: 印尼语 + zh-CN: 简体中文 (中国) + el: 希腊语 + he: 希伯来语 + ar: 阿拉伯语 + af: 南非语 + da: 丹麦语 + fi: 芬兰语 + uk: 乌克兰语 + ms: 马来西亚语 + 'no': 挪威语 + ja: 日语 + fa: 波斯语 + th: 泰语 + ro: 罗马尼亚语 + pt: 葡萄牙语 (葡萄牙) + pt-BR: 葡萄牙语 (巴西) + bg: 保加利亚语 + ko: 韩语 + tr: 土耳其语 + hr: 克罗地亚语 + mk: 马其顿语 + sr: 塞尔维亚语 + be: 白俄罗斯语 + tl: 他加禄语 +miner: + no-ores: "&e抱歉, 周围找不到矿石了!" From 9ade4672495c779a73cfaab3162b4b3c6d48f2ab Mon Sep 17 00:00:00 2001 From: Nameless Date: Thu, 25 Jun 2020 02:41:27 +0000 Subject: [PATCH 08/32] Translate researches_zh-CN.yml via GitLocalize --- .../resources/languages/researches_zh-CN.yml | 422 +++++++++--------- 1 file changed, 212 insertions(+), 210 deletions(-) diff --git a/src/main/resources/languages/researches_zh-CN.yml b/src/main/resources/languages/researches_zh-CN.yml index 0bfb3c1dc..51d5fa9b5 100644 --- a/src/main/resources/languages/researches_zh-CN.yml +++ b/src/main/resources/languages/researches_zh-CN.yml @@ -1,236 +1,238 @@ --- slimefun: - 24k_gold_block: 黄金城市 - advanced_android: 高级机器人 - advanced_butcher_android: 高级屠夫机器人 - advanced_circuit_board: 高级电路板 - advanced_electric_smeltery: 高级电力冶炼机 - advanced_farmer_android: 高级农夫机器人 - advanced_fisherman_android: 高级渔夫机器人 - advanced_output_node: 高级输出节点 - alloys: 高级合金 - ancient_altar: 古代祭坛 - ancient_runes: 元素符文 - android_interfaces: 机器人接口 - android_memory_core: 记忆核心 - angel_talisman: 天使护身符 - animal_growth_accelerator: 操纵动物生长 - anvil_talisman: 铁砧护身符 - armored_jetboots: 装甲喷气靴 - armored_jetpack: 装甲喷气背包 + walking_sticks: 拐杖 + portable_crafter: 便携工作台 + fortune_cookie: 幸运曲奇 + portable_dustbin: 便携垃圾桶 + meat_jerky: 肉干 armor_forge: 装备制作 - auto_anvil: 自动化铁砧 - auto_breeder: 自动化喂养 - auto_drier: 自动烘干机 - auto_enchanting: 自动附魔和祛魔 - automated_crafting_chamber: 自动化合成 - automated_panning_machine: 自动化淘金 - automatic_ignition_chamber: 自动点火机 - backpacks: 背包 + glowstone_armor: 萤石套装 + lumps: 魔法与因子 + ender_backpack: 末影背包 + ender_armor: 末影套装 + magic_eye_of_ender: 魔法末影之眼 + magic_sugar: 魔法糖 + monster_jerky: 怪物肉干 + slime_armor: 粘液套装 + sword_of_beheading: 处决之剑 basic_circuit_board: 基础电路板 + advanced_circuit_board: 高级电路板 + smeltery: 冶炼机 + steel: 钢铁时代 + misc_power_items: 与能源有关的物品 battery: 第一节电池 - better_carbon_press: 更好的碳压机 - better_crop_growth_accelerator: 更好的作物生长加速器 - better_electric_crucibles: 更好的坩埚 - better_electric_furnace: 更好的电炉 - better_food_fabricator: 更好的食品加工 - better_freezer: 更好的冰箱 - better_gps_transmitters: 更好的 GPS 信号发射机 - better_heated_pressure_chamber: 更好的加热压力舱 - better_solar_generators: 更好的太阳能发电机 - bio_reactor: 生物反应器 - blade_of_vampires: 吸血鬼之刃 - blistering_ingots: 辐射法发泡 - block_placer: 方块放置机 - boosted_uranium: 永无止境的循环 - boots_of_the_stomper: 践踏者之靴 - bound_armor: 灵魂绑定装备 - bound_backpack: 灵魂绑定储存 - bound_tools: 灵魂绑定工具 - bound_weapons: 灵魂绑定武器 - bronze: 青铜制作 - butcher_androids: 屠夫机器人 + steel_plate: 将钢变成板 + steel_thruster: 钢制推进器 + parachute: 降落伞 + grappling_hook: 抓钩 + jetpacks: 喷气背包 + multitools: 万用工具 + solar_panel_and_helmet: 太阳能 + elemental_staff: 元素法杖 + grind_stone: 磨石 cactus_armor: 仙人掌套装 - capacitors: 一级电容 - carbonado: 黑色钻石 - carbonado_furnace: 黑金刚石镶边熔炉 - carbonado_tools: 顶级机器 - carbon_press: 碳压机 - cargo_basics: 基础货运 - cargo_nodes: 货运设施 - chainmail_armor: 锁链套装 - charging_bench: 充电座 - coal_generator: 煤炭发电机 - cobalt_pickaxe: 高速镐子 - combustion_reactor: 燃烧反应机 - common_talisman: 普通护身符 - composter: 泥土堆肥 + gold_pan: 淘金盘 + magical_book_cover: 魔法书封面 + slimefun_metals: 新的金属 + ore_crusher: 双倍矿物 + bronze: 青铜制作 + alloys: 高级合金 compressor_and_carbon: 碳的制作 - cooler: 随身饮料 - copper_wire: 更好的导体 - crop_growth_accelerator: 作物生长加速器 - crucible: 坩埚 - crushed_ore: 矿物提纯 + gilded_iron_armor: 镀金铁甲 + synthetic_diamond: 人造钻石 + pressure_chamber: 压力机 + synthetic_sapphire: 人造蓝宝石 damascus_steel: 大马士革钢锭 damascus_steel_armor: 大马士革钢套装 - diet_cookie: 减肥曲奇 - duct_tape: 胶带 - electric_crucible: 电力坩埚 - electric_furnaces: 电炉 - electric_ingot_machines: 电力铸铁 + reinforced_alloy: 强化合金 + carbonado: 黑色钻石 + magic_workbench: 魔法工作台 + wind_staff: 风之法杖 + reinforced_armor: 强化套装 + ore_washer: 洗矿机 + gold_carats: 炼制纯金 + silicon: 硅谷 + fire_staff: 火之法杖 + smelters_pickaxe: 熔炉镐 + common_talisman: 普通护身符 + anvil_talisman: 铁砧护身符 + miner_talisman: 矿工护身符 + hunter_talisman: 猎人护身符 + lava_talisman: 岩浆行者护身符 + water_talisman: 潜水者护身符 + angel_talisman: 天使护身符 + fire_talisman: 消防员护身符 + lava_crystal: 火焰局势 + magician_talisman: 法师护身符 + traveller_talisman: 旅行者护身符 + warrior_talisman: 战士护身符 + knight_talisman: 骑士护身符 + gilded_iron: 闪闪发光的铁锭 + synthetic_emerald: 人造宝石 + chainmail_armor: 锁链套装 + whirlwind_talisman: 旋风护身符 + wizard_talisman: 巫师护身符 + lumber_axe: 伐木斧 + hazmat_suit: 防化服 + uranium: 辐射 + crushed_ore: 矿物提纯 + redstone_alloy: 红石合金 + carbonado_tools: 顶级机器 + first_aid: 急救箱 + gold_armor: 闪闪发光的套装 + night_vision_googles: 夜视镜 + pickaxe_of_containment: 刷怪笼之镐 + hercules_pickaxe: 赫拉克勒斯之镐 + table_saw: 桌锯 + slime_steel_armor: 粘性钢套装 + blade_of_vampires: 吸血鬼之刃 + water_staff: 水之法杖 + 24k_gold_block: 黄金城市 + composter: 泥土堆肥 + farmer_shoes: 农夫靴 + explosive_tools: 爆破工具 + automated_panning_machine: 自动化淘金 + boots_of_the_stomper: 践踏者之靴 + pickaxe_of_the_seeker: 寻矿稿 + backpacks: 背包 + woven_backpack: 编织背包 + crucible: 坩埚 + gilded_backpack: 镀金背包 + armored_jetpack: 装甲喷气背包 + ender_talismans: 末影护身符 + nickel_and_cobalt: 更多矿物 + magnet: 磁性金属 + infused_magnet: 注入磁铁 + cobalt_pickaxe: 高速镐子 + essence_of_afterlife: 死灵法师 + bound_backpack: 灵魂绑定储存 + jetboots: 喷气靴 + armored_jetboots: 装甲喷气靴 + seismic_axe: 地震斧 + pickaxe_of_vein_mining: 矿脉镐 + bound_weapons: 灵魂绑定武器 + bound_tools: 灵魂绑定工具 + bound_armor: 灵魂绑定装备 + juicer: 可口的饮料 + repaired_spawner: 修复刷怪笼 + enhanced_furnace: 增强型熔炉 + more_enhanced_furnaces: 更好的熔炉 + high_tier_enhanced_furnaces: 高级熔炉 + reinforced_furnace: 强化熔炉 + carbonado_furnace: 黑金刚石镶边熔炉 electric_motor: 热起来吧 + block_placer: 方块放置机 + scroll_of_dimensional_teleposition: 让事物转向 + special_bows: 罗宾汉的弓 + tome_of_knowledge_sharing: 与朋友分享 + flask_of_knowledge: 经验储存 + hardened_glass: 承受爆炸 + golden_apple_juice: 黄金药水 + cooler: 随身饮料 + ancient_altar: 古代祭坛 + wither_proof_obsidian: 防凋零黑曜石 + ancient_runes: 元素符文 + special_runes: 特殊符文 + infernal_bonemeal: 地狱骨粉 + rainbow_blocks: 彩虹方块 + infused_hopper: 吸入漏斗 + wither_proof_glass: 防凋零玻璃 + duct_tape: 胶带 + plastic_sheet: 塑料 + android_memory_core: 记忆核心 + oil: 原油 + fuel: 燃油 + hologram_projector: 全息图像 + capacitors: 一级电容 + high_tier_capacitors: 二级电容 + solar_generators: 太阳能农场 + electric_furnaces: 电炉 electric_ore_grinding: 粉碎和研磨 - electric_press: 碳压机 - electric_smeltery: 电力冶炼机 - elemental_staff: 元素法杖 + heated_pressure_chamber: 加热压力舱 + coal_generator: 煤炭发电机 + bio_reactor: 生物反应器 + auto_enchanting: 自动附魔和祛魔 + auto_anvil: 自动化铁砧 + multimeter: 能量测量 + gps_setup: 基础 GPS 设备 + gps_emergency_transmitter: GPS 应急传送点 + programmable_androids: 可编程式机器人 + android_interfaces: 机器人接口 + geo_scanner: GEO 地形扫描 + combustion_reactor: 燃烧反应机 + teleporter: 传送机基础组件 + teleporter_activation_plates: 传送激活装置 + better_solar_generators: 更好的太阳能发电机 + better_gps_transmitters: 更好的 GPS 信号发射机 elevator: 电梯 - elytra: 鞘翅 + energized_solar_generator: 全天候太阳能 + energized_gps_transmitter: 顶级 GPS 信号发射机 + energy_regulator: 能源网络 101 + butcher_androids: 屠夫机器人 + organic_food: 有机食物 + auto_breeder: 自动化喂养 + advanced_android: 高级机器人 + advanced_butcher_android: 高级屠夫机器人 + advanced_fisherman_android: 高级渔夫机器人 + animal_growth_accelerator: 操纵动物生长 + xp_collector: 经验收集器 + organic_fertilizer: 有机肥料 + crop_growth_accelerator: 作物生长加速器 + better_crop_growth_accelerator: 更好的作物生长加速器 + reactor_essentials: 反应堆基础 + nuclear_reactor: 核电农场 + freezer: 冰箱先生 + cargo_basics: 基础货运 + cargo_nodes: 货运设施 + electric_ingot_machines: 电力铸铁 + high_tier_electric_ingot_machines: 更好的电力铸铁 + automated_crafting_chamber: 自动化合成 + better_food_fabricator: 更好的食品加工 + reactor_access_port: 反应堆交互 + fluid_pump: 流体泵 + better_freezer: 更好的冰箱 + boosted_uranium: 永无止境的循环 + trash_can: 垃圾桶 + advanced_output_node: 高级输出节点 + carbon_press: 碳压机 + electric_smeltery: 电力冶炼机 + better_electric_furnace: 更好的电炉 + better_carbon_press: 更好的碳压机 empowered_android: 可授权机器人 empowered_butcher_android: 可授权屠夫机器人 empowered_fisherman_android: 可授权渔夫机器人 - ender_armor: 末影套装 - ender_backpack: 末影背包 - ender_talismans: 末影护身符 - energized_gps_transmitter: 顶级 GPS 信号发射机 - energized_solar_generator: 全天候太阳能 - energy_regulator: 能源网络 101 - enhanced_furnace: 增强型熔炉 - essence_of_afterlife: 死灵法师 - explosive_tools: 爆破工具 - farmer_shoes: 农夫靴 - fire_staff: 火之法杖 - fire_talisman: 消防员护身符 - first_aid: 急救箱 - flask_of_knowledge: 经验储存 - fluid_pump: 流体泵 - fortune_cookie: 幸运曲奇 - freezer: 冰箱先生 - fuel: 燃油 - geo_miner: GEO 矿机 - geo_scanner: GEO 地形扫描 - gilded_backpack: 镀金背包 - gilded_iron: 闪闪发光的铁锭 - gilded_iron_armor: 镀金铁甲 - glowstone_armor: 萤石套装 - gold_armor: 闪闪发光的套装 - gold_carats: 炼制纯金 - golden_apple_juice: 黄金药水 - gold_pan: 淘金盘 - gps_emergency_transmitter: GPS 应急传送点 - gps_setup: 基础 GPS 设备 - grappling_hook: 抓钩 - grind_stone: 磨石 - hardened_glass: 承受爆炸 - hazmat_suit: 防化服 - heated_pressure_chamber: 加热压力舱 - hercules_pickaxe: 赫拉克勒斯之镐 - high_tier_capacitors: 二级电容 high_tier_carbon_press: 终极碳压机 - high_tier_electric_ingot_machines: 更好的电力铸铁 - high_tier_enhanced_furnaces: 高级熔炉 - hologram_projector: 全息图像 - hunter_talisman: 猎人护身符 - infernal_bonemeal: 地狱骨粉 - infused_hopper: 吸入漏斗 - infused_magnet: 注入磁铁 - jetboots: 喷气靴 - jetpacks: 喷气背包 - juicer: 可口的饮料 - kelp_cookie: 美味的海藻 - knight_talisman: 骑士护身符 - lava_crystal: 火焰局势 + wither_assembler: 自动化击杀凋零 + better_heated_pressure_chamber: 更好的加热压力舱 + elytra: 鞘翅 + special_elytras: 特殊鞘翅 + electric_crucible: 电力坩埚 + better_electric_crucibles: 更好的坩埚 + advanced_electric_smeltery: 高级电力冶炼机 + advanced_farmer_android: 高级农夫机器人 lava_generator: 岩浆发电机 - lava_talisman: 岩浆行者护身符 - lightning_rune: 雷电符文 - lumber_axe: 伐木斧 - lumps: 魔法与因子 - magical_book_cover: 魔法书封面 - magic_eye_of_ender: 魔法末影之眼 - magician_talisman: 法师护身符 - magic_sugar: 魔法糖 - magic_workbench: 魔法工作台 - magnesium_generator: 来自镁的能量 - magnet: 磁性金属 - makeshift_smeltery: 临时冶炼炉 - meat_jerky: 肉干 - miner_talisman: 矿工护身符 - misc_power_items: 与能源有关的物品 - monster_jerky: 怪物肉干 - more_enhanced_furnaces: 更好的熔炉 - multimeter: 能量测量 - multitools: 万用工具 - nether_gold_pan: 下界淘金盘 nether_ice: 下界冰冷却剂 nether_star_reactor: 下界之星反应堆 - nickel_and_cobalt: 更多矿物 - night_vision_googles: 夜视镜 - nuclear_reactor: 核电农场 - oil: 原油 - ore_crusher: 双倍矿物 - ore_washer: 洗矿机 - organic_fertilizer: 有机肥料 - organic_food: 有机食物 + blistering_ingots: 辐射法发泡 + automatic_ignition_chamber: 自动点火机 output_chest: 基础物品输出箱 - parachute: 降落伞 - pickaxe_of_containment: 刷怪笼之镐 - pickaxe_of_the_seeker: 寻矿稿 - pickaxe_of_vein_mining: 矿脉镐 - plastic_sheet: 塑料 - portable_crafter: 便携工作台 - portable_dustbin: 便携垃圾桶 - pressure_chamber: 压力机 - programmable_androids: 可编程式机器人 + copper_wire: 更好的导体 radiant_backpack: 金光闪闪的背包 - rainbow_blocks: 彩虹方块 - reactor_access_port: 反应堆交互 - reactor_essentials: 反应堆基础 - redstone_alloy: 红石合金 - reinforced_alloy: 强化合金 - reinforced_armor: 强化套装 - reinforced_furnace: 强化熔炉 - repaired_spawner: 修复刷怪笼 - scroll_of_dimensional_teleposition: 让事物转向 - seismic_axe: 地震斧 - silicon: 硅谷 - slime_armor: 粘液套装 - slimefun_metals: 新的金属 - slime_steel_armor: 粘性钢套装 - smelters_pickaxe: 熔炉镐 - smeltery: 冶炼机 - solar_generators: 太阳能农场 - solar_panel_and_helmet: 太阳能 - soulbound_rune: 灵魂绑定符文 - special_bows: 罗宾汉的弓 - special_elytras: 特殊鞘翅 - special_runes: 特殊符文 - steel: 钢铁时代 - steel_plate: 将钢变成板 - steel_thruster: 钢制推进器 + auto_drier: 自动烘干机 + diet_cookie: 减肥曲奇 storm_staff: 风之法杖 - sword_of_beheading: 处决之剑 - synthetic_diamond: 人造钻石 - synthetic_emerald: 人造宝石 - synthetic_sapphire: 人造蓝宝石 - table_saw: 桌锯 - teleporter: 传送机基础组件 - teleporter_activation_plates: 传送激活装置 - tome_of_knowledge_sharing: 与朋友分享 + soulbound_rune: 灵魂绑定符文 + geo_miner: GEO 矿机 + lightning_rune: 雷电符文 totem_of_undying: 不死图腾 - trash_can: 垃圾桶 - traveller_talisman: 旅行者护身符 + charging_bench: 充电座 + nether_gold_pan: 下界淘金盘 + electric_press: 碳压机 + magnesium_generator: 来自镁的能量 + kelp_cookie: 美味的海藻 + makeshift_smeltery: 临时冶炼炉 tree_growth_accelerator: 树木生长加速器 - uranium: 辐射 - walking_sticks: 拐杖 - warrior_talisman: 战士护身符 - water_staff: 水之法杖 - water_talisman: 潜水者护身符 - whirlwind_talisman: 旋风护身符 - wind_staff: 风之法杖 - wither_assembler: 自动化击杀凋零 - wither_proof_glass: 防凋零玻璃 - wither_proof_obsidian: 防凋零黑曜石 - wizard_talisman: 巫师护身符 - woven_backpack: 编织背包 - xp_collector: 经验收集器 industrial_miner: 工业采矿 advanced_industrial_miner: 进阶采矿 + magical_zombie_pills: 去僵尸化 + auto_brewer: 自动化酿造 From ecd97b3e500a1b5316790d8dc8dcaa3881001b2a Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 05:54:21 +0300 Subject: [PATCH 09/32] Fixed a tiny typo --- .../thebusybiscuit/slimefun4/api/ErrorReport.java | 4 ++-- .../slimefun4/core/networks/cargo/CargoUtils.java | 2 +- .../slimefun4/core/services/BackupService.java | 2 +- .../core/services/PerWorldSettingsService.java | 2 +- .../core/services/github/GitHubConnector.java | 2 +- .../implementation/guide/ChestSlimefunGuide.java | 4 ++-- .../implementation/items/androids/Script.java | 2 +- .../items/magical/talismans/MagicianTalisman.java | 2 +- .../items/multiblocks/miner/ActiveMiner.java | 4 ++-- .../java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 6 +++--- .../me/mrCookieSlime/Slimefun/api/BlockStorage.java | 10 +++++----- .../Slimefun/api/inventory/BlockMenuPreset.java | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java index a04bf3739..95ec565a9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java @@ -82,7 +82,7 @@ public class ErrorReport { throwable.printStackTrace(stream); addon.getLogger().log(Level.WARNING, ""); - addon.getLogger().log(Level.WARNING, "An Error occured! It has been saved as: "); + addon.getLogger().log(Level.WARNING, "An Error occurred! It has been saved as: "); addon.getLogger().log(Level.WARNING, "/plugins/Slimefun/error-reports/{0}", file.getName()); addon.getLogger().log(Level.WARNING, "Please put this file on https://pastebin.com and report this to the developer(s)."); @@ -93,7 +93,7 @@ public class ErrorReport { addon.getLogger().log(Level.WARNING, ""); } catch (IOException x) { - addon.getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving an Error-Report for Slimefun " + SlimefunPlugin.getVersion()); + addon.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving an Error-Report for Slimefun " + SlimefunPlugin.getVersion()); } }); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java index 47bee5f73..3d2c79dd1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java @@ -408,7 +408,7 @@ final class CargoUtils { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occured while trying to filter items for a Cargo Node (" + id + ") at " + new BlockPosition(block)); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while trying to filter items for a Cargo Node (" + id + ") at " + new BlockPosition(block)); return false; } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java index fab96c403..04200e50d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java @@ -60,7 +60,7 @@ public class BackupService implements Runnable { } } catch (IOException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while creating a backup for Slimefun " + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while creating a backup for Slimefun " + SlimefunPlugin.getVersion()); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java index bae567485..dec933960 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java @@ -53,7 +53,7 @@ public class PerWorldSettingsService { migrate(); } catch (IOException e) { - plugin.getLogger().log(Level.WARNING, "An error occured while migrating old world settings", e); + plugin.getLogger().log(Level.WARNING, "An error occurred while migrating old world settings", e); } for (World world : worlds) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java index 73feca0b1..cb30fa294 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java @@ -98,7 +98,7 @@ abstract class GitHubConnector { onSuccess(element); } catch (IOException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while parsing GitHub-Data for Slimefun " + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while parsing GitHub-Data for Slimefun " + SlimefunPlugin.getVersion()); onFailure(); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java index 88c956b7a..6e75a706b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java @@ -686,8 +686,8 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { } private void printErrorMessage(Player p, Throwable x) { - p.sendMessage(ChatColor.DARK_RED + "An internal server error has occured. Please inform an admin, check the console for further info."); - Slimefun.getLogger().log(Level.SEVERE, "An error has occured while trying to open a SlimefunItem in the guide!", x); + p.sendMessage(ChatColor.DARK_RED + "An internal server error has occurred. Please inform an admin, check the console for further info."); + Slimefun.getLogger().log(Level.SEVERE, "An error has occurred while trying to open a SlimefunItem in the guide!", x); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java index 9aac880dc..f075fcd86 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java @@ -195,7 +195,7 @@ public final class Script { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occured while trying to load Android Script '" + file.getName() + "'"); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while trying to load Android Script '" + file.getName() + "'"); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java index d91c8ead3..24bbd93e1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java @@ -29,7 +29,7 @@ public class MagicianTalisman extends Talisman { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "The following Exception occured while trying to register the following Enchantment: " + enchantment); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "The following Exception occurred while trying to register the following Enchantment: " + enchantment); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java index 2800d93b0..8a5e3c2f1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java @@ -197,7 +197,7 @@ class ActiveMiner implements Runnable { nextColumn(); } catch (Exception e) { - Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occured while running an Industrial Miner at " + new BlockPosition(chest)); + Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occurred while running an Industrial Miner at " + new BlockPosition(chest)); stop(); } }); @@ -343,7 +343,7 @@ class ActiveMiner implements Runnable { } } catch (Exception e) { - Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occured while moving a Piston for an Industrial Miner at " + new BlockPosition(block)); + Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occurred while moving a Piston for an Industrial Miner at " + new BlockPosition(block)); stop(); } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 40c9d5213..8a2fa5b02 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -397,7 +397,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { storage.save(true); } catch (Exception x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); } }); @@ -454,7 +454,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { SlimefunItemSetup.setup(this); } catch (Exception | LinkageError x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while initializing SlimefunItems for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while initializing SlimefunItems for Slimefun " + getVersion()); } } @@ -463,7 +463,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { ResearchSetup.setupResearches(); } catch (Exception | LinkageError x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while initializing Slimefun Researches for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while initializing Slimefun Researches for Slimefun " + getVersion()); } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index 58f1224e5..0c318134d 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -232,7 +232,7 @@ public class BlockStorage { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while loading this Block Inventory: " + file.getName()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while loading this Block Inventory: " + file.getName()); } } } @@ -248,7 +248,7 @@ public class BlockStorage { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while loading this universal Inventory: " + file.getName()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while loading this universal Inventory: " + file.getName()); } } } @@ -313,7 +313,7 @@ public class BlockStorage { Files.move(tmpFile.toPath(), cfg.getFile().toPath(), StandardCopyOption.ATOMIC_MOVE); } catch (IOException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while copying a temporary File for Slimefun " + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while copying a temporary File for Slimefun " + SlimefunPlugin.getVersion()); } } } @@ -418,7 +418,7 @@ public class BlockStorage { logger.log(Level.WARNING, ""); logger.log(Level.WARNING, "IGNORE THIS ERROR UNLESS IT IS SPAMMING"); logger.log(Level.WARNING, ""); - logger.log(Level.SEVERE, x, () -> "An Error occured while parsing Block Info for Slimefun " + SlimefunPlugin.getVersion()); + logger.log(Level.SEVERE, x, () -> "An Error occurred while parsing Block Info for Slimefun " + SlimefunPlugin.getVersion()); return null; } } @@ -681,7 +681,7 @@ public class BlockStorage { return id != null && id.equalsIgnoreCase(slimefunItem); } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occured while checking " + new BlockPosition(l) + " for: \"" + slimefunItem + "\""); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while checking " + new BlockPosition(l) + " for: \"" + slimefunItem + "\""); return false; } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java index 48937ae2a..0a160f544 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java @@ -196,7 +196,7 @@ public abstract class BlockMenuPreset extends ChestMenu { newInstance(menu, l.getBlock()); } catch (Exception | LinkageError x) { - getSlimefunItem().error("An eror occured while trying to create a BlockMenu", x); + getSlimefunItem().error("An Error occurred while trying to create a BlockMenu", x); } }); } From 00a61a296f28f54a88b3683b460393b026d4c6fe Mon Sep 17 00:00:00 2001 From: Scott Gomez Andoy Date: Thu, 25 Jun 2020 04:45:19 +0000 Subject: [PATCH 10/32] Translate messages_tl.yml via GitLocalize --- src/main/resources/languages/messages_tl.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/languages/messages_tl.yml b/src/main/resources/languages/messages_tl.yml index 647d43970..ad247b682 100644 --- a/src/main/resources/languages/messages_tl.yml +++ b/src/main/resources/languages/messages_tl.yml @@ -148,6 +148,10 @@ messages: - "&742. Ang sagot ay 42." - "&7Ang isang Walshy sa isang araw ay maiiwasan ang problema." - "&7Huwag kang maghukay na diretso pababa!" + - "&7Ito ay ngunit isang sugat sa laman!" + - "&7Laging tumingin sa maliwanag na bahagi ng buhay!" + - "&7Biskwit pala ito at hindi ito siya Kukis." + - "&7Ang astig ng mga Neon Signs!" machines: pattern-not-found: "&ePasensiya na, hindi ko maintindihan ang Recipe na ito. Pakilagay ang mga Aytem sa tamang pattern sa loob ng Dispense." @@ -315,3 +319,4 @@ languages: mk: Macedonian sr: Serbian be: Belarusian + tl: Tagalog/Filipino From ea9b2e24940758b951f7da3461f5bb073c2d302c Mon Sep 17 00:00:00 2001 From: Scott Gomez Andoy Date: Thu, 25 Jun 2020 04:45:20 +0000 Subject: [PATCH 11/32] Translate researches_tl.yml via GitLocalize --- .../resources/languages/researches_tl.yml | 84 ++++++++++--------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/src/main/resources/languages/researches_tl.yml b/src/main/resources/languages/researches_tl.yml index b69dd74a9..07d55f2cc 100644 --- a/src/main/resources/languages/researches_tl.yml +++ b/src/main/resources/languages/researches_tl.yml @@ -1,20 +1,20 @@ --- slimefun: - walking_sticks: Walking Sticks + walking_sticks: Mga Lumalakad na Tusok portable_crafter: Portable Crafter fortune_cookie: Fortune Cookie portable_dustbin: Portable Dustbin meat_jerky: Meat Jerky armor_forge: Armor Crafting glowstone_armor: Glowstone Armor - lumps: Lumps and Magic + lumps: Tipak at Mahika ender_backpack: Ender Backpack ender_armor: Ender Armor - magic_eye_of_ender: Magic Eye of Ender - magic_sugar: Magic Sugar + magic_eye_of_ender: Ang Mahiwagang Mata ng Ender + magic_sugar: Mahiwagang Asukal monster_jerky: Monster Jerky slime_armor: Slime Armor - sword_of_beheading: Sword of Beheading + sword_of_beheading: Espada sa Pagpugot ng Ulo basic_circuit_board: Basic Circuit Board advanced_circuit_board: Advanced Circuit Board smeltery: Smeltery @@ -23,7 +23,7 @@ slimefun: battery: Ang iyong unang Baterya steel_plate: Steel Plating steel_thruster: Steel Thruster - parachute: Parachute + parachute: Parasyut grappling_hook: Grappling Hook jetpacks: Jetpacks multitools: Multi Tools @@ -31,11 +31,11 @@ slimefun: elemental_staff: Elemental Staves grind_stone: Grind Stone cactus_armor: Cactus Suit - gold_pan: Gold Pan + gold_pan: Gintong Kawali magical_book_cover: Magical Book Binding - slimefun_metals: New Metals - ore_crusher: Ore Doubling - bronze: Bronze Creation + slimefun_metals: Bagong Metal + ore_crusher: Pag-dodoble ng Ore + bronze: Paglikha ng Tanso alloys: Advanced Alloys compressor_and_carbon: Carbon Creation gilded_iron_armor: Gilded Iron Armor @@ -45,12 +45,12 @@ slimefun: damascus_steel: Damascus Steel damascus_steel_armor: Damascus Steel Armor reinforced_alloy: Reinforced Alloy - carbonado: Black Diamonds + carbonado: Maitim na Brilyante magic_workbench: Magic Workbench wind_staff: Wind Staff reinforced_armor: Reinforced Armor - ore_washer: Ore Washer - gold_carats: Pure Gold + ore_washer: Panghugas ng Ore + gold_carats: Tunay na Ginto silicon: Silicon Valley fire_staff: Fire Staff smelters_pickaxe: Smelters Pickaxe @@ -67,44 +67,44 @@ slimefun: traveller_talisman: Ang Anting-anting ng Manlalakbay warrior_talisman: Ang Anting-anting ng Mandirigma knight_talisman: Ang Anting-anting ng Knight - gilded_iron: Shiny Iron - synthetic_emerald: Fake Gem + gilded_iron: Makintab na Bakal + synthetic_emerald: Pekeng Hiyas chainmail_armor: Chainmail Armor whirlwind_talisman: Ang Anting-anting ng Whirlwind wizard_talisman: Ang Anting-anting ng Wizard lumber_axe: Lumber Axe hazmat_suit: Hazmat Suit - uranium: Radioactive + uranium: Radyaktibo crushed_ore: Ore Purification redstone_alloy: Redstone Alloy carbonado_tools: Top Tier Machines - first_aid: First Aid - gold_armor: Shiny Armor + first_aid: Pangunahing Lunas + gold_armor: Makintab na Armor night_vision_googles: Night Vision Goggles - pickaxe_of_containment: Pickaxe of Containment + pickaxe_of_containment: Piko ng Lalagyanan hercules_pickaxe: Hercules Pickaxe - table_saw: Table Saw + table_saw: Lagari slime_steel_armor: Slimy Steel Armor blade_of_vampires: Blade of Vampires water_staff: Water Staff - 24k_gold_block: Golden City - composter: Composting Dirt - farmer_shoes: Farmer Shoes - explosive_tools: Explosive Tools - automated_panning_machine: Automated Gold Pan - boots_of_the_stomper: Boots of the Stomper - pickaxe_of_the_seeker: Pickaxe of the Seeker + 24k_gold_block: Ginintuang Lungsod + composter: Pinagsama-samang Putik + farmer_shoes: Sapatos ng Magsasaka + explosive_tools: Mga Tool na Paputok + automated_panning_machine: Awtomatikong Gintong Kawali + boots_of_the_stomper: Mga Boots ng Stomper + pickaxe_of_the_seeker: Piko ng Naghahanap backpacks: Mga Backpacks - woven_backpack: Woven Backpack - crucible: Crucible - gilded_backpack: Gilded Backpack - armored_jetpack: Armored Jetpack + woven_backpack: Habi na Backpack + crucible: Marurok + gilded_backpack: Ginintuan na Backpack + armored_jetpack: Nakabaluting Jetpack ender_talismans: Ender Talismans - nickel_and_cobalt: Even more Ores + nickel_and_cobalt: Mas maraming Ores magnet: Magnetic Metals infused_magnet: Infused Magnets cobalt_pickaxe: Speedy Pickaxe - essence_of_afterlife: Necromancy + essence_of_afterlife: Nigromansiya bound_backpack: Soulbound Storage jetboots: Jet Boots armored_jetboots: Armoured Jet Boots @@ -113,7 +113,7 @@ slimefun: bound_weapons: Soulbound Weapons bound_tools: Soulbound Tools bound_armor: Soulbound Armor - juicer: Delicious Drinks + juicer: Masarap na Inumin repaired_spawner: Repairing Spawners enhanced_furnace: Enhanced Furnace more_enhanced_furnaces: Better Furnaces @@ -122,9 +122,9 @@ slimefun: carbonado_furnace: Carbonado Edged furnace electric_motor: Heating up block_placer: Block Placer - scroll_of_dimensional_teleposition: Turning things around + scroll_of_dimensional_teleposition: Pagliko ng mga bagay special_bows: Robin Hood - tome_of_knowledge_sharing: Sharing with friends + tome_of_knowledge_sharing: Pagbabahagi sa mga kaibigan flask_of_knowledge: XP Storage hardened_glass: Withstanding Explosions golden_apple_juice: Golden Potion @@ -140,8 +140,8 @@ slimefun: duct_tape: Duct Tape plastic_sheet: Plastik android_memory_core: Memory Core - oil: Oil - fuel: Fuel + oil: Langis + fuel: Panggatong hologram_projector: Holograms capacitors: Tier 1 Capacitors high_tier_capacitors: Tier 2 Capacitors @@ -192,7 +192,7 @@ slimefun: fluid_pump: Fluid Pump better_freezer: Upgraded Freezer boosted_uranium: Never-Ending Circle - trash_can: Basura + trash_can: Basurahan advanced_output_node: Advanced Output Node carbon_press: Carbon Press electric_smeltery: Electric Smeltery @@ -205,7 +205,7 @@ slimefun: wither_assembler: Automated Wither Killer better_heated_pressure_chamber: Upgraded Heated Pressure Chamber elytra: Elytras - special_elytras: Espesyal na Elytras + special_elytras: Special Elytras electric_crucible: Electrified Crucible better_electric_crucibles: Hot Crucibles advanced_electric_smeltery: Advanced Electric Smeltery @@ -228,9 +228,11 @@ slimefun: charging_bench: Charging Bench nether_gold_pan: Nether Gold Pan electric_press: Electric Press - magnesium_generator: Kapangyarihan mula sa Magnesium + magnesium_generator: Power of Magnesium kelp_cookie: Tasty Kelp makeshift_smeltery: Improvised Smeltery tree_growth_accelerator: Faster Trees industrial_miner: Industrial Mining advanced_industrial_miner: Better Mining + magical_zombie_pills: De-Zombification + auto_brewer: Industrial Brewery From c5e1b2aadf9406d48ad17fc311d15ed409c4f873 Mon Sep 17 00:00:00 2001 From: mt-gitlocalize Date: Thu, 25 Jun 2020 04:45:21 +0000 Subject: [PATCH 12/32] Translate researches_tl.yml via GitLocalize From 81e16a6c472c767830489b0edd3e0159abe7042b Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Thu, 25 Jun 2020 06:05:17 +0100 Subject: [PATCH 13/32] 1.16 support --- pom.xml | 14 ++-- .../slimefun4/api/MinecraftVersion.java | 6 ++ .../implementation/tasks/TickerTask.java | 35 ++++++---- .../Slimefun/SlimefunPlugin.java | 68 ++++++++----------- .../tests/geo/TestResourceRegistration.java | 12 ++-- 5 files changed, 68 insertions(+), 67 deletions(-) diff --git a/pom.xml b/pom.xml index a825e329d..02b2f697d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.8 - 1.15.2 + 1.16.1 https://hub.spigotmc.org/javadocs/bukkit/ @@ -270,15 +270,15 @@ - org.bukkit - bukkit + org.spigotmc + spigot-api ${bukkit.version}-R0.1-SNAPSHOT provided - com.github.TheBusyBiscuit + com.github.WalshyDev CS-CoreLib - 4a7fce5202 + aa3bc64df3 provided @@ -304,9 +304,9 @@ - com.github.thebusybiscuit + com.github.WalshyDev CS-CoreLib2 - 0.21 + 2ed2ddcfcd compile diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java index 9dbe51b8d..821b07001 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java @@ -32,6 +32,12 @@ public enum MinecraftVersion { */ MINECRAFT_1_15("1.15.x"), + /** + * This constant represents Minecraft (Java Edition) Version 1.16 + * (The "Nether Update") + */ + MINECRAFT_1_16("1.16.x"), + /** * This constant represents an exceptional state in which we were unable * to identify the Minecraft Version we are using diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java index 8d6dad860..d513e2fff 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java @@ -17,6 +17,19 @@ import java.util.logging.Level; import java.util.stream.Collectors; import java.util.stream.Stream; +import io.github.thebusybiscuit.cscorelib2.chat.ChatColors; +import io.github.thebusybiscuit.slimefun4.api.ErrorReport; +import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; +import me.mrCookieSlime.Slimefun.api.BlockStorage; +import me.mrCookieSlime.Slimefun.api.Slimefun; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.chat.TextComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Chunk; @@ -26,18 +39,6 @@ import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.cscorelib2.chat.ChatColors; -import io.github.thebusybiscuit.cscorelib2.chat.json.ChatComponent; -import io.github.thebusybiscuit.cscorelib2.chat.json.HoverEvent; -import io.github.thebusybiscuit.slimefun4.api.ErrorReport; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; -import me.mrCookieSlime.Slimefun.SlimefunPlugin; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; -import me.mrCookieSlime.Slimefun.api.BlockStorage; -import me.mrCookieSlime.Slimefun.api.Slimefun; - public class TickerTask implements Runnable { private static final int VISIBILITY_THRESHOLD = 200_000; @@ -251,7 +252,9 @@ public class TickerTask implements Runnable { List> timings = stream.sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).collect(Collectors.toList()); if (sender instanceof Player) { - ChatComponent component = new ChatComponent(ChatColors.color(" &7&oHover for more Info")); + TextComponent component = new TextComponent(" Hover for more Info"); + component.setColor(net.md_5.bungee.api.ChatColor.GRAY); + component.setItalic(true); StringBuilder builder = new StringBuilder(); int hidden = 0; @@ -265,9 +268,11 @@ public class TickerTask implements Runnable { } builder.append("\n\n&c+ &4").append(hidden).append(" Hidden"); - component.setHoverEvent(new HoverEvent(ChatColors.color(builder.toString()))); - component.sendMessage((Player) sender); + component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + TextComponent.fromLegacyText(builder.toString()))); + + sender.spigot().sendMessage(component); } else { int hidden = 0; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index f91cf72d5..8e325074e 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -9,16 +9,6 @@ import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors; -import org.bukkit.Bukkit; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.plugin.java.JavaPluginLoader; - import io.github.thebusybiscuit.cscorelib2.config.Config; import io.github.thebusybiscuit.cscorelib2.math.DoubleHandler; import io.github.thebusybiscuit.cscorelib2.protection.ProtectionManager; @@ -96,14 +86,22 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.inventory.UniversalBlockMenu; +import org.bukkit.Bukkit; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.plugin.java.JavaPluginLoader; /** * This is the main class of Slimefun. * This is where all the magic starts, take a look around. * Feel like home. - * - * @author TheBusyBiscuit * + * @author TheBusyBiscuit */ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { @@ -161,8 +159,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { local = new LocalizationService(this, "", null); gpsNetwork = new GPSNetwork(); command.register(); - } - else if (getServer().getPluginManager().isPluginEnabled("CS-CoreLib")) { + } else if (getServer().getPluginManager().isPluginEnabled("CS-CoreLib")) { long timestamp = System.nanoTime(); // We wanna ensure that the Server uses a compatible version of Minecraft @@ -200,8 +197,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { if (config.getBoolean("options.auto-update")) { getLogger().log(Level.INFO, "Starting Auto-Updater..."); updaterService.start(); - } - else { + } else { updaterService.disable(); } @@ -295,8 +291,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { // Hooray! getLogger().log(Level.INFO, "Slimefun has finished loading in {0}", getStartupTime(timestamp)); - } - else { + } else { getLogger().log(Level.INFO, "#################### - INFO - ####################"); getLogger().log(Level.INFO, " "); getLogger().log(Level.INFO, "Slimefun could not be loaded (yet)."); @@ -317,8 +312,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { if (ms > 1000) { return DoubleHandler.fixDouble(ms / 1000.0) + "s"; - } - else { + } else { return DoubleHandler.fixDouble(ms) + "ms"; } } @@ -326,7 +320,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This method checks for the {@link MinecraftVersion} of the {@link Server}. * If the version is unsupported, a warning will be printed to the console. - * + * * @return Whether the {@link MinecraftVersion} is unsupported */ private boolean isVersionUnsupported() { @@ -397,12 +391,10 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { if (storage != null) { storage.save(true); - } - else { + } else { getLogger().log(Level.SEVERE, "Could not save Slimefun Blocks for World \"{0}\"", world.getName()); } - } - catch (Exception x) { + } catch (Exception x) { getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world.getName() + "' for Slimefun " + getVersion()); } } @@ -435,8 +427,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { } private void createDirectories() { - String[] storageFolders = { "Players", "blocks", "stored-blocks", "stored-inventories", "stored-chunks", "universal-inventories", "waypoints", "block-backups" }; - String[] pluginFolders = { "scripts", "generators", "error-reports", "cache/github", "world-settings" }; + String[] storageFolders = {"Players", "blocks", "stored-blocks", "stored-inventories", "stored-chunks", "universal-inventories", "waypoints", "block-backups"}; + String[] pluginFolders = {"scripts", "generators", "error-reports", "cache/github", "world-settings"}; for (String folder : storageFolders) { File file = new File("data-storage/Slimefun", folder); @@ -458,8 +450,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { private void loadItems() { try { SlimefunItemSetup.setup(this); - } - catch (Exception | LinkageError x) { + } catch (Exception | LinkageError x) { getLogger().log(Level.SEVERE, x, () -> "An Error occured while initializing SlimefunItems for Slimefun " + getVersion()); } } @@ -467,8 +458,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { private void loadResearches() { try { ResearchSetup.setupResearches(); - } - catch (Exception | LinkageError x) { + } catch (Exception | LinkageError x) { getLogger().log(Level.SEVERE, x, () -> "An Error occured while initializing Slimefun Researches for Slimefun " + getVersion()); } } @@ -495,7 +485,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This returns the version of Slimefun that is currently installed. - * + * * @return The currently installed version of Slimefun */ public static String getVersion() { @@ -508,7 +498,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This returns the {@link LocalizationService} of Slimefun. - * + * * @return The {@link LocalizationService} of Slimefun */ public static LocalizationService getLocal() { @@ -546,7 +536,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This method returns the {@link UpdaterService} of Slimefun. * It is used to handle automatic updates. - * + * * @return The {@link UpdaterService} for Slimefun */ public static UpdaterService getUpdater() { @@ -556,7 +546,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This method returns the {@link GitHubService} of Slimefun. * It is used to retrieve data from GitHub repositories. - * + * * @return The {@link GitHubService} for Slimefun */ public static GitHubService getGitHubService() { @@ -590,9 +580,9 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This method returns a {@link Set} of every {@link Plugin} that lists Slimefun * as a required or optional dependency. - * + *

* We will just assume this to be a list of our addons. - * + * * @return A {@link Set} of every {@link Plugin} that is dependent on Slimefun */ public static Set getInstalledAddons() { @@ -601,7 +591,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * The {@link Command} that was added by Slimefun. - * + * * @return Slimefun's command */ public static SlimefunCommand getCommand() { @@ -610,7 +600,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { /** * This returns the currently installed version of Minecraft. - * + * * @return The current version of Minecraft */ public static MinecraftVersion getMinecraftVersion() { diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/geo/TestResourceRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/geo/TestResourceRegistration.java index fdc5c0758..86c872432 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/geo/TestResourceRegistration.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/geo/TestResourceRegistration.java @@ -40,13 +40,13 @@ public class TestResourceRegistration { @Test @Order(value = 1) public void testDefaultResources() { - Assertions.assertDoesNotThrow(() -> GEOResourcesSetup.setup()); + Assertions.assertDoesNotThrow(GEOResourcesSetup::setup); } @Test @Order(value = 2) public void testDoubleRegistration() { - Assertions.assertThrows(IllegalArgumentException.class, () -> GEOResourcesSetup.setup()); + Assertions.assertThrows(IllegalArgumentException.class, GEOResourcesSetup::setup); } private GEOResource testResource(NamespacedKey key, String name, ItemStack item, boolean miner, int deviation) { @@ -66,7 +66,7 @@ public class TestResourceRegistration { NamespacedKey key = new NamespacedKey(plugin, "oil"); GEOResource resource = testResource(key, "Oil", SlimefunItems.OIL_BUCKET, false, 8); - Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER)); + Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER_WASTES)); Assertions.assertNotEquals(0, resource.getDefaultSupply(Environment.NORMAL, Biome.BEACH)); Assertions.assertTrue(resource.getDefaultSupply(Environment.NORMAL, Biome.DESERT) > 10); @@ -83,7 +83,7 @@ public class TestResourceRegistration { NamespacedKey key = new NamespacedKey(plugin, "nether_ice"); GEOResource resource = testResource(key, "Nether Ice", SlimefunItems.NETHER_ICE, true, 6); - Assertions.assertNotEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER)); + Assertions.assertNotEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER_WASTES)); Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NORMAL, Biome.DESERT)); } @@ -93,7 +93,7 @@ public class TestResourceRegistration { GEOResource resource = testResource(key, "Small Chunks of Uranium", SlimefunItems.SMALL_URANIUM, true, 2); Assertions.assertNotEquals(0, resource.getDefaultSupply(Environment.NORMAL, Biome.MOUNTAINS)); - Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER)); + Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER_WASTES)); Assertions.assertEquals(0, resource.getDefaultSupply(Environment.THE_END, Biome.THE_END)); } @@ -102,7 +102,7 @@ public class TestResourceRegistration { NamespacedKey key = new NamespacedKey(plugin, "salt"); GEOResource resource = testResource(key, "Salt", SlimefunItems.SALT, true, 18); - Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER)); + Assertions.assertEquals(0, resource.getDefaultSupply(Environment.NETHER, Biome.NETHER_WASTES)); Assertions.assertEquals(0, resource.getDefaultSupply(Environment.THE_END, Biome.THE_END)); Assertions.assertNotEquals(0, resource.getDefaultSupply(Environment.NORMAL, Biome.MOUNTAINS)); From 3ee151b0697a1330db76ccd38a84dbc5a6445554 Mon Sep 17 00:00:00 2001 From: Scott Gomez Andoy Date: Thu, 25 Jun 2020 05:51:05 +0000 Subject: [PATCH 14/32] Translate messages_tl.yml via GitLocalize --- src/main/resources/languages/messages_tl.yml | 78 ++++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/main/resources/languages/messages_tl.yml b/src/main/resources/languages/messages_tl.yml index ad247b682..8568fc2f3 100644 --- a/src/main/resources/languages/messages_tl.yml +++ b/src/main/resources/languages/messages_tl.yml @@ -15,8 +15,8 @@ commands: reset: "&cNareset mo ang Knowledge para kay %player%." reset-target: "&cNareset ang iyong Knowledge." backpack: - description: Kunin ang isang kopya ng isang umiiral na backpack - invalid-id: "&4Ang id ay dapat na isang hindi negatibong numero!" + description: Kunin ang kopya ng isang umiiral na backpack. + invalid-id: "&4Ang ID ay dapat merong isang negatibong numero!" player-never-joined: "&4Walang nahanap na manlalaro na may pangalang iyon!" backpack-does-not-exist: "&4Ang tinukoy na backpack ay hindi umiiral!" restored-backpack-given: "&aAng iyong backpack ay naibalik at naidagdag sa iyong @@ -25,7 +25,7 @@ guide: search: message: "&bAno ang hinahanap mo?" name: "&7Hanap..." - tooltip: "&bI-click upang maghanap para sa isang item" + tooltip: "&bI-click ito upang maghanap para sa isang item." inventory: 'Naghahanap para sa: %item%' cheat: no-multiblocks: "&4Hindi ka puwedeng mag-daya sa Multiblocks, kailangan mo itong @@ -34,9 +34,9 @@ guide: updated: "&aNapalitan na ang iyong wika sa: &b%lang%" translations: name: "&aMay kulang ba?" - lore: I-click upang magdagdag ng iyong sariling pagsasalin - select: I-click upang piliin ang wikang ito - select-default: I-click upang piliin ang default na wika + lore: I-click ito upang magdagdag ng iyong sariling pagsasalin. + select: I-click ito upang piliin ang wikang ito. + select-default: I-click ito upang piliin ang default na wika. selected-language: 'Kasalukuyang pinili:' title: main: Slimefun Guide @@ -55,28 +55,28 @@ guide: wiki: "&3Wiki Editor" resourcepack: "&cResourcepack Artist" translator: "&9Translator" - profile-link: I-click upang bisitahin ang kanilang profile sa GitHub + profile-link: I-click ito upang bisitahin ang kanilang profile sa GitHub. pages: - previous: Nakaraang pahina - next: Susunod na pahina + previous: Nakaraang pahina. + next: Susunod na pahina. tooltips: - open-category: I-click upang buksan + open-category: I-click ito para buksan. versions-notice: Napakahalaga ng mga ito kapag nag-uulat ng mga bug! - wiki: Tingnan ang item na ito sa opisyal na Slimefun Wiki + wiki: Tingnan ang item na ito sa opisyal na Slimefun Wiki. recipes: - machine: Mga recipe na ginawa sa Makina na ito - miner: Mga mapagkukunan na maaari mong makuha sa Miner na ito - generator: Magagamit na mga uri ng gasolina - gold-pan: Mga mapagkukunan na maaari mong makuha + machine: Mga recipe na ginawa sa Makina na ito. + miner: Mga mapagkukunan na maaari mong makuha sa Miner na ito. + generator: Magagamit na mga uri ng gasolina. + gold-pan: Mga mapagkukunan na maaari mong makuha. back: title: Balik guide: Bumalik sa Slimefun Guide settings: Bumalik sa Settings Panel locked: NAKAKANDADO locked-category: - - Upang i-unlock ang kategoryang ito + - Upang i-unlock ang kategoryang ito, - kailangang i-unlock ang lahat ng mga item mula sa - - sumusunod na mga kategorya + - sumusunod na kategorya. messages: not-researched: "&4Kulang ang iyong Knowledge upang ito'y maintindihan." not-enough-xp: "&4Kulang ang iyong XP upang ito'y ma-unlock." @@ -190,9 +190,9 @@ machines: cancelled: "&4Na-kansel ang teleportation!" invulnerability: "&b&lBinigyan ka ng 30 segundo ng Invulnerability!" gui: - title: Ang iyong mga waypoints - tooltip: I-click para mag-teleport - time: Tinatayang oras + title: Ang iyong mga waypoints. + tooltip: I-click ito para mag-teleport. + time: Tinatayang oras. CARGO_NODES: must-be-placed: "&4Kailangang mailagay ito sa isang chest o makina!" GPS_CONTROL_PANEL: @@ -207,8 +207,8 @@ machines: piston-space: "&cAng dalawang piston ay kailangang magkaroon ng isang walang laman na block sa itaas ng mga ito!" destroyed: "&cAng iyong Industrial Miner ay nawasak." - already-running: "&cAng Industrial Miner na ito ay tumatakbo na!" - full-chest: "&cAng chest ng iyong Industrial Miner ay puno!" + already-running: "&cAng Industrial Miner na ito ay gumagana na!" + full-chest: "&cAng chest ng iyong Industrial Miner ay puno na!" no-permission: "&4Mukhang wala kang pahintulot upang mapatakbo ang isang Industrial Miner dito!" finished: "&eTapos na ang iyong Industrial Miner! Nakuha nito ang isang kabuuang @@ -216,7 +216,7 @@ machines: anvil: not-working: "&4Hindi puwedeng gamitin ang mga Slimefun Aytem sa isang Anvil!" backpack: - already-open: "&cPasensiya na, ang backpack na ito ay nakabukas na sa ibang lugar!" + already-open: "&cSorry, ang backpack na ito ay nakabukas na sa ibang lugar!" no-stack: "&cHindi puwedeng i-stack ang mga Backpack." workbench: not-enhanced: "&4Hindi puwedeng gamitin ang mga Slimefun Aytem sa normal na workbench." @@ -225,7 +225,7 @@ gps: waypoint: new: "&eMangyaring mag-type ng isang pangalan para sa iyong bagong waypoint sa chat. &7(Supported ang Color Codes!)" - added: "&aTagumpay ang pag-add ng bagong waypoint" + added: "&aTagumpay ang pag-add ng bagong waypoint." max: "&4Naabot mo na ang maximum amount ng waypoints." insufficient-complexity: - "&4Kulang ang GPS Network Complexity: &c%complexity%" @@ -242,20 +242,20 @@ android: scripts: already-uploaded: "&4Na-upload na ang script na ito." instructions: - START: "&2Simulan ang Script" - REPEAT: "&9Ulitin ang Script" + START: "&2Simulan ang Script." + REPEAT: "&9Ulitin ang Script." WAIT: "&eHintay 0.5s" - GO_FORWARD: "&7Umabante" - GO_UP: "&7Pataas" - GO_DOWN: "&7Pababa" - TURN_LEFT: "&7Lumiko pakaliwa" - TURN_RIGHT: "&7Lumiko pakanan" - DIG_UP: "&bMaghukay pataas" - DIG_FORWARD: "&bMaghukay paabante" - DIG_DOWN: "&bMaghukay pababa" - MOVE_AND_DIG_UP: "&bGumalaw at Maghukay pataas" - MOVE_AND_DIG_FORWARD: "&bGumalaw at Maghukay paabante" - MOVE_AND_DIG_DOWN: "&bGumalaw at Maghukay pababa" + GO_FORWARD: "&7Umabante." + GO_UP: "&7Pataas." + GO_DOWN: "&7Pababa." + TURN_LEFT: "&7Lumiko pakaliwa." + TURN_RIGHT: "&7Lumiko pakanan." + DIG_UP: "&bMaghukay pataas." + DIG_FORWARD: "&bMaghukay paabante." + DIG_DOWN: "&bMaghukay pababa." + MOVE_AND_DIG_UP: "&bGumalaw at Maghukay pataas." + MOVE_AND_DIG_FORWARD: "&bGumalaw at Maghukay paabante." + MOVE_AND_DIG_DOWN: "&bGumalaw at Maghukay pababa." ATTACK_MOBS_ANIMALS: "&4Atake &c(Mga matatapang na mobs at mga hayop)" ATTACK_MOBS: "&4Atake &c(Mga matatapang na mobs)" ATTACK_ANIMALS: "&4Atake &c(Mga hayop)" @@ -275,8 +275,8 @@ android: - "&bUploading..." - "&aTagumpay ang pag-upload ng script!" rating: - own: "&4Hindi puwedeng i-rate ang sarili mong script!" - already: "&4Nakapag-iwan ka na ng Rating para sa script na ito!" + own: "&4Hindi puwedeng i-marka ang sarili mong script!" + already: "&4Nakapag-iwan ka na ng marka para sa script na ito!" editor: Script Editor languages: default: Server-Default From d76e2fb75230fd8683a2eaf26e8f654a24ebb26e Mon Sep 17 00:00:00 2001 From: Scott Gomez Andoy Date: Thu, 25 Jun 2020 05:57:06 +0000 Subject: [PATCH 15/32] Translate researches_tl.yml via GitLocalize --- src/main/resources/languages/researches_tl.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/languages/researches_tl.yml b/src/main/resources/languages/researches_tl.yml index 07d55f2cc..224a6c1bb 100644 --- a/src/main/resources/languages/researches_tl.yml +++ b/src/main/resources/languages/researches_tl.yml @@ -19,7 +19,7 @@ slimefun: advanced_circuit_board: Advanced Circuit Board smeltery: Smeltery steel: Steel Age - misc_power_items: Mahalagang Mga item na nauugnay sa kapangyarihan + misc_power_items: Mga mahahalagang item na nauugnay sa kapangyarihan battery: Ang iyong unang Baterya steel_plate: Steel Plating steel_thruster: Steel Thruster @@ -119,7 +119,7 @@ slimefun: more_enhanced_furnaces: Better Furnaces high_tier_enhanced_furnaces: High Tier Furnace reinforced_furnace: Reinforced Furnace - carbonado_furnace: Carbonado Edged furnace + carbonado_furnace: Carbonado Edged Furnace electric_motor: Heating up block_placer: Block Placer scroll_of_dimensional_teleposition: Pagliko ng mga bagay @@ -224,7 +224,7 @@ slimefun: soulbound_rune: Soulbound Rune geo_miner: GEO-Miner lightning_rune: Lightning Rune - totem_of_undying: Totem ng Undying + totem_of_undying: Totem ng Walang Kamatayan charging_bench: Charging Bench nether_gold_pan: Nether Gold Pan electric_press: Electric Press From 8ec118f88c77724e116bd22552f34db027f75c2d Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Thu, 25 Jun 2020 06:07:06 +0000 Subject: [PATCH 16/32] Translate categories_tr.yml via GitLocalize --- src/main/resources/languages/categories_tr.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/resources/languages/categories_tr.yml b/src/main/resources/languages/categories_tr.yml index 087c54c33..cd7389270 100644 --- a/src/main/resources/languages/categories_tr.yml +++ b/src/main/resources/languages/categories_tr.yml @@ -1,25 +1,26 @@ --- slimefun: weapons: Silahlar + tools: Aletler + items: Yararlı Eşyalar food: Yemek basic_machines: Temel Makineler electricity: Enerji ve Elektrik gps: GPS Tabanlı Makineler armor: Zırh magical_items: Büyülü Eşyalar + magical_gadgets: Büyülü Cihazlar misc: Çeşitli Eşyalar + technical_gadgets: Teknik Cihazlar resources: Kaynaklar cargo: Kargo Yönetimi + tech_misc: Teknik Bileşenler magical_armor: Büyülü Zırh talismans: Tılsımlar (Seviye I) ender_talismans: Ender Tılsımları (Seviye II) christmas: Noel (Aralık) valentines_day: Sevgililer Günü (14 Şubat) easter: Paskalya (Nisan) - halloween: Cadılar Bayramı (31 Ekim) - tools: Aletler - items: Yararlı Eşyalar - magical_gadgets: Büyülü Cihazlar - technical_gadgets: Teknik Cihazlar - tech_misc: Teknik Bileşenler birthday: TheBusyBiscuit'ün doğum günü (26 Ekim) + halloween: Cadılar Bayramı (31 Ekim) + androids: Programlanabilir Androidler From 2cd81a2dbcc8c676c00e244a28218197a5b39059 Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Thu, 25 Jun 2020 06:07:35 +0000 Subject: [PATCH 17/32] Translate messages_tr.yml via GitLocalize --- src/main/resources/languages/messages_tr.yml | 527 ++++++++++--------- 1 file changed, 266 insertions(+), 261 deletions(-) diff --git a/src/main/resources/languages/messages_tr.yml b/src/main/resources/languages/messages_tr.yml index 613d0dd7d..3dd4e8ea2 100644 --- a/src/main/resources/languages/messages_tr.yml +++ b/src/main/resources/languages/messages_tr.yml @@ -1,247 +1,138 @@ --- -android: - scripts: - already-uploaded: "&4Bu senaryo zaten yüklendi." - editor: Senaryo Editörü - enter-name: - - - - "&eLütfen senaryonuz için bir ad yazınız" - instructions: - ATTACK_ANIMALS: "&4Saldır &c(Hayvanlar)" - ATTACK_ANIMALS_ADULT: "&4Saldır &c(Hayvanlar &7[Yetişkin]&c)" - ATTACK_MOBS: "&4Saldır &c(Canavarlar)" - ATTACK_MOBS_ANIMALS: "&4Saldır &c(Canavarlar & Hayvanlar)" - CATCH_FISH: "&bBalık Tut" - CHOP_TREE: "&cKes ve Ek" - DIG_DOWN: "&bAltını Kaz" - DIG_FORWARD: "&bİleriyi Kaz" - DIG_UP: "&bYukarıyı Kaz" - FARM_DOWN: "&bToplama ve Ekim &7(Altındaki blok)" - FARM_EXOTIC_DOWN: "&bGelişmişce Topla ve Ek &7(Altındaki blok)" - FARM_EXOTIC_FORWARD: "&bGelişmişce Topla ve Ek" - FARM_FORWARD: "&bTopla ve Ek" - GO_DOWN: "&7Aşağıya İn" - GO_FORWARD: "&7İleri Git" - GO_UP: "&7Yukarı Çık" - INTERFACE_FUEL: "&cÖndeki Arayüzden Yakıt çek" - INTERFACE_ITEMS: "&9Envanter İçeriğini öndeki Arayüze aktar" - MOVE_AND_DIG_DOWN: "&bİlerle ve Altını Kaz" - MOVE_AND_DIG_FORWARD: "&bİlerle ve İleriyi Kaz" - MOVE_AND_DIG_UP: "&bİlerle ve Yukarıyı Kaz" - REPEAT: "&9Senaryoyu Tekrar Et" - START: "&2Senaryoyu başlat" - TURN_LEFT: "&7Sola Dön" - TURN_RIGHT: "&7Sağa Dön" - WAIT: "&e0.5s Bekle" - rating: - already: "&4Bu senaryo için zaten oy kullandın!" - own: "&4Kendi senaryonu oylayamazın!" - uploaded: - - "&bYükleniyor..." - - "&aSenaryon başarıyla yüklendi!" - started: "&7Androidiniz senaryoyu uygulamaya devam ediyor" - stopped: "&7Androidiniz senaryoyu duraklattı" -anvil: - not-working: "&4Slimefun eşyalarını örste kullanamazsın!" -backpack: - already-open: "&cÜzgünüm, bu Sırt Çantası başka bir yerde açık!" - no-stack: "&cSırt Çantalarını istifleyemezsiniz" commands: + help: Yardım ekranını görüntüler cheat: Hile Yapmanıza olanak sağlar give: Birisine Slimefun Eşyası verir guide: Kendinize bir Slimefun Rehberi verir - help: Yardım ekranını görüntüler + timings: |- + Sunucunuz Hakkında Gecikme Bilgisini + gösterir + teleporter: Diğer Bir Oyuncunun Yer Noktalarına Bakın + versions: Yüklü tüm Eklentileri listeler + search: Rehberinizde belirtilen eşyayı arar open_guide: Kitabı kullanmadan Slimefun Rehberini açar + stats: Oyuncu hakkında bazı İstatistikleri Gösterir research: description: Bir oyuncu için araştırmaların kilidini açma / sıfırlama reset: "&c %player%'ın Bilgisini sıfırladınız" reset-target: "&cBilginiz sıfırlandı" - search: Rehberinizde belirtilen eşyayı arar - stats: Oyuncu hakkında bazı İstatistikleri Gösterir - teleporter: Diğer Bir Oyuncunun Yer Noktalarına Bakın - timings: |- - Sunucunuz Hakkında Gecikme Bilgisini - gösterir - versions: Yüklü tüm Eklentileri listeler backpack: description: Varolan bir sırt çantasının kopyasını elde et invalid-id: "&4Id negatif olmayan bir numara olmalı!" player-never-joined: "&4Bu adda bir oyuncu bulunamadı!" backpack-does-not-exist: "&4Böyle bir sırt çantası yok." restored-backpack-given: "&aSırt çantanız bulundu ve envanterinize teslim edildi!" -gps: - deathpoint: "&4Ölüm Noktası &7%date%" - geo: - scan-required: "&4GEO-Taraması gerekli! &cİlk önce bir GEO-Tarayıcı kullanarak - bu bölgeyi tarayın!" - insufficient-complexity: - - "&4Yetersiz GPS Ağ Gücü: &c%complexity%" - - "&4a) Henüz bir GPS Ağı kurulumunuz yok" - - "&4b) GPS Ağınız yeterince güçlü değil" - waypoint: - added: "&aYeni bir yer noktası başarıyla eklendi" - max: "&4Maksimum yer noktası sayısına ulaştınız" - new: "&eLütfen sohbette yeni yer noktanız için bir ad yazın. &7(Renk Kodları destekleniyor!)" guide: - back: - guide: Slimefun Rehberine geri dön - settings: Ayarlar Paneline geri dön - title: Geri + search: + message: "&bNe aramak istersiniz?" + name: "&7Ara..." + tooltip: "&bBir eşyayı aramak için tıklayın" + inventory: 'Eşya aranıyor: %item%' + lore: + - "&bNe aramak istersiniz?" + - "&7Arama teriminizi sohbete yazınız." cheat: no-multiblocks: "&4Yapı Oluşturmada hile yapamazsınız, onları inşa etmelisiniz!" - credits: - commit: Geliştiirme - commits: Geliştirmeler - profile-link: GitHubdaki profillerini ziyaret etmek için tıklayın - roles: - developer: "&6Geliştirici" - resourcepack: "&cKaynak Paketi Tasarımcısı" - translator: "&9Çevirmen" - wiki: "&3Wiki Editörü" languages: + updated: "&aDiliniz başarıyla ayarlandı: &b%lang%" + translations: + name: "&aBir şeyler mi eksik?" + lore: Kendi çevirinizi eklemek için tıklayın select: Bu dili seçmek için tıklayın select-default: Varsayılan dili seçmek için tıklayın selected-language: 'Şuan seçili:' - translations: - lore: Kendi çevirinizi eklemek için tıklayın - name: "&aBir şeyler mi eksik?" - updated: "&aDiliniz başarıyla ayarlandı: &b%lang%" + title: + main: Slimefun Rehberi + settings: Ayarlar & Bilgi + languages: Tercih ettiğiniz dili seçin + credits: Slimefun4 Katkıda Bulunanlar + wiki: Slimefun4 Wiki + addons: Slimefun4 için Eklentiler + bugs: Hata Raporları + source: Kaynak Kodu + credits: + commit: Geliştiirme + commits: Geliştirmeler + roles: + developer: "&6Geliştirici" + wiki: "&3Wiki Editörü" + resourcepack: "&cKaynak Paketi Tasarımcısı" + translator: "&9Çevirmen" + profile-link: GitHubdaki profillerini ziyaret etmek için tıklayın + pages: + previous: Önceki sayfa + next: Sonraki sayfa + tooltips: + open-category: Açmak için tıklayın + versions-notice: Hata bildirirken bunlar çok önemlidir! + wiki: Bu eşyayı Slimefun Wikisinde görüntüle + recipes: + machine: Bu makinede üretilen tarifler + miner: Bu madenciyle elde edebileceğin kaynaklar + generator: Müsait yakıt türleri + gold-pan: Elde edebileceğin kaynaklar + back: + title: Geri + guide: Slimefun Rehberine geri dön + settings: Ayarlar Paneline geri dön locked: KİLİTLİ locked-category: - Bu kategoriyi açmak için - aşağıdaki kategorilerde bulunan - bütün eşyaları açın - pages: - next: Sonraki sayfa - previous: Önceki sayfa - search: - inventory: 'Eşya aranıyor: %item%' - lore: - - "&bNe aramak istersiniz?" - - "&7Arama teriminizi sohbete yazınız." - message: "&bNe aramak istersiniz?" - name: "&7Ara..." - tooltip: "&bBir eşyayı aramak için tıklayın" - title: - addons: Slimefun4 için Eklentiler - bugs: Hata Raporları - credits: Slimefun4 Katkıda Bulunanlar - languages: Tercih ettiğiniz dili seçin - main: Slimefun Rehberi - settings: Ayarlar & Bilgi - source: Kaynak Kodu - wiki: Slimefun4 Wiki - tooltips: - open-category: Açmak için tıklayın - recipes: - generator: Müsait yakıt türleri - gold-pan: Elde edebileceğin kaynaklar - machine: Bu makinede üretilen tarifler - miner: Bu madenciyle elde edebileceğin kaynaklar - versions-notice: Hata bildirirken bunlar çok önemlidir! - wiki: Bu eşyayı Slimefun Wikisinde görüntüle -inventory: - no-access: "&4Bu bloğa erişmenize izin verilmiyor" -languages: - af: Afrikanca - ar: Arapça - bg: Bulgarca - cs: Çekce - da: Danca - de: Almanca - default: Sunucu Varsayılanı - el: Yunanca - en: İngilizce - es: İspanyolca - fa: Persçe - fi: Fince - fr: Fransızca - he: İbranice - hu: Macarca - id: Endonezyaca - it: İtalyanca - ja: Japonca - ko: Korece - lv: Letonyaca - ms: Malayca - nl: Flemenkçe - 'no': Norveçce - pl: Lehçe - pt: Portekizce (Portekiz) - pt-BR: Portekizce (Brezilya) - ro: Romanca - ru: Rusça - sk: Slovakça - sv: İsveççe - th: Tayca - tr: Türkçe - uk: Ukraynaca - vi: Vietnamca - zh-CN: Çince (Çin) - zh-TW: Çince (Tayvan) - hr: Hırvatça - mk: Makedonca - sr: Sırpça - be: Belarusça -machines: - ANCIENT_ALTAR: - not-enough-pedestals: "&4Altar, gerekli Sütun miktarı ile çevrili değil &c(%pedestals% - / 8)" - unknown-catalyst: "&4Bilinmeyen Katalizör! &cDoğru Tarifi kullanın!" - unknown-recipe: "&4Bilinmeyen Tarif! &cDoğru Tarifi kullanın!" - ANCIENT_PEDESTAL: - obstructed: "&4Sütun tıkandı! &cSütunun üstündeki herhangi bir şeyi kaldırın!" - CARGO_NODES: - must-be-placed: "&4Mutlaka bir sandık veya makineye bağlanmalı!" - ELEVATOR: - click-to-teleport: "&7Bu yere ışınlanmak için &eTıkla:" - current-floor: "&eŞu anda bulunduğunuz kat:" - enter-name: "&7Lütfen sohbette yeni katınız için bir ad yazın. &r(Renk kodları - destekleniyor!)" - named: "&2Bu kat başarıyla isimlendirildi: &r%floor%" - no-destinations: "&4Varış noktası bulunamadı" - pick-a-floor: "&3- Bir kat seçin -" - full-inventory: "&eÜzgünüm, envanterim çok dolu!" - GPS_CONTROL_PANEL: - title: GPS - Kontrol Paneli - transmitters: Verici Genel Bakışı - waypoints: Yer Noktası Genel Bakışı - HOLOGRAM_PROJECTOR: - enter-text: "&7Lütfen Sohbette istediğiniz Hologram Metnini yazın. &r(Renk Kodları - destekleniyor!)" - inventory-title: Hologram Editörü - ignition-chamber-no-flint: "&cAteşleme Odasında Çakmak eksik." - in-use: "&cBu Bloğun envanteri şu anda farklı bir Oyuncu tarafından açıldı." - pattern-not-found: "&eÜzgünüm, bu tarifi tanıyamadım. Lütfen Eşyaları Dağıtıcıya - doğru şekilde yerleştirin." - TELEPORTER: - cancelled: "&4Işınlanma İptal Edildi!" - gui: - time: Tahmini süre - title: Yer noktaların - tooltip: Işınlanmak için tıklayın - invulnerability: "&b&l30 saniye boyunca dokunulmazsın!" - teleported: "&3Işınlanıldı!" - teleporting: "&3Işınlanılıyor..." - unknown-material: "&eÜzgünüm, fırlatıcıdaki Eşyayı tanıyamadım. Lütfen bildiğim - bir şey koy." - wrong-item: "&eÜzgünüm, bana sağ tıkladığınız Eşyayı tanıyamadım. Tarifleri kontrol - edin ve hangi Eşyaları kullanabileceğinizi görün." - INDUSTRIAL_MINER: - no-fuel: "&cIndustrial Miner'ınızın yakıtı bitti! Yukarıdaki sandığa yakıt koyun." - piston-facing: "&cIndustrial Miner'ınızın pistonu yukarıya bakmalı!" - piston-space: "&cHer iki pistonun da üstü boş olmalı!" - destroyed: "&cIndustrial Miner'ınız yok edilmiş." - already-running: "&cBu Industrial Miner zaten çalışıyor!" - full-chest: "&cIndustrial Miner'ınızın sandığı dolu!" - no-permission: "&4Bir Industrial Miner kullanmak için yetkili değilsin!" - finished: "&eIndustrial Miner'ınızın işi bitti! Toplamda %ores% kadar maden buldu!" messages: - cannot-place: "&cBu bloğu oraya yerleştiremezsiniz!" - diet-cookie: "&eKendinizi çok hafif hissetmeye başlıyorsunuz..." + not-researched: "&4Bunu anlayacak kadar bilgin yok" + not-enough-xp: "&4Bunun kilidini açmak için yeterli XP niz yok" + unlocked: '&bKilidini açtın &7"%research%"' + only-players: "&4Bu komut yalnızca oyuncular için" + unknown-player: "&4Bilinmeyen oyuncu: &c%player%" + no-permission: "&4Bunu yapmak için gerekli izniniz yok" + usage: "&4Kullanış: &c%usage%" + not-online: "&4%player% &coyunda değil!" + not-valid-item: "&4%item% &cgeçerli bir eşya değil!" + not-valid-amount: "&4%amount% &cgeçerli bir miktar değil : 0 dan büyük olmalı!" + given-item: '&a%amount% &badet &7"%item%&7" &bsana verildi.' + give-item: '&b%player% adlı oyuncuya &a%amount% &badet &7"%item%&7" &bverdin.' + not-valid-research: "&4%research% &cgeçerli bir araştırma değil!" + give-research: '&b%player% adlı oyuncu için bir araştırmayı açtın: &7"%research%&7"' + hungry: "&cBunu yapmak için çok açsın!" + mode-change: "&b%device% modu değişti: &9%mode%" disabled-in-world: "&4&lBu eşya bu dünyada devre dışı bırakıldı." disabled-item: "&4&lBu eşya devre dışı bırakıldı! Bunu nasıl aldın?" + no-tome-yourself: "&4Tome of Knowledge &cı kendin için kullanamazsın..." + multimeter: "&bDepolanmış Enerji: &3%stored% &b/ &3%capacity%" + talisman: + anvil: "&a&oTılsım aletinizi kırılmadan kurtardı" + miner: "&a&oTılsımın madenini ikiye katladı" + hunter: "&a&oTılsımın ganimetini ikiye katladı" + lava: "&a&oTılsımın seni yanarak ölmekten kurtardı" + water: "&a&oTılsımın seni boğulmaktan kurtardı" + angel: "&a&oTılsımın seni düşme hasarından kurtardı" + fire: "&a&oTılsımın seni yanarak ölmekten kurtardı" + magician: "&a&oTılsımın sana fazladan bir Büyü verdi" + traveller: "&a&oTılsımın sana bir Hız Artışı verdi" + warrior: "&a&oTılsımın bir süreliğine seni güçlendirdi" + knight: "&a&oTılsımın sana 5 Saniye Yenilenme verdi" + whirlwind: "&a&oTılsımın Mermiyi yansıttı" + wizard: "&a&oTılsımın sana daha yüksek seviye Servet verdi ama başka bir Büyünün + seviyesini düşürmüş olabilir." + soulbound-rune: + fail: "&cBir seferde sadece bir eşyayı ruhuna bağlayabilirsin." + success: "&aBu eşyayı ruhuna başarıyla bağladın! Öldüğünde saklayacaksın." + research: + start: "&7Kadim Ruhlar gizemli kelimeleri kulağına fısıldıyor!" + progress: "&b%research% &7hakkında bazı şeyler merak etmeye başlıyorsun &e(%progress%)" fire-extinguish: "&7Kendini söndürdün" + cannot-place: "&cBu bloğu oraya yerleştiremezsiniz!" + no-pvp: "&cBurada pvp yapamazsınız!" + radiation: "&4Ölümcül radyasyona maruz kaldınız! &cRadyoaktif maddeden kurtulun + veya koruyucu takımın tamamını giyinin!" + opening-guide: "&bRehber açılıyor, bu birkaç saniye sürebilir..." + opening-backpack: "&bSırt çantası açılıyor, bu birkaç saniye sürebilir..." + no-iron-golem-heal: "&cBu bir Demir Külçe değil. Demir Golemleri iyileştirmek için + bunu kullanamazsın!" + link-prompt: "&eBuraya tıklayın:" + diet-cookie: "&eKendinizi çok hafif hissetmeye başlıyorsunuz..." fortune-cookie: - "&7Bana yardım et, Şans Kurabiyesi Fabrikasında mahsur kaldım!" - "&7Yarın öleceksiniz ... bir Creeper tarafından" @@ -254,54 +145,168 @@ messages: - "&742. Cevap 42." - "&7Bir Walshy bir gün sıkıntıları uzak tutacaktır." - "&7Hiçbir zaman doğrudan aşağıyı kazmayın!" - give-item: '&b%player% adlı oyuncuya &a%amount% &badet &7"%item%&7" &bverdin.' - given-item: '&a%amount% &badet &7"%item%&7" &bsana verildi.' - give-research: '&b%player% adlı oyuncu için bir araştırmayı açtın: &7"%research%&7"' - hungry: "&cBunu yapmak için çok açsın!" - link-prompt: "&eBuraya tıklayın:" - mode-change: "&b%device% modu değişti: &9%mode%" - multimeter: "&bDepolanmış Enerji: &3%stored% &b/ &3%capacity%" - no-iron-golem-heal: "&cBu bir Demir Külçe değil. Demir Golemleri iyileştirmek için - bunu kullanamazsın!" - no-permission: "&4Bunu yapmak için gerekli izniniz yok" - no-pvp: "&cBurada pvp yapamazsınız!" - not-enough-xp: "&4Bunun kilidini açmak için yeterli XP niz yok" - no-tome-yourself: "&4Tome of Knowledge &cı kendin için kullanamazsın..." - not-online: "&4%player% &coyunda değil!" - not-researched: "&4Bunu anlayacak kadar bilgin yok" - not-valid-amount: "&4%amount% &cgeçerli bir miktar değil : 0 dan büyük olmalı!" - not-valid-item: "&4%item% &cgeçerli bir eşya değil!" - not-valid-research: "&4%research% &cgeçerli bir araştırma değil!" - only-players: "&4Bu komut yalnızca oyuncular için" - opening-backpack: "&bSırt çantası açılıyor, bu birkaç saniye sürebilir..." - opening-guide: "&bRehber açılıyor, bu birkaç saniye sürebilir..." - radiation: "&4Ölümcül radyasyona maruz kaldınız! &cRadyoaktif maddeden kurtulun - veya koruyucu takımın tamamını giyinin!" - research: - progress: "&b%research% &7hakkında bazı şeyler merak etmeye başlıyorsun &e(%progress%)" - start: "&7Kadim Ruhlar gizemli kelimeleri kulağına fısıldıyor!" - soulbound-rune: - fail: "&cBir seferde sadece bir eşyayı ruhuna bağlayabilirsin." - success: "&aBu eşyayı ruhuna başarıyla bağladın! Öldüğünde saklayacaksın." - talisman: - angel: "&a&oTılsımın seni düşme hasarından kurtardı" - anvil: "&a&oTılsım aletinizi kırılmadan kurtardı" - fire: "&a&oTılsımın seni yanarak ölmekten kurtardı" - hunter: "&a&oTılsımın ganimetini ikiye katladı" - knight: "&a&oTılsımın sana 5 Saniye Yenilenme verdi" - lava: "&a&oTılsımın seni yanarak ölmekten kurtardı" - magician: "&a&oTılsımın sana fazladan bir Büyü verdi" - miner: "&a&oTılsımın madenini ikiye katladı" - traveller: "&a&oTılsımın sana bir Hız Artışı verdi" - warrior: "&a&oTılsımın bir süreliğine seni güçlendirdi" - water: "&a&oTılsımın seni boğulmaktan kurtardı" - whirlwind: "&a&oTılsımın Mermiyi yansıttı" - wizard: "&a&oTılsımın sana daha yüksek seviye Servet verdi ama başka bir Büyünün - seviyesini düşürmüş olabilir." - unknown-player: "&4Bilinmeyen oyuncu: &c%player%" - unlocked: '&bKilidini açtın &7"%research%"' - usage: "&4Kullanış: &c%usage%" -miner: - no-ores: "&eÜzgünüm, yakınlarda herhangi bir cevher bulamadım!" + - "&7Bu ancak bir yara." + - "&7Daima hayatın parlak tarafından bak!" + - "&7Bu aslında bir Bisküvi idi, Kurabiye değil." + - "&7Neon levhalar ışık yayar!" +machines: + pattern-not-found: "&eÜzgünüm, bu tarifi tanıyamadım. Lütfen Eşyaları Dağıtıcıya + doğru şekilde yerleştirin." + unknown-material: "&eÜzgünüm, fırlatıcıdaki Eşyayı tanıyamadım. Lütfen bildiğim + bir şey koy." + wrong-item: "&eÜzgünüm, bana sağ tıkladığınız Eşyayı tanıyamadım. Tarifleri kontrol + edin ve hangi Eşyaları kullanabileceğinizi görün." + full-inventory: "&eÜzgünüm, envanterim çok dolu!" + in-use: "&cBu Bloğun envanteri şu anda farklı bir Oyuncu tarafından açıldı." + ignition-chamber-no-flint: "&cAteşleme Odasında Çakmak eksik." + ANCIENT_ALTAR: + not-enough-pedestals: "&4Altar, gerekli Sütun miktarı ile çevrili değil &c(%pedestals% + / 8)" + unknown-catalyst: "&4Bilinmeyen Katalizör! &cDoğru Tarifi kullanın!" + unknown-recipe: "&4Bilinmeyen Tarif! &cDoğru Tarifi kullanın!" + ANCIENT_PEDESTAL: + obstructed: "&4Sütun tıkandı! &cSütunun üstündeki herhangi bir şeyi kaldırın!" + HOLOGRAM_PROJECTOR: + enter-text: "&7Lütfen Sohbette istediğiniz Hologram Metnini yazın. &r(Renk Kodları + destekleniyor!)" + inventory-title: Hologram Editörü + ELEVATOR: + no-destinations: "&4Varış noktası bulunamadı" + pick-a-floor: "&3- Bir kat seçin -" + current-floor: "&eŞu anda bulunduğunuz kat:" + click-to-teleport: "&7Bu yere ışınlanmak için &eTıkla:" + enter-name: "&7Lütfen sohbette yeni katınız için bir ad yazın. &r(Renk kodları + destekleniyor!)" + named: "&2Bu kat başarıyla isimlendirildi: &r%floor%" + TELEPORTER: + teleporting: "&3Işınlanılıyor..." + teleported: "&3Işınlanıldı!" + cancelled: "&4Işınlanma İptal Edildi!" + invulnerability: "&b&l30 saniye boyunca dokunulmazsın!" + gui: + title: Yer noktaların + tooltip: Işınlanmak için tıklayın + time: Tahmini süre + CARGO_NODES: + must-be-placed: "&4Mutlaka bir sandık veya makineye bağlanmalı!" + GPS_CONTROL_PANEL: + title: GPS - Kontrol Paneli + transmitters: Verici Genel Bakışı + waypoints: Yer Noktası Genel Bakışı + INDUSTRIAL_MINER: + no-fuel: "&cIndustrial Miner'ınızın yakıtı bitti! Yukarıdaki sandığa yakıt koyun." + piston-facing: "&cIndustrial Miner'ınızın pistonu yukarıya bakmalı!" + piston-space: "&cHer iki pistonun da üstü boş olmalı!" + destroyed: "&cIndustrial Miner'ınız yok edilmiş." + already-running: "&cBu Industrial Miner zaten çalışıyor!" + full-chest: "&cIndustrial Miner'ınızın sandığı dolu!" + no-permission: "&4Bir Industrial Miner kullanmak için yetkili değilsin!" + finished: "&eIndustrial Miner'ınızın işi bitti! Toplamda %ores% kadar maden buldu!" +anvil: + not-working: "&4Slimefun eşyalarını örste kullanamazsın!" +backpack: + already-open: "&cÜzgünüm, bu Sırt Çantası başka bir yerde açık!" + no-stack: "&cSırt Çantalarını istifleyemezsiniz" workbench: not-enhanced: "&4Slimefun Eşyalarını normal bir üretim masasında kullanamazsınız" +gps: + deathpoint: "&4Ölüm Noktası &7%date%" + waypoint: + new: "&eLütfen sohbette yeni yer noktanız için bir ad yazın. &7(Renk Kodları destekleniyor!)" + added: "&aYeni bir yer noktası başarıyla eklendi" + max: "&4Maksimum yer noktası sayısına ulaştınız" + insufficient-complexity: + - "&4Yetersiz GPS Ağ Gücü: &c%complexity%" + - "&4a) Henüz bir GPS Ağı kurulumunuz yok" + - "&4b) GPS Ağınız yeterince güçlü değil" + geo: + scan-required: "&4GEO-Taraması gerekli! &cİlk önce bir GEO-Tarayıcı kullanarak + bu bölgeyi tarayın!" +inventory: + no-access: "&4Bu bloğa erişmenize izin verilmiyor" +android: + started: "&7Androidiniz senaryoyu uygulamaya devam ediyor" + stopped: "&7Androidiniz senaryoyu duraklattı" + scripts: + already-uploaded: "&4Bu senaryo zaten yüklendi." + instructions: + START: "&2Senaryoyu başlat" + REPEAT: "&9Senaryoyu Tekrar Et" + WAIT: "&e0.5s Bekle" + GO_FORWARD: "&7İleri Git" + GO_UP: "&7Yukarı Çık" + GO_DOWN: "&7Aşağıya İn" + TURN_LEFT: "&7Sola Dön" + TURN_RIGHT: "&7Sağa Dön" + DIG_UP: "&bYukarıyı Kaz" + DIG_FORWARD: "&bİleriyi Kaz" + DIG_DOWN: "&bAltını Kaz" + MOVE_AND_DIG_UP: "&bİlerle ve Yukarıyı Kaz" + MOVE_AND_DIG_FORWARD: "&bİlerle ve İleriyi Kaz" + MOVE_AND_DIG_DOWN: "&bİlerle ve Altını Kaz" + ATTACK_MOBS_ANIMALS: "&4Saldır &c(Canavarlar & Hayvanlar)" + ATTACK_MOBS: "&4Saldır &c(Canavarlar)" + ATTACK_ANIMALS: "&4Saldır &c(Hayvanlar)" + ATTACK_ANIMALS_ADULT: "&4Saldır &c(Hayvanlar &7[Yetişkin]&c)" + CHOP_TREE: "&cKes ve Ek" + CATCH_FISH: "&bBalık Tut" + FARM_FORWARD: "&bTopla ve Ek" + FARM_DOWN: "&bToplama ve Ekim &7(Altındaki blok)" + FARM_EXOTIC_FORWARD: "&bGelişmişce Topla ve Ek" + FARM_EXOTIC_DOWN: "&bGelişmişce Topla ve Ek &7(Altındaki blok)" + INTERFACE_ITEMS: "&9Envanter İçeriğini öndeki Arayüze aktar" + INTERFACE_FUEL: "&cÖndeki Arayüzden Yakıt çek" + enter-name: + - + - "&eLütfen senaryonuz için bir ad yazınız" + uploaded: + - "&bYükleniyor..." + - "&aSenaryon başarıyla yüklendi!" + rating: + own: "&4Kendi senaryonu oylayamazın!" + already: "&4Bu senaryo için zaten oy kullandın!" + editor: Senaryo Editörü +languages: + default: Sunucu Varsayılanı + en: İngilizce + de: Almanca + fr: Fransızca + it: İtalyanca + es: İspanyolca + pl: Lehçe + sv: İsveççe + nl: Flemenkçe + cs: Çekce + hu: Macarca + lv: Letonyaca + ru: Rusça + sk: Slovakça + zh-TW: Çince (Tayvan) + vi: Vietnamca + id: Endonezyaca + zh-CN: Çince (Çin) + el: Yunanca + he: İbranice + ar: Arapça + af: Afrikanca + da: Danca + fi: Fince + uk: Ukraynaca + ms: Malayca + 'no': Norveçce + ja: Japonca + fa: Persçe + th: Tayca + ro: Romanca + pt: Portekizce (Portekiz) + pt-BR: Portekizce (Brezilya) + bg: Bulgarca + ko: Korece + tr: Türkçe + hr: Hırvatça + mk: Makedonca + sr: Sırpça + be: Belarusça + tl: Tagalog +miner: + no-ores: "&eÜzgünüm, yakınlarda herhangi bir cevher bulamadım!" From 7d250e58d65614f2014c155cf0f09177f7605c9b Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Thu, 25 Jun 2020 06:08:18 +0000 Subject: [PATCH 18/32] Translate recipes_tr.yml via GitLocalize --- src/main/resources/languages/recipes_tr.yml | 246 ++++++++++---------- 1 file changed, 123 insertions(+), 123 deletions(-) diff --git a/src/main/resources/languages/recipes_tr.yml b/src/main/resources/languages/recipes_tr.yml index b705b3394..6872a71ed 100644 --- a/src/main/resources/languages/recipes_tr.yml +++ b/src/main/resources/languages/recipes_tr.yml @@ -1,158 +1,158 @@ --- -minecraft: - blasting: - lore: - - İstediğiniz eşyayı üretmek için - - bu eşyayı Maden Fırınında pişirin. - name: Maden Fırını Tarifi - campfire: - lore: - - İstediğiniz eşyayı hazırlamak için - - bu eşyayı Kamp Ateşinde pişirin. - name: Kamp Ateşi Tarifi - furnace: - lore: - - İstediğiniz eşyayı üretmek için - - bu eşyayı Fırında pişirin. - name: Fırın Tarifi - shaped: - lore: - - Bu eşyayı normal Üretim Masası kullanarak - - gösterildiği gibi üretin. - - Tarifin şekline dikkat edin. - name: Biçimli Üretim Tarifi - shapeless: - lore: - - Bu eşyayı normal Üretim Masası kullanarak - - gösterildiği gibi üretin. - - Tarifin şekli önemli değil. - name: Biçimsiz Üretim Tarifi - smoking: - lore: - - İstediğiniz eşyayı hazırlamak için - - bu eşyayı Duman Fırınında pişirin. - name: Duman Fırını Tarifi - stonecutting: - lore: - - İstediğiniz eşyayı üretmek için - - Taş Kesici kullanın. - name: Taş Kesici Tarifi slimefun: - ancient_altar: + multiblock: + name: Yapı İnşa Etme lore: - - Bu eşyayı Ancient Altar kullanarak - - gösterildiği gibi üretin. - - Daha fazla bilgi için Ancient Altar sayfasına bakın. - name: Ancient Altar - armor_forge: - lore: - - Bu eşyayı bir Armor Forge kullanarak - - gösterildiği gibi üretin. - name: Armor Forge - compressor: - lore: - - Bu eşyayı Compressor kullanarak - - gösterildiği gibi üretin. - name: Compressor + - Gösterilen yapıyı olduğu gibi inşa edin. + - Üretim masasında üretilmez. enhanced_crafting_table: + name: Enhanced Crafting Table lore: - Bu eşyayı Enhanced Crafting Tableda - gösterildiği gibi üretin. - Normal bir Üretim Masası yeterli olmaz! - name: Enhanced Crafting Table - food_composter: + armor_forge: + name: Armor Forge lore: - - Bu eşyayı Food Composter kullanarak + - Bu eşyayı bir Armor Forge kullanarak - gösterildiği gibi üretin. - name: Food Composter - food_fabricator: - lore: - - Bu eşyayı Food Fabricator kullanarak - - gösterildiği gibi üretin - name: Food Fabricator - freezer: - lore: - - Bu eşyayı Freezer kullanarak - - gösterildiği gibi üretin - name: Freezer - geo_miner: - lore: - - Bu eşyayı GEO Miner kullanarak - - elde edin - name: GEO Miner - gold_pan: - lore: - - Bu eşyayı almak için - - Gold Pan kullanın. - name: Gold Pan grind_stone: + name: Grind Stone lore: - Bu eşyayı Grind Stone kullanarak - gösterildiği gibi üretin. - name: Grind Stone - heated_pressure_chamber: + smeltery: + name: Smeltery lore: - - Bu eşyayı Heated Pressure Chamber kullanarak + - Bu eşyayı Smeltery kullanarak - gösterildiği gibi üretin. - name: Heated Pressure Chamber - juicer: - lore: - - Bu eşyayı Juicer kullanarak - - gösterildiği gibi üretin. - name: Juicer - magic_workbench: - lore: - - Bu eşyayı Magic Workbench kullanarak - - gösterildiği gibi üretin. - name: Magic Workbench - mob_drop: - lore: - - Bu eşyayı almak için - - yaratığı öldürün. - name: Yaratıktan Düşürme - multiblock: - lore: - - Gösterilen yapıyı olduğu gibi inşa edin. - - Üretim masasında üretilmez. - name: Yapı İnşa Etme - nuclear_reactor: - lore: - - Bu eşya Nuclear Reactor'ın - - bir yan ürünüdür - name: Nuclear Reactor - oil_pump: - lore: - - Bu eşyayı Oil Pump kullanarak - - elde edin - name: Oil Pump ore_crusher: + name: Ore Crusher lore: - Bu eşyayı Ore Crusher kullanarak - gösterildiği gibi üretin. - name: Ore Crusher + mob_drop: + name: Yaratıktan Düşürme + lore: + - Bu eşyayı almak için + - yaratığı öldürün. + gold_pan: + name: Gold Pan + lore: + - Bu eşyayı almak için + - Gold Pan kullanın. + compressor: + name: Compressor + lore: + - Bu eşyayı Compressor kullanarak + - gösterildiği gibi üretin. + pressure_chamber: + name: Pressure Chamber + lore: + - Bu eşyayı Pressure Chamber kullanarak + - gösterildiği gibi üretin. ore_washer: + name: Ore Washer lore: - Bu eşyayı Ore Washer kullanarak - gösterildiği gibi üretin. - name: Ore Washer + juicer: + name: Juicer + lore: + - Bu eşyayı Juicer kullanarak + - gösterildiği gibi üretin. + magic_workbench: + name: Magic Workbench + lore: + - Bu eşyayı Magic Workbench kullanarak + - gösterildiği gibi üretin. + ancient_altar: + name: Ancient Altar + lore: + - Bu eşyayı Ancient Altar kullanarak + - gösterildiği gibi üretin. + - Daha fazla bilgi için Ancient Altar sayfasına bakın. + heated_pressure_chamber: + name: Heated Pressure Chamber + lore: + - Bu eşyayı Heated Pressure Chamber kullanarak + - gösterildiği gibi üretin. + food_fabricator: + name: Food Fabricator + lore: + - Bu eşyayı Food Fabricator kullanarak + - gösterildiği gibi üretin + food_composter: + name: Food Composter + lore: + - Bu eşyayı Food Composter kullanarak + - gösterildiği gibi üretin. + freezer: + name: Freezer + lore: + - Bu eşyayı Freezer kullanarak + - gösterildiği gibi üretin + geo_miner: + name: GEO Miner + lore: + - Bu eşyayı GEO Miner kullanarak + - elde edin + nuclear_reactor: + name: Nuclear Reactor + lore: + - Bu eşya Nuclear Reactor'ın + - bir yan ürünüdür + oil_pump: + name: Oil Pump + lore: + - Bu eşyayı Oil Pump kullanarak + - elde edin pickaxe_of_containment: + name: Pickaxe of Containment lore: - Bu bloku Pickaxe of Containment kullanarak - ve bir Spawner kırarak - elde edin - name: Pickaxe of Containment - pressure_chamber: - lore: - - Bu eşyayı Pressure Chamber kullanarak - - gösterildiği gibi üretin. - name: Pressure Chamber refinery: + name: Refinery lore: - Bu eşyayı Refinery kullanarak - üretin - name: Refinery - smeltery: +minecraft: + shaped: + name: Biçimli Üretim Tarifi lore: - - Bu eşyayı Smeltery kullanarak + - Bu eşyayı normal Üretim Masası kullanarak - gösterildiği gibi üretin. - name: Smeltery + - Tarifin şekline dikkat edin. + shapeless: + name: Biçimsiz Üretim Tarifi + lore: + - Bu eşyayı normal Üretim Masası kullanarak + - gösterildiği gibi üretin. + - Tarifin şekli önemli değil. + furnace: + name: Fırın Tarifi + lore: + - İstediğiniz eşyayı üretmek için + - bu eşyayı Fırında pişirin. + blasting: + name: Maden Fırını Tarifi + lore: + - İstediğiniz eşyayı üretmek için + - bu eşyayı Maden Fırınında pişirin. + smoking: + name: Duman Fırını Tarifi + lore: + - İstediğiniz eşyayı hazırlamak için + - bu eşyayı Duman Fırınında pişirin. + campfire: + name: Kamp Ateşi Tarifi + lore: + - İstediğiniz eşyayı hazırlamak için + - bu eşyayı Kamp Ateşinde pişirin. + stonecutting: + name: Taş Kesici Tarifi + lore: + - İstediğiniz eşyayı üretmek için + - Taş Kesici kullanın. From 898294c4a2c66a7abfaca84e10c355b56169ebdd Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Thu, 25 Jun 2020 06:08:57 +0000 Subject: [PATCH 19/32] Translate researches_tr.yml via GitLocalize --- .../resources/languages/researches_tr.yml | 422 +++++++++--------- 1 file changed, 212 insertions(+), 210 deletions(-) diff --git a/src/main/resources/languages/researches_tr.yml b/src/main/resources/languages/researches_tr.yml index 959c6075d..1c9a52170 100644 --- a/src/main/resources/languages/researches_tr.yml +++ b/src/main/resources/languages/researches_tr.yml @@ -1,236 +1,238 @@ --- slimefun: - 24k_gold_block: Altın Şehir - advanced_android: Gelişmiş Androidler - advanced_butcher_android: Gelişmiş Androidler - Kasap - advanced_circuit_board: Gelişmiş Devre Kartı - advanced_electric_smeltery: Gelişmiş Elektrikli Dökümhane - advanced_farmer_android: Gelişmiş Androidler - Çiftçi - advanced_fisherman_android: Gelişmiş Androidler - Balıkçı - advanced_output_node: Gelişmiş Çıkış Noktası - alloys: Gelişmiş Alaşımlar - ancient_altar: Antik Sunak - ancient_runes: Elementsel Rünler - android_interfaces: Android Arayüzleri - android_memory_core: Bellek Çekirdeği - angel_talisman: Melek Tılsımı - animal_growth_accelerator: Hayvan Büyüme Manipülasyonu - anvil_talisman: Örs Tılsımı - armored_jetboots: Zırhlı Jet Botlar - armored_jetpack: Zırhlı Jetpack + walking_sticks: Bastonlar + portable_crafter: Portatif Üretim Masası + fortune_cookie: Şans Kurabiyesi + portable_dustbin: Portatif Çöp Kovası + meat_jerky: Yağsız Et armor_forge: Zırh Üretimi - auto_anvil: Otomatik Örs - auto_breeder: Otomatik Besleme - auto_drier: Kuru Bir Gün - auto_enchanting: Otomatik Büyüleyici ve Büyü Sökücü - automated_crafting_chamber: Otomatik Üretim - automated_panning_machine: Otomatik Altın Tavası - automatic_ignition_chamber: Otomatik Ateşleme Odası - backpacks: Sırt Çantaları + glowstone_armor: Işık Taşı Zırhı + lumps: Yumrular ve Büyü + ender_backpack: Ender Sırt Çantası + ender_armor: Ender Zırhı + magic_eye_of_ender: Sihirli Ender Gözü + magic_sugar: Sihirli Şeker + monster_jerky: Yağsız Yaratık Eti + slime_armor: Balçık Zırhı + sword_of_beheading: Baş Kesme Kılıcı basic_circuit_board: Temel Devre Kartı + advanced_circuit_board: Gelişmiş Devre Kartı + smeltery: Dökümhane + steel: Çelik Çağı + misc_power_items: Güçle ilgili önemli eşyalar battery: İlk Piliniz - better_carbon_press: Gelişmiş Karbon Presi - better_crop_growth_accelerator: Gelişmiş Bitki Büyümesi Hızlandırıcı - better_electric_crucibles: Sıcak Potalar - better_electric_furnace: Gelişmiş Elektrikli Fırın - better_food_fabricator: Gelişmiş Yemek Üretimi - better_freezer: Gelişmiş Dondurucu - better_gps_transmitters: Gelişmiş Vericiler - better_heated_pressure_chamber: Gelişmiş Isıtmalı Basınç Odası - better_solar_generators: Gelişmiş Güneş Enerjisi Jeneratörleri - bio_reactor: Biyo-Reaktör - blade_of_vampires: Vampirlerin Bıçağı - blistering_ingots: Parlayan Radyoaktivite - block_placer: Blok Yerleştirici - boosted_uranium: Sonsuz Döngü - boots_of_the_stomper: Ağır Ayak Çizmeleri - bound_armor: Ruh Bağlı Zırhlar - bound_backpack: Ruh Bağlı Depolama - bound_tools: Ruh Bağlı Aletler - bound_weapons: Ruh Bağlı Silahlar - bronze: Bronz Üretimi - butcher_androids: Kasap Androidleri + steel_plate: Çelik Kaplama + steel_thruster: Çelik İtici + parachute: Paraşüt + grappling_hook: Kanca + jetpacks: Jetpackler + multitools: Çoklu Aletler + solar_panel_and_helmet: Güneş Enerjisi + elemental_staff: Elementsel Asalar + grind_stone: Taş Öğütücü cactus_armor: Kaktüs Takımı - capacitors: Seviye 1 Kapasitörler - carbonado: Siyah Elmaslar - carbonado_furnace: Kara Elmas Kaplamalı Fırın - carbonado_tools: Üst Seviye Makineler - carbon_press: Karbon Presi - cargo_basics: Kargo Temelleri - cargo_nodes: Kargo Kurulumu - chainmail_armor: Zincir Zırh - charging_bench: Şarj Tezgahı - coal_generator: Kömür Jeneratörü - cobalt_pickaxe: Hızlı Kazma - combustion_reactor: İçten Yanmalı Reaktör - common_talisman: Sıradan Tılsım - composter: Toprak Gübreleme + gold_pan: Altın Tavası + magical_book_cover: Sihirli Kitap Eşleme + slimefun_metals: Yeni Metaller + ore_crusher: Maden Katlama + bronze: Bronz Üretimi + alloys: Gelişmiş Alaşımlar compressor_and_carbon: Karbon Üretimi - cooler: Portatif İçecekler - copper_wire: İnceltilmiş İletkenlik - crop_growth_accelerator: Bitki Büyümesi Hızlandırması - crucible: Pota - crushed_ore: Maden Arıtma + gilded_iron_armor: Yaldızlı Demir Zırhı + synthetic_diamond: Sentetik Elmaslar + pressure_chamber: Basınç Odası + synthetic_sapphire: Sentetik Safirler damascus_steel: Şam Çeliği damascus_steel_armor: Şam Çeliği Zırhı - diet_cookie: Diyet Kurabiyesi - duct_tape: Koli Bandı - electric_crucible: Elektrikli Pota - electric_furnaces: Elektrikli Fırın - electric_ingot_machines: Elektrikli Külçe İmalatı + reinforced_alloy: Güçlendirilmiş Alaşım + carbonado: Siyah Elmaslar + magic_workbench: Sihirli Üretim Masası + wind_staff: Rüzgar Asası + reinforced_armor: Güçlendirilmiş Zırh + ore_washer: Maden Yıkayıcı + gold_carats: Saf Altın + silicon: Silikon Vadisi + fire_staff: Ateş Asası + smelters_pickaxe: Demircinin Kazması + common_talisman: Sıradan Tılsım + anvil_talisman: Örs Tılsımı + miner_talisman: Madenci Tılsımı + hunter_talisman: Avcı Tılsımı + lava_talisman: Lavda Yürüyen Tılsımı + water_talisman: Suda Nefes Alan Tılsımı + angel_talisman: Melek Tılsımı + fire_talisman: İtfaiyeci Tılsımı + lava_crystal: Ateşli Durum + magician_talisman: Sihirbaz Tılsımı + traveller_talisman: Gezgin Tılsımı + warrior_talisman: Savaşçı Tılsımı + knight_talisman: Şövalye Tılsımı + gilded_iron: Parlak Demir + synthetic_emerald: Sahte Mücevher + chainmail_armor: Zincir Zırh + whirlwind_talisman: Kasırga Tılsımı + wizard_talisman: Büyücü Tılsımı + lumber_axe: Kereste Baltası + hazmat_suit: Koruyucu Takım + uranium: Radyoaktif + crushed_ore: Maden Arıtma + redstone_alloy: Kızıltaş Alaşımı + carbonado_tools: Üst Seviye Makineler + first_aid: İlk yardım + gold_armor: Parlak Zırh + night_vision_googles: Gece Görüş Gözlüğü + pickaxe_of_containment: Kapsama Kazması + hercules_pickaxe: Herkülün Kazması + table_saw: Masa Testeresi + slime_steel_armor: Çelik Balçık Zırhı + blade_of_vampires: Vampirlerin Bıçağı + water_staff: Su Asası + 24k_gold_block: Altın Şehir + composter: Toprak Gübreleme + farmer_shoes: Çiftçi Ayakkabıları + explosive_tools: Patlayıcı Aletler + automated_panning_machine: Otomatik Altın Tavası + boots_of_the_stomper: Ağır Ayak Çizmeleri + pickaxe_of_the_seeker: Arayıcının Kazması + backpacks: Sırt Çantaları + woven_backpack: Dokuma Sırt Çantası + crucible: Pota + gilded_backpack: Yaldızlı Sırt Çantası + armored_jetpack: Zırhlı Jetpack + ender_talismans: Ender Tılsımları + nickel_and_cobalt: Daha fazla Maden + magnet: Manyetik Metaller + infused_magnet: Büyülü Mıknatıslar + cobalt_pickaxe: Hızlı Kazma + essence_of_afterlife: Nekromansi + bound_backpack: Ruh Bağlı Depolama + jetboots: Jet Botlar + armored_jetboots: Zırhlı Jet Botlar + seismic_axe: Sismik Balta + pickaxe_of_vein_mining: Damar Madenciliği Kazması + bound_weapons: Ruh Bağlı Silahlar + bound_tools: Ruh Bağlı Aletler + bound_armor: Ruh Bağlı Zırhlar + juicer: Lezzetli İçecekler + repaired_spawner: Çağırıcı Tamiratı + enhanced_furnace: Geliştirilmiş Fırın + more_enhanced_furnaces: Daha İyi Fırınlar + high_tier_enhanced_furnaces: Yüksek Seviye Fırın + reinforced_furnace: Güçlendirilmiş Fırın + carbonado_furnace: Kara Elmas Kaplamalı Fırın electric_motor: Kızışıyor + block_placer: Blok Yerleştirici + scroll_of_dimensional_teleposition: Bir şeyleri etrafında çevirmek + special_bows: Robin Hood + tome_of_knowledge_sharing: Arkadaşlarla paylaşma + flask_of_knowledge: XP Depolama + hardened_glass: Patlamalara Dayanıklı + golden_apple_juice: Altın iksir + cooler: Portatif İçecekler + ancient_altar: Antik Sunak + wither_proof_obsidian: Wither-Geçirmez Obsidyen + ancient_runes: Elementsel Rünler + special_runes: Mor Rünler + infernal_bonemeal: Şeytani Kemik Tozu + rainbow_blocks: Gökkuşağı Blokları + infused_hopper: Büyülü Huni + wither_proof_glass: Wither-Geçirmez Cam + duct_tape: Koli Bandı + plastic_sheet: Plastik + android_memory_core: Bellek Çekirdeği + oil: Petrol + fuel: Yakıt + hologram_projector: Hologramlar + capacitors: Seviye 1 Kapasitörler + high_tier_capacitors: Seviye 2 Kapasitörler + solar_generators: Güneş Enerjisi Elektrik Santrali + electric_furnaces: Elektrikli Fırın electric_ore_grinding: Kırma ve Öğütme - electric_press: Elektrikli Pres - electric_smeltery: Elektrikli Dökümhane - elemental_staff: Elementsel Asalar + heated_pressure_chamber: Isıtmalı Basınç Odası + coal_generator: Kömür Jeneratörü + bio_reactor: Biyo-Reaktör + auto_enchanting: Otomatik Büyüleyici ve Büyü Sökücü + auto_anvil: Otomatik Örs + multimeter: Elektrik Ölçümü + gps_setup: Temel GPS Kurulumu + gps_emergency_transmitter: GPS Acil Durum Noktası + programmable_androids: Programlanabilir Androidler + android_interfaces: Android Arayüzleri + geo_scanner: GEO-Taramalar + combustion_reactor: İçten Yanmalı Reaktör + teleporter: Işınlayıcı Temel Bileşenleri + teleporter_activation_plates: Işınlayıcı Etkinleştirmesi + better_solar_generators: Gelişmiş Güneş Enerjisi Jeneratörleri + better_gps_transmitters: Gelişmiş Vericiler elevator: Asansörler - elytra: Elytralar + energized_solar_generator: Tam Zamanlı Güneş Enerjisi + energized_gps_transmitter: Üst Seviye Verici + energy_regulator: Enerji Ağları 101 + butcher_androids: Kasap Androidleri + organic_food: Organik Yemek + auto_breeder: Otomatik Besleme + advanced_android: Gelişmiş Androidler + advanced_butcher_android: Gelişmiş Androidler - Kasap + advanced_fisherman_android: Gelişmiş Androidler - Balıkçı + animal_growth_accelerator: Hayvan Büyüme Manipülasyonu + xp_collector: XP Toplayıcı + organic_fertilizer: Organik Gübreleme + crop_growth_accelerator: Bitki Büyümesi Hızlandırması + better_crop_growth_accelerator: Gelişmiş Bitki Büyümesi Hızlandırıcı + reactor_essentials: Reaktör Temelleri + nuclear_reactor: Nükleer Enerji Santrali + freezer: Bay Donmuş + cargo_basics: Kargo Temelleri + cargo_nodes: Kargo Kurulumu + electric_ingot_machines: Elektrikli Külçe İmalatı + high_tier_electric_ingot_machines: Süper Hızlı Külçe İmalatı + automated_crafting_chamber: Otomatik Üretim + better_food_fabricator: Gelişmiş Yemek Üretimi + reactor_access_port: Reaktör Etkileşimi + fluid_pump: Sıvı Pompası + better_freezer: Gelişmiş Dondurucu + boosted_uranium: Sonsuz Döngü + trash_can: Çöp + advanced_output_node: Gelişmiş Çıkış Noktası + carbon_press: Karbon Presi + electric_smeltery: Elektrikli Dökümhane + better_electric_furnace: Gelişmiş Elektrikli Fırın + better_carbon_press: Gelişmiş Karbon Presi empowered_android: Güçlendirilmiş Androidler empowered_butcher_android: Güçlendirilmiş Androidler - Kasap empowered_fisherman_android: Güçlendirilmiş Androidler - Balıkçı - ender_armor: Ender Zırhı - ender_backpack: Ender Sırt Çantası - ender_talismans: Ender Tılsımları - energized_gps_transmitter: Üst Seviye Verici - energized_solar_generator: Tam Zamanlı Güneş Enerjisi - energy_regulator: Enerji Ağları 101 - enhanced_furnace: Geliştirilmiş Fırın - essence_of_afterlife: Nekromansi - explosive_tools: Patlayıcı Aletler - farmer_shoes: Çiftçi Ayakkabıları - fire_staff: Ateş Asası - fire_talisman: İtfaiyeci Tılsımı - first_aid: İlk yardım - flask_of_knowledge: XP Depolama - fluid_pump: Sıvı Pompası - fortune_cookie: Şans Kurabiyesi - freezer: Bay Donmuş - fuel: Yakıt - geo_miner: GEO-Madenci - geo_scanner: GEO-Taramalar - gilded_backpack: Yaldızlı Sırt Çantası - gilded_iron: Parlak Demir - gilded_iron_armor: Yaldızlı Demir Zırhı - glowstone_armor: Işık Taşı Zırhı - gold_armor: Parlak Zırh - gold_carats: Saf Altın - golden_apple_juice: Altın iksir - gold_pan: Altın Tavası - gps_emergency_transmitter: GPS Acil Durum Noktası - gps_setup: Temel GPS Kurulumu - grappling_hook: Kanca - grind_stone: Taş Öğütücü - hardened_glass: Patlamalara Dayanıklı - hazmat_suit: Koruyucu Takım - heated_pressure_chamber: Isıtmalı Basınç Odası - hercules_pickaxe: Herkülün Kazması - high_tier_capacitors: Seviye 2 Kapasitörler high_tier_carbon_press: Güçlü Karbon Presi - high_tier_electric_ingot_machines: Süper Hızlı Külçe İmalatı - high_tier_enhanced_furnaces: Yüksek Seviye Fırın - hologram_projector: Hologramlar - hunter_talisman: Avcı Tılsımı - infernal_bonemeal: Şeytani Kemik Tozu - infused_hopper: Büyülü Huni - infused_magnet: Büyülü Mıknatıslar - jetboots: Jet Botlar - jetpacks: Jetpackler - juicer: Lezzetli İçecekler - kelp_cookie: Lezzetli Yosun - knight_talisman: Şövalye Tılsımı - lava_crystal: Ateşli Durum + wither_assembler: Otomatik Wither Öldürücü + better_heated_pressure_chamber: Gelişmiş Isıtmalı Basınç Odası + elytra: Elytralar + special_elytras: Özel Elytralar + electric_crucible: Elektrikli Pota + better_electric_crucibles: Sıcak Potalar + advanced_electric_smeltery: Gelişmiş Elektrikli Dökümhane + advanced_farmer_android: Gelişmiş Androidler - Çiftçi lava_generator: Lav Jeneratörü - lava_talisman: Lavda Yürüyen Tılsımı - lightning_rune: Yıldırım Rünü - lumber_axe: Kereste Baltası - lumps: Yumrular ve Büyü - magical_book_cover: Sihirli Kitap Eşleme - magic_eye_of_ender: Sihirli Ender Gözü - magician_talisman: Sihirbaz Tılsımı - magic_sugar: Sihirli Şeker - magic_workbench: Sihirli Üretim Masası - magnesium_generator: Magnezyum Elektriği - magnet: Manyetik Metaller - makeshift_smeltery: Doğaçlama Dökümhane - meat_jerky: Yağsız Et - miner_talisman: Madenci Tılsımı - misc_power_items: Güçle ilgili önemli eşyalar - monster_jerky: Yağsız Yaratık Eti - more_enhanced_furnaces: Daha İyi Fırınlar - multimeter: Elektrik Ölçümü - multitools: Çoklu Aletler - nether_gold_pan: Nether Altın Tavası nether_ice: Nether Buzu Soğutucu nether_star_reactor: Nether Yıldız Reaktörü - nickel_and_cobalt: Daha fazla Maden - night_vision_googles: Gece Görüş Gözlüğü - nuclear_reactor: Nükleer Enerji Santrali - oil: Petrol - ore_crusher: Maden Katlama - ore_washer: Maden Yıkayıcı - organic_fertilizer: Organik Gübreleme - organic_food: Organik Yemek + blistering_ingots: Parlayan Radyoaktivite + automatic_ignition_chamber: Otomatik Ateşleme Odası output_chest: Temel Makine Çıkış Sandığı - parachute: Paraşüt - pickaxe_of_containment: Kapsama Kazması - pickaxe_of_the_seeker: Arayıcının Kazması - pickaxe_of_vein_mining: Damar Madenciliği Kazması - plastic_sheet: Plastik - portable_crafter: Portatif Üretim Masası - portable_dustbin: Portatif Çöp Kovası - pressure_chamber: Basınç Odası - programmable_androids: Programlanabilir Androidler + copper_wire: İnceltilmiş İletkenlik radiant_backpack: Göz Alıcı Sırt Çantası - rainbow_blocks: Gökkuşağı Blokları - reactor_access_port: Reaktör Etkileşimi - reactor_essentials: Reaktör Temelleri - redstone_alloy: Kızıltaş Alaşımı - reinforced_alloy: Güçlendirilmiş Alaşım - reinforced_armor: Güçlendirilmiş Zırh - reinforced_furnace: Güçlendirilmiş Fırın - repaired_spawner: Çağırıcı Tamiratı - scroll_of_dimensional_teleposition: Bir şeyleri etrafında çevirmek - seismic_axe: Sismik Balta - silicon: Silikon Vadisi - slime_armor: Balçık Zırhı - slimefun_metals: Yeni Metaller - slime_steel_armor: Çelik Balçık Zırhı - smelters_pickaxe: Demircinin Kazması - smeltery: Dökümhane - solar_generators: Güneş Enerjisi Elektrik Santrali - solar_panel_and_helmet: Güneş Enerjisi - soulbound_rune: Ruh Bağı Rünü - special_bows: Robin Hood - special_elytras: Özel Elytralar - special_runes: Mor Rünler - steel: Çelik Çağı - steel_plate: Çelik Kaplama - steel_thruster: Çelik İtici + auto_drier: Kuru Bir Gün + diet_cookie: Diyet Kurabiyesi storm_staff: Fırtına Asası - sword_of_beheading: Baş Kesme Kılıcı - synthetic_diamond: Sentetik Elmaslar - synthetic_emerald: Sahte Mücevher - synthetic_sapphire: Sentetik Safirler - table_saw: Masa Testeresi - teleporter: Işınlayıcı Temel Bileşenleri - teleporter_activation_plates: Işınlayıcı Etkinleştirmesi - tome_of_knowledge_sharing: Arkadaşlarla paylaşma + soulbound_rune: Ruh Bağı Rünü + geo_miner: GEO-Madenci + lightning_rune: Yıldırım Rünü totem_of_undying: Ölümsüzlük Totemi - trash_can: Çöp - traveller_talisman: Gezgin Tılsımı + charging_bench: Şarj Tezgahı + nether_gold_pan: Nether Altın Tavası + electric_press: Elektrikli Pres + magnesium_generator: Magnezyum Elektriği + kelp_cookie: Lezzetli Yosun + makeshift_smeltery: Doğaçlama Dökümhane tree_growth_accelerator: Daha Hızlı Ağaçlar - uranium: Radyoaktif - walking_sticks: Bastonlar - warrior_talisman: Savaşçı Tılsımı - water_staff: Su Asası - water_talisman: Suda Nefes Alan Tılsımı - whirlwind_talisman: Kasırga Tılsımı - wind_staff: Rüzgar Asası - wither_assembler: Otomatik Wither Öldürücü - wither_proof_glass: Wither-Geçirmez Cam - wither_proof_obsidian: Wither-Geçirmez Obsidyen - wizard_talisman: Büyücü Tılsımı - woven_backpack: Dokuma Sırt Çantası - xp_collector: XP Toplayıcı industrial_miner: Endüstriyel Madencilik advanced_industrial_miner: Gelişmiş Madencilik + magical_zombie_pills: A-Zombifikasyon + auto_brewer: Endüstriyel İksircilik From 120ece9646c9a7d280ed395b593bfde2fa080e17 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Thu, 25 Jun 2020 09:31:50 +0100 Subject: [PATCH 20/32] Support 1.16 fully! :) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 02b2f697d..1fc3cd534 100644 --- a/pom.xml +++ b/pom.xml @@ -276,9 +276,9 @@ provided - com.github.WalshyDev + com.github.TheBusyBiscuit CS-CoreLib - aa3bc64df3 + 31390302cf provided @@ -304,9 +304,9 @@ - com.github.WalshyDev + com.github.TheBusyBiscuit CS-CoreLib2 - 2ed2ddcfcd + 0.22 compile From 4ed2258eb0b1bb9f03d68fd2fd0b7dcac6af67fe Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 12:49:18 +0300 Subject: [PATCH 21/32] Replace stream with for loop --- .../me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 8a2fa5b02..a95c1b466 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,11 +1,7 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; @@ -392,14 +388,14 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { }); // Save all registered Worlds - getRegistry().getWorlds().forEach((world, storage) -> { + for (Map.Entry entry : getRegistry().getWorlds().entrySet()) { try { - storage.save(true); + entry.getValue().save(true); } catch (Exception x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving Slimefun-Blocks in World '" + entry.getKey() + "' for Slimefun " + getVersion()); } - }); + } for (UniversalBlockMenu menu : registry.getUniversalInventories().values()) { menu.save(); From ade18c7bd8b21515b51d9c797608ac400a165331 Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 12:58:04 +0300 Subject: [PATCH 22/32] Remove unused import --- .../java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index a95c1b466..1912f0eba 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,13 +1,16 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Server; -import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; From 386cbea53b58765b7bb3390fbb19193607c92ddc Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 12:59:02 +0300 Subject: [PATCH 23/32] Whoops --- src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 1912f0eba..c3534bb62 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,11 +1,7 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; From e52ac9d43b49cd451d8000e3c71a1603d021c2ba Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 13:06:34 +0300 Subject: [PATCH 24/32] Make it compile --- .../java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index c3534bb62..b9fd4a396 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,7 +1,12 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors; From 82b9de4c5472b828efc8fa4ea94dda573d76a6b0 Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Thu, 25 Jun 2020 13:38:30 +0300 Subject: [PATCH 25/32] Fixed merge conflict. --- .../thebusybiscuit/slimefun4/implementation/SlimefunItems.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java index 0832726a6..2737a92e1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java @@ -806,9 +806,8 @@ public final class SlimefunItems { else { TABLE_SAW = null; MAKESHIFT_SMELTERY = new SlimefunItemStack("MAKESHIFT_SMELTERY", Material.FURNACE, "&eMakeshift Smeltery", "", "&rImprovised version of the Smeltery", "&rthat only allows you to", "&rsmelt dusts into ingots"); - AUTO_DRIER = null; - AUTO_BREWER = new SlimefunItemStack("AUTO_BREWER", Material.BREWING_STAND, "&eAuto Brewer", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(12)); AUTO_DRIER = new SlimefunItemStack("AUTO_DRIER", Material.FURNACE, "&eAuto Drier", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(10)); + AUTO_BREWER = new SlimefunItemStack("AUTO_BREWER", Material.BREWING_STAND, "&eAuto Brewer", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(12)); } } } From f9c8cd1d76d773244d4b43cbb5b24fe87fd89b5b Mon Sep 17 00:00:00 2001 From: LinoxGH Date: Thu, 25 Jun 2020 14:08:57 +0300 Subject: [PATCH 26/32] Fixed the recipe. --- .../implementation/setup/SlimefunItemSetup.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java index 9e9e5a21a..416bb34f5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java @@ -1971,9 +1971,15 @@ public final class SlimefunItemSetup { }.register(plugin); - new AutoDrier(categories.electricity, SlimefunItems.AUTO_DRIER, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {null, null, null, SlimefunItems.HEATING_COIL, new ItemStack(Material.SMOKER), SlimefunItems.HEATING_COIL, null, new ItemStack(Material.CAMPFIRE), null}) - .register(plugin); + if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_14)) { + new AutoDrier(categories.electricity, SlimefunItems.AUTO_DRIER, RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{null, null, null, SlimefunItems.HEATING_COIL, new ItemStack(Material.SMOKER), SlimefunItems.HEATING_COIL, null, new ItemStack(Material.CAMPFIRE), null}) + .register(plugin); + } else { + new AutoDrier(categories.electricity, SlimefunItems.AUTO_DRIER, RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{null, null, null, SlimefunItems.HEATING_COIL, new ItemStack(Material.FURNACE), SlimefunItems.HEATING_COIL, null, new ItemStack(Material.TORCH), null}) + .register(plugin); + } new AutoBrewer(categories.electricity, SlimefunItems.AUTO_BREWER, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {null, SlimefunItems.HEATING_COIL, null, SlimefunItems.REINFORCED_PLATE, new ItemStack(Material.BREWING_STAND), SlimefunItems.REINFORCED_PLATE, null, SlimefunItems.ELECTRIC_MOTOR, null}) From fc8fdacd3f6f523a8cd6d2433e9c94dc1d88dbbf Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 13:41:30 +0200 Subject: [PATCH 27/32] Updated CS-CoreLIb2 version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1fc3cd534..6b90c97da 100644 --- a/pom.xml +++ b/pom.xml @@ -306,7 +306,7 @@ com.github.TheBusyBiscuit CS-CoreLib2 - 0.22 + 0.23 compile @@ -350,4 +350,4 @@ provided - \ No newline at end of file + From 427a3122403d588c6c3e9afe38c29cab9f97b18e Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 14:43:17 +0200 Subject: [PATCH 28/32] More steps towards 1.16 compatibility (unfinished) --- CHANGELOG.md | 3 + README.md | 15 +- .../guide/options/SlimefunGuideSettings.java | 2 +- .../implementation/SlimefunItems.java | 238 +++++++++--------- .../guide/ChestSlimefunGuide.java | 25 +- .../implementation/tasks/TickerTask.java | 32 ++- .../slimefun4/utils/ChestMenuUtils.java | 4 +- .../Slimefun/SlimefunPlugin.java | 33 +-- 8 files changed, 180 insertions(+), 172 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce0d2d742..900e037fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ ## Release Candidate 14 (TBD) #### Additions +* Added support for Minecraft 1.16 * Added a starting sound for the Ancient Altar * Added config option to disable backwards compatibility and improve performance * Added ReactorExplodeEvent to the API @@ -49,6 +50,8 @@ * Fixed Infused Magnet working even if you haven't researched it * Fixed Rainbow blocks duplication glitch when timing the block break right * Fixed #1855 +* Fixed some issues with AsyncWorldEdit +* Fixed some problems with unregistered or fake worlds ## Release Candidate 13 (16 Jun 2020) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13 diff --git a/README.md b/README.md index ac6b86ae8..ad36c0fbf 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,15 @@ Check out our [Addons](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Addons), ## Download Slimefun 4 (See also: [How to install Slimefun](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Installing-Slimefun)) +**Due to [Spigot's abandonce of the Bukkit API](https://www.spigotmc.org/threads/spigot-bungeecord-1-16-1.447405/#post-3852349), Slimefun is no longer able to work on CraftBukkit, please switch over to Spigot or Paper if you haven't already.** + Slimefun 4 can be downloaded **for free** on our builds page.
We currently provide two distinct versions of Slimefun, development builds and "stable" builds.
Here is a full summary of the differences between the two different versions of Slimefun. | | development (latest) | "stable" | | ------------------ | -------- | -------- | -| **Minecraft version(s)** | :video_game: 1.13.X - 1.15.X | :video_game: 1.13.X - 1.15.X | +| **Minecraft version(s)** | :video_game: 1.13.X - 1.16.X | :video_game: 1.13.X - 1.15.X | | **automatic updates** | :heavy_check_mark: | :heavy_check_mark: | | **frequent updates** | :heavy_check_mark: | :x: | | **latest content** | :heavy_check_mark: | :x: | @@ -101,6 +103,17 @@ So not everything may be available for translation yet.
This is an open-source community project, so **your contributions keep this plugin alive!**
Pull Requests can be fixes, changes or even additions, but please keep in mind that if you add too much content to Slimefun 4, you should maybe consider making an Addon for it instead ([Developer Guide](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Developer-Guide)). +#### Compiling +Slimefun is written in Java and uses [Maven](https://maven.apache.org/) for compilation.
+To compile Slimefun yourself, follow these steps: + +1. Clone the project via git
+`$ git clone https://github.com/TheBusyBiscuit/Slimefun4/` +2. Compile the project using Maven
+`$ mvn clean package` + +If you are already using an IDE, make sure to import the project via git and set it as a *Maven project*. Then you should be able build it via Maven using the goals `clean package`. + ### Code Quality Slimefun uses [Sonarcloud.io](https://sonarcloud.io/dashboard?id=TheBusyBiscuit_Slimefun4) to monitor Code Quality. diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java index 92dcac117..c19c0a7a5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java @@ -78,7 +78,7 @@ public final class SlimefunGuideSettings { return false; }); - menu.addItem(4, new CustomItem(Material.WRITABLE_BOOK, "&aSlimefun Version", "&7&o" + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.versions-notice"), "", "&rMinecraft Version: &a" + Bukkit.getBukkitVersion(), "&rSlimefun Version: &a" + SlimefunPlugin.getVersion(), "&rCS-CoreLib Version: &a" + SlimefunPlugin.getCSCoreLibVersion()), ChestMenuUtils.getEmptyClickHandler()); + menu.addItem(4, new CustomItem(Material.WRITABLE_BOOK, "&aSlimefun Version", "&7&o" + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.versions-notice"), "", "&fMinecraft Version: &a" + Bukkit.getBukkitVersion(), "&fSlimefun Version: &a" + SlimefunPlugin.getVersion(), "&fCS-CoreLib Version: &a" + SlimefunPlugin.getCSCoreLibVersion()), ChestMenuUtils.getEmptyClickHandler()); menu.addItem(6, new CustomItem(Material.COMPARATOR, "&e" + SlimefunPlugin.getLocal().getMessage(p, "guide.title.source"), "", "&7Last Activity: &a" + NumberUtils.getElapsedTime(SlimefunPlugin.getGitHubService().getLastUpdate()) + " ago", "&7Forks: &e" + SlimefunPlugin.getGitHubService().getForks(), "&7Stars: &e" + SlimefunPlugin.getGitHubService().getStars(), "", "&7&oSlimefun 4 is a community project,", "&7&othe source code is available on GitHub", "&7&oand if you want to keep this Plugin alive,", "&7&othen please consider contributing to it", "", "&7\u21E8 &eClick to go to GitHub")); menu.addMenuClickHandler(6, (pl, slot, item, action) -> { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java index 2737a92e1..6d9cf0fb1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java @@ -36,7 +36,7 @@ public final class SlimefunItems { /* Items */ public static final SlimefunItemStack PORTABLE_CRAFTER = new SlimefunItemStack("PORTABLE_CRAFTER", HeadTexture.PORTABLE_CRAFTER, "&6Portable Crafter", "&a&oA portable Crafting Table", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); - public static final SlimefunItemStack PORTABLE_DUSTBIN = new SlimefunItemStack("PORTABLE_DUSTBIN", HeadTexture.TRASH_CAN, "&6Portable Dustbin", "&rYour portable Item-Destroyer", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); + public static final SlimefunItemStack PORTABLE_DUSTBIN = new SlimefunItemStack("PORTABLE_DUSTBIN", HeadTexture.TRASH_CAN, "&6Portable Dustbin", "&fYour portable Item-Destroyer", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); public static final SlimefunItemStack ENDER_BACKPACK = new SlimefunItemStack("ENDER_BACKPACK", HeadTexture.ENDER_BACKPACK, "&6Ender Backpack", "&a&oA portable Ender Chest", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); public static final SlimefunItemStack MAGIC_EYE_OF_ENDER = new SlimefunItemStack("MAGIC_EYE_OF_ENDER", Material.ENDER_EYE, "&6&lMagic Eye of Ender", "&4&lRequires full Ender Armor", "", "&7&eRight Click&7 to shoot an Ender Pearl"); public static final SlimefunItemStack BROKEN_SPAWNER = new SlimefunItemStack("BROKEN_SPAWNER", Material.SPAWNER, "&cBroken Spawner", "&7Type: &b", "", "&cFractured, must be repaired in an Ancient Altar"); @@ -46,21 +46,21 @@ public final class SlimefunItems { /* Gadgets */ public static final SlimefunItemStack GOLD_PAN = new SlimefunItemStack("GOLD_PAN", Material.BOWL, "&6Gold Pan", "&a&oCan get you all kinds of Goodies...", "", "&7&eRight Click&7 to pan various Stuff out of Gravel"); public static final SlimefunItemStack NETHER_GOLD_PAN = new SlimefunItemStack("NETHER_GOLD_PAN", Material.BOWL, "&4Nether Gold Pan", "", "&7&eRight Click&7 to pan various stuff out of Soul Sand"); - public static final SlimefunItemStack PARACHUTE = new SlimefunItemStack("PARACHUTE", Material.LEATHER_CHESTPLATE, Color.WHITE, "&r&lParachute", "", LoreBuilder.CROUCH_TO_USE); + public static final SlimefunItemStack PARACHUTE = new SlimefunItemStack("PARACHUTE", Material.LEATHER_CHESTPLATE, Color.WHITE, "&f&lParachute", "", LoreBuilder.CROUCH_TO_USE); public static final SlimefunItemStack GRAPPLING_HOOK = new SlimefunItemStack("GRAPPLING_HOOK", Material.LEAD, "&6Grappling Hook", "", LoreBuilder.RIGHT_CLICK_TO_USE); public static final SlimefunItemStack SOLAR_HELMET = new SlimefunItemStack("SOLAR_HELMET", Material.IRON_HELMET, "&bSolar Helmet", "", "&a&oCharges held Items and Armor"); public static final SlimefunItemStack CLOTH = new SlimefunItemStack("CLOTH", Material.PAPER, "&bCloth"); - public static final SlimefunItemStack TIN_CAN = new SlimefunItemStack("CAN", HeadTexture.TIN_CAN, "&rTin Can"); + public static final SlimefunItemStack TIN_CAN = new SlimefunItemStack("CAN", HeadTexture.TIN_CAN, "&fTin Can"); public static final SlimefunItemStack NIGHT_VISION_GOGGLES = new SlimefunItemStack("NIGHT_VISION_GOGGLES", Material.LEATHER_HELMET, Color.BLACK, "&aNight Vision Goggles", "", "&9+ Night Vision"); public static final SlimefunItemStack FARMER_SHOES = new SlimefunItemStack("FARMER_SHOES", Material.LEATHER_BOOTS, Color.YELLOW, "&eFarmer Shoes", "", "&6&oPrevents you from trampling your Crops"); - public static final SlimefunItemStack INFUSED_MAGNET = new SlimefunItemStack("INFUSED_MAGNET", HeadTexture.MAGNET, "&aInfused Magnet", "", "&rMagical infused Magnets", "&rattract nearby Items", "&ras long as it is somewhere in", "&ryour Inventory", "", "&7Hold &eShift&7 to pick up nearby Items"); - public static final SlimefunItemStack RAG = new SlimefunItemStack("RAG", Material.PAPER, "&cRag", "", "&aLevel I - Medical Supply", "", "&rRestores 2 Hearts", "&rExtinguishes Fire", "", LoreBuilder.RIGHT_CLICK_TO_USE); - public static final SlimefunItemStack BANDAGE = new SlimefunItemStack("BANDAGE", Material.PAPER, "&cBandage", "", "&aLevel II - Medical Supply", "", "&rRestores 4 Hearts", "&rExtinguishes Fire", "", LoreBuilder.RIGHT_CLICK_TO_USE); - public static final SlimefunItemStack SPLINT = new SlimefunItemStack("SPLINT", Material.STICK, "&cSplint", "", "&aLevel I - Medical Supply", "", "&rRestores 2 Hearts", "", LoreBuilder.RIGHT_CLICK_TO_USE); - public static final SlimefunItemStack VITAMINS = new SlimefunItemStack("VITAMINS", Material.NETHER_WART, "&cVitamins", "", "&aLevel III - Medical Supply", "", "&rRestores 4 Hearts", "&rExtinguishes Fire", "&rCures Poison/Wither/Radiation", "", LoreBuilder.RIGHT_CLICK_TO_USE); - public static final SlimefunItemStack MEDICINE = new SlimefunItemStack("MEDICINE", Material.POTION, Color.RED, "&cMedicine", "", "&aLevel III - Medical Supply", "", "&rRestores 4 Hearts", "&rExtinguishes Fire", "&rCures Poison/Wither/Radiation"); + public static final SlimefunItemStack INFUSED_MAGNET = new SlimefunItemStack("INFUSED_MAGNET", HeadTexture.MAGNET, "&aInfused Magnet", "", "&fMagical infused Magnets", "&fattract nearby Items", "&fas long as it is somewhere in", "&fyour Inventory", "", "&7Hold &eShift&7 to pick up nearby Items"); + public static final SlimefunItemStack RAG = new SlimefunItemStack("RAG", Material.PAPER, "&cRag", "", "&aLevel I - Medical Supply", "", "&fRestores 2 Hearts", "&fExtinguishes Fire", "", LoreBuilder.RIGHT_CLICK_TO_USE); + public static final SlimefunItemStack BANDAGE = new SlimefunItemStack("BANDAGE", Material.PAPER, "&cBandage", "", "&aLevel II - Medical Supply", "", "&fRestores 4 Hearts", "&fExtinguishes Fire", "", LoreBuilder.RIGHT_CLICK_TO_USE); + public static final SlimefunItemStack SPLINT = new SlimefunItemStack("SPLINT", Material.STICK, "&cSplint", "", "&aLevel I - Medical Supply", "", "&fRestores 2 Hearts", "", LoreBuilder.RIGHT_CLICK_TO_USE); + public static final SlimefunItemStack VITAMINS = new SlimefunItemStack("VITAMINS", Material.NETHER_WART, "&cVitamins", "", "&aLevel III - Medical Supply", "", "&fRestores 4 Hearts", "&fExtinguishes Fire", "&fCures Poison/Wither/Radiation", "", LoreBuilder.RIGHT_CLICK_TO_USE); + public static final SlimefunItemStack MEDICINE = new SlimefunItemStack("MEDICINE", Material.POTION, Color.RED, "&cMedicine", "", "&aLevel III - Medical Supply", "", "&fRestores 4 Hearts", "&fExtinguishes Fire", "&fCures Poison/Wither/Radiation"); - public static final SlimefunItemStack FLASK_OF_KNOWLEDGE = new SlimefunItemStack("FLASK_OF_KNOWLEDGE", Material.GLASS_BOTTLE, "&cFlask of Knowledge", "", "&rAllows you to store some of", "&ryour Experience in a Bottle", "&7Cost: &a1 Level"); + public static final SlimefunItemStack FLASK_OF_KNOWLEDGE = new SlimefunItemStack("FLASK_OF_KNOWLEDGE", Material.GLASS_BOTTLE, "&cFlask of Knowledge", "", "&fAllows you to store some of", "&fyour Experience in a Bottle", "&7Cost: &a1 Level"); public static final SlimefunItemStack FILLED_FLASK_OF_KNOWLEDGE = new SlimefunItemStack("FILLED_FLASK_OF_KNOWLEDGE", Material.EXPERIENCE_BOTTLE, "&aFlask of Knowledge"); /* Backpacks */ @@ -72,7 +72,7 @@ public final class SlimefunItems { public static final SlimefunItemStack GILDED_BACKPACK = new SlimefunItemStack("GILDED_BACKPACK", HeadTexture.BACKPACK, "&eGilded Backpack", "", "&7Size: &e45", BACKPACK_ID, "", LoreBuilder.RIGHT_CLICK_TO_OPEN); public static final SlimefunItemStack RADIANT_BACKPACK = new SlimefunItemStack("RADIANT_BACKPACK", HeadTexture.BACKPACK, "&eRadiant Backpack", "", "&7Size: &e54 (Double chest)", BACKPACK_ID, "", LoreBuilder.RIGHT_CLICK_TO_OPEN); public static final SlimefunItemStack BOUND_BACKPACK = new SlimefunItemStack("BOUND_BACKPACK", HeadTexture.ENDER_BACKPACK, "&cSoulbound Backpack", "", "&7Size: &e36", BACKPACK_ID, "", LoreBuilder.RIGHT_CLICK_TO_OPEN); - public static final SlimefunItemStack COOLER = new SlimefunItemStack("COOLER", HeadTexture.COOLER, "&bCooler", "&rAllows you to store Juices/Smoothies", "&rand automatically consumes them when you are hungry", "&rand you have this in your Inventory", "", "&7Size: &e27", BACKPACK_ID, "", LoreBuilder.RIGHT_CLICK_TO_OPEN); + public static final SlimefunItemStack COOLER = new SlimefunItemStack("COOLER", HeadTexture.COOLER, "&bCooler", "&fAllows you to store Juices/Smoothies", "&fand automatically consumes them when you are hungry", "&fand you have this in your Inventory", "", "&7Size: &e27", BACKPACK_ID, "", LoreBuilder.RIGHT_CLICK_TO_OPEN); public static final SlimefunItemStack RESTORED_BACKPACK = new SlimefunItemStack("RESTORED_BACKPACK", HeadTexture.RESTORED_BACKPACK, "&eRestored Backpack", "", "&7Retrieve your lost items", BACKPACK_ID, "", LoreBuilder.RIGHT_CLICK_TO_OPEN); /* Jetpacks */ @@ -137,7 +137,7 @@ public final class SlimefunItems { /* Food */ public static final SlimefunItemStack FORTUNE_COOKIE = new SlimefunItemStack("FORTUNE_COOKIE", Material.COOKIE, "&6Fortune Cookie", "", "&a&oTells you stuff about your Future :o"); - public static final SlimefunItemStack DIET_COOKIE = new SlimefunItemStack("DIET_COOKIE", Material.COOKIE, "&6Diet Cookie", "", "&aA very &olightweight &r&acookie."); + public static final SlimefunItemStack DIET_COOKIE = new SlimefunItemStack("DIET_COOKIE", Material.COOKIE, "&6Diet Cookie", "", "&aA very &olightweight &f&acookie."); public static final SlimefunItemStack MAGIC_SUGAR = new SlimefunItemStack("MAGIC_SUGAR", Material.SUGAR, "&6Magic Sugar", "", "&a&oFeel the Power of Hermes!"); public static final SlimefunItemStack MONSTER_JERKY = new SlimefunItemStack("MONSTER_JERKY", Material.ROTTEN_FLESH, "&6Monster Jerky", "", "&a&oNo longer hungry"); public static final SlimefunItemStack APPLE_JUICE = new SlimefunItemStack("APPLE_JUICE", Color.RED, new PotionEffect(PotionEffectType.SATURATION, 6, 0), "&cApple Juice", "", "&7&oRestores &b&o" + "3.0" + " &7&oHunger"); @@ -147,12 +147,12 @@ public final class SlimefunItems { public static final SlimefunItemStack SWEET_BERRY_JUICE = new SlimefunItemStack("SWEET_BERRY_JUICE", Color.RED, new PotionEffect(PotionEffectType.SATURATION, 6, 0), "&cSweet Berry Juice", "", "&7&oRestores &b&o" + "3.0" + " &7&oHunger"); public static final SlimefunItemStack GOLDEN_APPLE_JUICE = new SlimefunItemStack("GOLDEN_APPLE_JUICE", Color.YELLOW, new PotionEffect(PotionEffectType.ABSORPTION, 20 * 20, 0), "&bGolden Apple Juice"); - public static final SlimefunItemStack BEEF_JERKY = new SlimefunItemStack("BEEF_JERKY", Material.COOKED_BEEF, "&6Beef Jerky", "", "&rExtra saturating!"); - public static final SlimefunItemStack PORK_JERKY = new SlimefunItemStack("PORK_JERKY", Material.COOKED_PORKCHOP, "&6Pork Jerky", "", "&rExtra saturating!"); - public static final SlimefunItemStack CHICKEN_JERKY = new SlimefunItemStack("CHICKEN_JERKY", Material.COOKED_CHICKEN, "&6Chicken Jerky", "", "&rExtra saturating!"); - public static final SlimefunItemStack MUTTON_JERKY = new SlimefunItemStack("MUTTON_JERKY", Material.COOKED_MUTTON, "&6Mutton Jerky", "", "&rExtra saturating!"); - public static final SlimefunItemStack RABBIT_JERKY = new SlimefunItemStack("RABBIT_JERKY", Material.COOKED_RABBIT, "&6Rabbit Jerky", "", "&rExtra saturating!"); - public static final SlimefunItemStack FISH_JERKY = new SlimefunItemStack("FISH_JERKY", Material.COOKED_COD, "&6Fish Jerky", "", "&rExtra saturating!"); + public static final SlimefunItemStack BEEF_JERKY = new SlimefunItemStack("BEEF_JERKY", Material.COOKED_BEEF, "&6Beef Jerky", "", "&fExtra saturating!"); + public static final SlimefunItemStack PORK_JERKY = new SlimefunItemStack("PORK_JERKY", Material.COOKED_PORKCHOP, "&6Pork Jerky", "", "&fExtra saturating!"); + public static final SlimefunItemStack CHICKEN_JERKY = new SlimefunItemStack("CHICKEN_JERKY", Material.COOKED_CHICKEN, "&6Chicken Jerky", "", "&fExtra saturating!"); + public static final SlimefunItemStack MUTTON_JERKY = new SlimefunItemStack("MUTTON_JERKY", Material.COOKED_MUTTON, "&6Mutton Jerky", "", "&fExtra saturating!"); + public static final SlimefunItemStack RABBIT_JERKY = new SlimefunItemStack("RABBIT_JERKY", Material.COOKED_RABBIT, "&6Rabbit Jerky", "", "&fExtra saturating!"); + public static final SlimefunItemStack FISH_JERKY = new SlimefunItemStack("FISH_JERKY", Material.COOKED_COD, "&6Fish Jerky", "", "&fExtra saturating!"); public static final SlimefunItemStack KELP_COOKIE = new SlimefunItemStack("KELP_COOKIE", Material.COOKIE, "&2Kelp Cookie"); @@ -163,7 +163,7 @@ public final class SlimefunItems { public static final SlimefunItemStack CHRISTMAS_APPLE_CIDER = new SlimefunItemStack("CHRISTMAS_APPLE_CIDER", Color.RED, new PotionEffect(PotionEffectType.SATURATION, 14, 0), "&cApple Cider", "", "&7&oRestores &b&o" + "7.0" + " &7&oHunger"); public static final SlimefunItemStack CHRISTMAS_COOKIE = new SlimefunItemStack("CHRISTMAS_COOKIE", Material.COOKIE, ChatUtils.christmas("Christmas Cookie")); public static final SlimefunItemStack CHRISTMAS_FRUIT_CAKE = new SlimefunItemStack("CHRISTMAS_FRUIT_CAKE", Material.PUMPKIN_PIE, ChatUtils.christmas("Fruit Cake")); - public static final SlimefunItemStack CHRISTMAS_APPLE_PIE = new SlimefunItemStack("CHRISTMAS_APPLE_PIE", Material.PUMPKIN_PIE, "&rApple Pie"); + public static final SlimefunItemStack CHRISTMAS_APPLE_PIE = new SlimefunItemStack("CHRISTMAS_APPLE_PIE", Material.PUMPKIN_PIE, "&fApple Pie"); public static final SlimefunItemStack CHRISTMAS_HOT_CHOCOLATE = new SlimefunItemStack("CHRISTMAS_HOT_CHOCOLATE", Color.MAROON, new PotionEffect(PotionEffectType.SATURATION, 14, 0), "&6Hot Chocolate", "", "&7&oRestores &b&o" + "7.0" + " &7&oHunger"); public static final SlimefunItemStack CHRISTMAS_CAKE = new SlimefunItemStack("CHRISTMAS_CAKE", Material.PUMPKIN_PIE, ChatUtils.christmas("Christmas Cake")); public static final SlimefunItemStack CHRISTMAS_CARAMEL = new SlimefunItemStack("CHRISTMAS_CARAMEL", Material.BRICK, "&6Caramel"); @@ -172,15 +172,15 @@ public final class SlimefunItems { public static final SlimefunItemStack CHRISTMAS_PRESENT = new SlimefunItemStack("CHRISTMAS_PRESENT", HeadTexture.CHRISTMAS_PRESENT, ChatUtils.christmas("Christmas Present"), "&7From: &cTheBusyBiscuit", "&7To: &eYou", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); /* Easter */ - public static final SlimefunItemStack EASTER_EGG = new SlimefunItemStack("EASTER_EGG", HeadTexture.EASTER_EGG, "&rEaster Egg", "&dHappy Easter! Have a surprise.", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); + public static final SlimefunItemStack EASTER_EGG = new SlimefunItemStack("EASTER_EGG", HeadTexture.EASTER_EGG, "&fEaster Egg", "&dHappy Easter! Have a surprise.", "", LoreBuilder.RIGHT_CLICK_TO_OPEN); public static final SlimefunItemStack EASTER_CARROT_PIE = new SlimefunItemStack("CARROT_PIE", Material.PUMPKIN_PIE, "&6Carrot Pie"); - public static final SlimefunItemStack EASTER_APPLE_PIE = new SlimefunItemStack("EASTER_APPLE_PIE", Material.PUMPKIN_PIE, "&rApple Pie"); + public static final SlimefunItemStack EASTER_APPLE_PIE = new SlimefunItemStack("EASTER_APPLE_PIE", Material.PUMPKIN_PIE, "&fApple Pie"); /* Weapons */ public static final SlimefunItemStack GRANDMAS_WALKING_STICK = new SlimefunItemStack("GRANDMAS_WALKING_STICK", Material.STICK, "&7Grandmas Walking Stick"); public static final SlimefunItemStack GRANDPAS_WALKING_STICK = new SlimefunItemStack("GRANDPAS_WALKING_STICK", Material.STICK, "&7Grandpas Walking Stick"); - public static final SlimefunItemStack SWORD_OF_BEHEADING = new SlimefunItemStack("SWORD_OF_BEHEADING", Material.IRON_SWORD, "&6Sword of Beheading", "&7Beheading II", "", "&rHas a chance to behead Mobs", "&r(even a higher chance for Wither Skeletons)"); - public static final SlimefunItemStack BLADE_OF_VAMPIRES = new SlimefunItemStack("BLADE_OF_VAMPIRES", Material.GOLDEN_SWORD, "&cBlade of Vampires", "&7Life Steal I", "", "&rEverytime you attack something", "&ryou have a 45% chance to", "&rrecover 2 Hearts of your Health"); + public static final SlimefunItemStack SWORD_OF_BEHEADING = new SlimefunItemStack("SWORD_OF_BEHEADING", Material.IRON_SWORD, "&6Sword of Beheading", "&7Beheading II", "", "&fHas a chance to behead Mobs", "&f(even a higher chance for Wither Skeletons)"); + public static final SlimefunItemStack BLADE_OF_VAMPIRES = new SlimefunItemStack("BLADE_OF_VAMPIRES", Material.GOLDEN_SWORD, "&cBlade of Vampires", "&7Life Steal I", "", "&fEverytime you attack something", "&fyou have a 45% chance to", "&frecover 2 Hearts of your Health"); public static final SlimefunItemStack SEISMIC_AXE = new SlimefunItemStack("SEISMIC_AXE", Material.IRON_AXE, "&aSeismic Axe", "", "&7&oA portable Earthquake...", "", LoreBuilder.RIGHT_CLICK_TO_USE); static { @@ -193,19 +193,19 @@ public final class SlimefunItems { } /* Bows */ - public static final SlimefunItemStack EXPLOSIVE_BOW = new SlimefunItemStack("EXPLOSIVE_BOW", Material.BOW, "&cExplosive Bow", "&rAny Arrows fired using this Bow", "&rwill launch hit enemys into the air"); - public static final SlimefunItemStack ICY_BOW = new SlimefunItemStack("ICY_BOW", Material.BOW, "&bIcy Bow", "&rAny Arrows fired using this Bow", "&rwill prevent hit enemys from moving", "&rfor 2 seconds"); + public static final SlimefunItemStack EXPLOSIVE_BOW = new SlimefunItemStack("EXPLOSIVE_BOW", Material.BOW, "&cExplosive Bow", "&fAny Arrows fired using this Bow", "&fwill launch hit enemys into the air"); + public static final SlimefunItemStack ICY_BOW = new SlimefunItemStack("ICY_BOW", Material.BOW, "&bIcy Bow", "&fAny Arrows fired using this Bow", "&fwill prevent hit enemys from moving", "&ffor 2 seconds"); /* Tools */ public static final SlimefunItemStack SMELTERS_PICKAXE = new SlimefunItemStack("SMELTERS_PICKAXE", Material.DIAMOND_PICKAXE, "&6Smelter's Pickaxe", "&c&lAuto-Smelting", "", "&9Works with Fortune"); public static final SlimefunItemStack LUMBER_AXE = new SlimefunItemStack("LUMBER_AXE", Material.DIAMOND_AXE, "&6Lumber Axe", "&a&oCuts down the whole Tree..."); public static final SlimefunItemStack PICKAXE_OF_CONTAINMENT = new SlimefunItemStack("PICKAXE_OF_CONTAINMENT", Material.IRON_PICKAXE, "&cPickaxe of Containment", "", "&9Can pickup Spawners"); - public static final SlimefunItemStack HERCULES_PICKAXE = new SlimefunItemStack("HERCULES_PICKAXE", Material.IRON_PICKAXE, "&9Hercules' Pickaxe", "", "&rSo powerful that it", "&rcrushes all mined Ores", "&rinto Dust..."); - public static final SlimefunItemStack EXPLOSIVE_PICKAXE = new SlimefunItemStack("EXPLOSIVE_PICKAXE", Material.DIAMOND_PICKAXE, "&eExplosive Pickaxe", "", "&rAllows you to mine a good bit", "&rof Blocks at once...", "", "&9Works with Fortune"); - public static final SlimefunItemStack EXPLOSIVE_SHOVEL = new SlimefunItemStack("EXPLOSIVE_SHOVEL", Material.DIAMOND_SHOVEL, "&eExplosive Shovel", "", "&rAllows you to mine a good bit", "&rof diggable Blocks at once..."); - public static final SlimefunItemStack PICKAXE_OF_THE_SEEKER = new SlimefunItemStack("PICKAXE_OF_THE_SEEKER", Material.DIAMOND_PICKAXE, "&aPickaxe of the Seeker", "&rWill always point you to the nearest Ore", "&rbut might get damaged when doing it", "", "&7&eRight Click&7 to be pointed to the nearest Ore"); + public static final SlimefunItemStack HERCULES_PICKAXE = new SlimefunItemStack("HERCULES_PICKAXE", Material.IRON_PICKAXE, "&9Hercules' Pickaxe", "", "&fSo powerful that it", "&fcrushes all mined Ores", "&finto Dust..."); + public static final SlimefunItemStack EXPLOSIVE_PICKAXE = new SlimefunItemStack("EXPLOSIVE_PICKAXE", Material.DIAMOND_PICKAXE, "&eExplosive Pickaxe", "", "&fAllows you to mine a good bit", "&fof Blocks at once...", "", "&9Works with Fortune"); + public static final SlimefunItemStack EXPLOSIVE_SHOVEL = new SlimefunItemStack("EXPLOSIVE_SHOVEL", Material.DIAMOND_SHOVEL, "&eExplosive Shovel", "", "&fAllows you to mine a good bit", "&fof diggable Blocks at once..."); + public static final SlimefunItemStack PICKAXE_OF_THE_SEEKER = new SlimefunItemStack("PICKAXE_OF_THE_SEEKER", Material.DIAMOND_PICKAXE, "&aPickaxe of the Seeker", "&fWill always point you to the nearest Ore", "&fbut might get damaged when doing it", "", "&7&eRight Click&7 to be pointed to the nearest Ore"); public static final SlimefunItemStack COBALT_PICKAXE = new SlimefunItemStack("COBALT_PICKAXE", Material.IRON_PICKAXE, "&9Cobalt Pickaxe"); - public static final SlimefunItemStack PICKAXE_OF_VEIN_MINING = new SlimefunItemStack("PICKAXE_OF_VEIN_MINING", Material.DIAMOND_PICKAXE, "&ePickaxe of Vein Mining", "", "&rThis Pickaxe will dig out", "&rwhole Veins of Ores..."); + public static final SlimefunItemStack PICKAXE_OF_VEIN_MINING = new SlimefunItemStack("PICKAXE_OF_VEIN_MINING", Material.DIAMOND_PICKAXE, "&ePickaxe of Vein Mining", "", "&fThis Pickaxe will dig out", "&fwhole Veins of Ores..."); static { HERCULES_PICKAXE.addUnsafeEnchantment(Enchantment.DURABILITY, 5); @@ -331,7 +331,7 @@ public final class SlimefunItems { public static final SlimefunItemStack MAGICAL_ZOMBIE_PILLS = new SlimefunItemStack("MAGICAL_ZOMBIE_PILLS", Material.NETHER_WART, "&6Magical Zombie Pills", "", "&eRight Click &7a Zombified Villager to", "&7instantly cure it from its curse"); public static final SlimefunItemStack BASIC_CIRCUIT_BOARD = new SlimefunItemStack("BASIC_CIRCUIT_BOARD", Material.ACTIVATOR_RAIL, "&bBasic Circuit Board"); public static final SlimefunItemStack ADVANCED_CIRCUIT_BOARD = new SlimefunItemStack("ADVANCED_CIRCUIT_BOARD", Material.POWERED_RAIL, "&bAdvanced Circuit Board"); - public static final SlimefunItemStack WHEAT_FLOUR = new SlimefunItemStack("WHEAT_FLOUR", Material.SUGAR, "&rWheat Flour"); + public static final SlimefunItemStack WHEAT_FLOUR = new SlimefunItemStack("WHEAT_FLOUR", Material.SUGAR, "&fWheat Flour"); public static final SlimefunItemStack STEEL_PLATE = new SlimefunItemStack("STEEL_PLATE", Material.PAPER, "&7&lSteel Plate"); public static final SlimefunItemStack BATTERY = new SlimefunItemStack("BATTERY", HeadTexture.BATTERY, "&6Battery"); public static final SlimefunItemStack CARBON = new SlimefunItemStack("CARBON", HeadTexture.CARBON, "&eCarbon"); @@ -344,18 +344,18 @@ public final class SlimefunItems { public static final SlimefunItemStack SIFTED_ORE = new SlimefunItemStack("SIFTED_ORE", Material.GUNPOWDER, "&6Sifted Ore"); public static final SlimefunItemStack STONE_CHUNK = new SlimefunItemStack("STONE_CHUNK", HeadTexture.STONE_CHUNK, "&6Stone Chunk"); public static final SlimefunItemStack LAVA_CRYSTAL = new SlimefunItemStack("LAVA_CRYSTAL", HeadTexture.LAVA_CRYSTAL, "&4Lava Crystal"); - public static final SlimefunItemStack SALT = new SlimefunItemStack("SALT", Material.SUGAR, "&rSalt"); - public static final SlimefunItemStack CHEESE = new SlimefunItemStack("CHEESE", HeadTexture.CHEESE, "&rCheese"); - public static final SlimefunItemStack BUTTER = new SlimefunItemStack("BUTTER", HeadTexture.BUTTER, "&rButter"); - public static final SlimefunItemStack DUCT_TAPE = new SlimefunItemStack("DUCT_TAPE", HeadTexture.DUCT_TAPE, "&8Duct Tape", "", "&rYou can repair Items using this", "&rin an Auto-Anvil"); - public static final SlimefunItemStack HEAVY_CREAM = new SlimefunItemStack("HEAVY_CREAM", Material.SNOWBALL, "&rHeavy Cream"); + public static final SlimefunItemStack SALT = new SlimefunItemStack("SALT", Material.SUGAR, "&fSalt"); + public static final SlimefunItemStack CHEESE = new SlimefunItemStack("CHEESE", HeadTexture.CHEESE, "&fCheese"); + public static final SlimefunItemStack BUTTER = new SlimefunItemStack("BUTTER", HeadTexture.BUTTER, "&fButter"); + public static final SlimefunItemStack DUCT_TAPE = new SlimefunItemStack("DUCT_TAPE", HeadTexture.DUCT_TAPE, "&8Duct Tape", "", "&fYou can repair Items using this", "&fin an Auto-Anvil"); + public static final SlimefunItemStack HEAVY_CREAM = new SlimefunItemStack("HEAVY_CREAM", Material.SNOWBALL, "&fHeavy Cream"); public static final SlimefunItemStack CRUSHED_ORE = new SlimefunItemStack("CRUSHED_ORE", Material.GUNPOWDER, "&6Crushed Ore"); public static final SlimefunItemStack PULVERIZED_ORE = new SlimefunItemStack("PULVERIZED_ORE", Material.GUNPOWDER, "&6Pulverized Ore"); public static final SlimefunItemStack PURE_ORE_CLUSTER = new SlimefunItemStack("PURE_ORE_CLUSTER", Material.GUNPOWDER, "&6Pure Ore Cluster"); public static final SlimefunItemStack SMALL_URANIUM = new SlimefunItemStack("SMALL_URANIUM", HeadTexture.URANIUM, "&cSmall Chunk of Uranium", "", LoreBuilder.radioactive(Radioactivity.MODERATE), LoreBuilder.HAZMAT_SUIT_REQUIRED); public static final SlimefunItemStack TINY_URANIUM = new SlimefunItemStack("TINY_URANIUM", HeadTexture.URANIUM, "&cTiny Pile of Uranium", "", LoreBuilder.radioactive(Radioactivity.LOW)); public static final SlimefunItemStack SOLAR_PANEL = new SlimefunItemStack("SOLAR_PANEL", Material.DAYLIGHT_DETECTOR, "&bSolar Panel", "", "&a&oTransforms Sunlight to Energy"); - public static final SlimefunItemStack PLASTIC_SHEET = new SlimefunItemStack("PLASTIC_SHEET", Material.PAPER, "&rPlastic Sheet"); + public static final SlimefunItemStack PLASTIC_SHEET = new SlimefunItemStack("PLASTIC_SHEET", Material.PAPER, "&fPlastic Sheet"); public static final SlimefunItemStack MAGNET = new SlimefunItemStack("MAGNET", HeadTexture.MAGNET, "&cMagnet"); public static final SlimefunItemStack NECROTIC_SKULL = new SlimefunItemStack("NECROTIC_SKULL", Material.WITHER_SKELETON_SKULL, "&cNecrotic Skull"); @@ -365,11 +365,11 @@ public final class SlimefunItems { public static final SlimefunItemStack COOLING_UNIT = new SlimefunItemStack("COOLING_UNIT", HeadTexture.COOLING_UNIT, "&bCooling Unit"); public static final SlimefunItemStack ELECTRIC_MOTOR = new SlimefunItemStack("ELECTRIC_MOTOR", HeadTexture.MOTOR, "&cElectric Motor"); public static final SlimefunItemStack CARGO_MOTOR = new SlimefunItemStack("CARGO_MOTOR", HeadTexture.MOTOR, "&3Cargo Motor"); - public static final SlimefunItemStack SCROLL_OF_DIMENSIONAL_TELEPOSITION = new SlimefunItemStack("SCROLL_OF_DIMENSIONAL_TELEPOSITION", Material.PAPER, "&6Scroll of Dimensional Teleposition", "", "&cThis Scroll is capable of creating", "&ca temporary black Hole which pulls", "&cnearby Entities into itself and sends", "&cthem into another Dimension where", "&ceverything is turned around", "", "&rIn other words: Makes Entities turn by 180 Degrees"); + public static final SlimefunItemStack SCROLL_OF_DIMENSIONAL_TELEPOSITION = new SlimefunItemStack("SCROLL_OF_DIMENSIONAL_TELEPOSITION", Material.PAPER, "&6Scroll of Dimensional Teleposition", "", "&cThis Scroll is capable of creating", "&ca temporary black Hole which pulls", "&cnearby Entities into itself and sends", "&cthem into another Dimension where", "&ceverything is turned around", "", "&fIn other words: Makes Entities turn by 180 Degrees"); public static final SlimefunItemStack TOME_OF_KNOWLEDGE_SHARING = new SlimefunItemStack("TOME_OF_KNOWLEDGE_SHARING", Material.BOOK, "&6Tome of Knowledge Sharing", "&7Owner: &bNone", "", "&eRight Click&7 to bind this Tome to yourself", "", "", "&eRight Click&7 to obtain all Researches by", "&7the previously assigned Owner"); - public static final SlimefunItemStack HARDENED_GLASS = new SlimefunItemStack("HARDENED_GLASS", Material.LIGHT_GRAY_STAINED_GLASS, "&7Hardened Glass", "", "&rWithstands Explosions"); - public static final SlimefunItemStack WITHER_PROOF_OBSIDIAN = new SlimefunItemStack("WITHER_PROOF_OBSIDIAN", Material.OBSIDIAN, "&5Wither-Proof Obsidian", "", "&rWithstands Explosions", "&rWithstands Wither Bosses"); - public static final SlimefunItemStack WITHER_PROOF_GLASS = new SlimefunItemStack("WITHER_PROOF_GLASS", Material.PURPLE_STAINED_GLASS, "&5Wither-Proof Glass", "", "&rWithstands Explosions", "&rWithstands Wither Bosses"); + public static final SlimefunItemStack HARDENED_GLASS = new SlimefunItemStack("HARDENED_GLASS", Material.LIGHT_GRAY_STAINED_GLASS, "&7Hardened Glass", "", "&fWithstands Explosions"); + public static final SlimefunItemStack WITHER_PROOF_OBSIDIAN = new SlimefunItemStack("WITHER_PROOF_OBSIDIAN", Material.OBSIDIAN, "&5Wither-Proof Obsidian", "", "&fWithstands Explosions", "&fWithstands Wither Bosses"); + public static final SlimefunItemStack WITHER_PROOF_GLASS = new SlimefunItemStack("WITHER_PROOF_GLASS", Material.PURPLE_STAINED_GLASS, "&5Wither-Proof Glass", "", "&fWithstands Explosions", "&fWithstands Wither Bosses"); public static final SlimefunItemStack REINFORCED_PLATE = new SlimefunItemStack("REINFORCED_PLATE", Material.PAPER, "&7Reinforced Plate"); public static final SlimefunItemStack ANCIENT_PEDESTAL = new SlimefunItemStack("ANCIENT_PEDESTAL", Material.DISPENSER, "&dAncient Pedestal", "", "&5Part of the Ancient Altar"); public static final SlimefunItemStack ANCIENT_ALTAR = new SlimefunItemStack("ANCIENT_ALTAR", Material.ENCHANTING_TABLE, "&dAncient Altar", "", "&5Multi-Block Altar for", "&5magical Crafting Processes"); @@ -452,17 +452,17 @@ public final class SlimefunItems { public static final SlimefunItemStack COBALT_INGOT = new SlimefunItemStack("COBALT_INGOT", Material.IRON_INGOT, "&9Cobalt Ingot"); /* Gold */ - public static final SlimefunItemStack GOLD_4K = new SlimefunItemStack("GOLD_4K", Material.GOLD_INGOT, "&rGold Ingot &7(4-Carat)"); - public static final SlimefunItemStack GOLD_6K = new SlimefunItemStack("GOLD_6K", Material.GOLD_INGOT, "&rGold Ingot &7(6-Carat)"); - public static final SlimefunItemStack GOLD_8K = new SlimefunItemStack("GOLD_8K", Material.GOLD_INGOT, "&rGold Ingot &7(8-Carat)"); - public static final SlimefunItemStack GOLD_10K = new SlimefunItemStack("GOLD_10K", Material.GOLD_INGOT, "&rGold Ingot &7(10-Carat)"); - public static final SlimefunItemStack GOLD_12K = new SlimefunItemStack("GOLD_12K", Material.GOLD_INGOT, "&rGold Ingot &7(12-Carat)"); - public static final SlimefunItemStack GOLD_14K = new SlimefunItemStack("GOLD_14K", Material.GOLD_INGOT, "&rGold Ingot &7(14-Carat)"); - public static final SlimefunItemStack GOLD_16K = new SlimefunItemStack("GOLD_16K", Material.GOLD_INGOT, "&rGold Ingot &7(16-Carat)"); - public static final SlimefunItemStack GOLD_18K = new SlimefunItemStack("GOLD_18K", Material.GOLD_INGOT, "&rGold Ingot &7(18-Carat)"); - public static final SlimefunItemStack GOLD_20K = new SlimefunItemStack("GOLD_20K", Material.GOLD_INGOT, "&rGold Ingot &7(20-Carat)"); - public static final SlimefunItemStack GOLD_22K = new SlimefunItemStack("GOLD_22K", Material.GOLD_INGOT, "&rGold Ingot &7(22-Carat)"); - public static final SlimefunItemStack GOLD_24K = new SlimefunItemStack("GOLD_24K", Material.GOLD_INGOT, "&rGold Ingot &7(24-Carat)"); + public static final SlimefunItemStack GOLD_4K = new SlimefunItemStack("GOLD_4K", Material.GOLD_INGOT, "&fGold Ingot &7(4-Carat)"); + public static final SlimefunItemStack GOLD_6K = new SlimefunItemStack("GOLD_6K", Material.GOLD_INGOT, "&fGold Ingot &7(6-Carat)"); + public static final SlimefunItemStack GOLD_8K = new SlimefunItemStack("GOLD_8K", Material.GOLD_INGOT, "&fGold Ingot &7(8-Carat)"); + public static final SlimefunItemStack GOLD_10K = new SlimefunItemStack("GOLD_10K", Material.GOLD_INGOT, "&fGold Ingot &7(10-Carat)"); + public static final SlimefunItemStack GOLD_12K = new SlimefunItemStack("GOLD_12K", Material.GOLD_INGOT, "&fGold Ingot &7(12-Carat)"); + public static final SlimefunItemStack GOLD_14K = new SlimefunItemStack("GOLD_14K", Material.GOLD_INGOT, "&fGold Ingot &7(14-Carat)"); + public static final SlimefunItemStack GOLD_16K = new SlimefunItemStack("GOLD_16K", Material.GOLD_INGOT, "&fGold Ingot &7(16-Carat)"); + public static final SlimefunItemStack GOLD_18K = new SlimefunItemStack("GOLD_18K", Material.GOLD_INGOT, "&fGold Ingot &7(18-Carat)"); + public static final SlimefunItemStack GOLD_20K = new SlimefunItemStack("GOLD_20K", Material.GOLD_INGOT, "&fGold Ingot &7(20-Carat)"); + public static final SlimefunItemStack GOLD_22K = new SlimefunItemStack("GOLD_22K", Material.GOLD_INGOT, "&fGold Ingot &7(22-Carat)"); + public static final SlimefunItemStack GOLD_24K = new SlimefunItemStack("GOLD_24K", Material.GOLD_INGOT, "&fGold Ingot &7(24-Carat)"); /* Dusts */ public static final SlimefunItemStack IRON_DUST = new SlimefunItemStack("IRON_DUST", Material.GUNPOWDER, "&6Iron Dust"); @@ -477,12 +477,12 @@ public final class SlimefunItems { public static final SlimefunItemStack SULFATE = new SlimefunItemStack("SULFATE", Material.GLOWSTONE_DUST, "&6Sulfate"); public static final SlimefunItemStack SILICON = new SlimefunItemStack("SILICON", Material.FIREWORK_STAR, "&6Silicon"); - public static final SlimefunItemStack GOLD_24K_BLOCK = new SlimefunItemStack("GOLD_24K_BLOCK", Material.GOLD_BLOCK, "&rGold Block &7(24-Carat)"); + public static final SlimefunItemStack GOLD_24K_BLOCK = new SlimefunItemStack("GOLD_24K_BLOCK", Material.GOLD_BLOCK, "&fGold Block &7(24-Carat)"); /* Gems */ - public static final SlimefunItemStack SYNTHETIC_DIAMOND = new SlimefunItemStack("SYNTHETIC_DIAMOND", Material.DIAMOND, "&bSynthetic Diamond", "", "&rThis item can be used in a", "&rworkbench and acts like a normal Diamond"); - public static final SlimefunItemStack SYNTHETIC_EMERALD = new SlimefunItemStack("SYNTHETIC_EMERALD", Material.EMERALD, "&bSynthetic Emerald", "", "&rThis item can be used to", "&rtrade with Villagers"); - public static final SlimefunItemStack SYNTHETIC_SAPPHIRE = new SlimefunItemStack("SYNTHETIC_SAPPHIRE", HeadTexture.SAPPHIRE, "&bSynthetic Sapphire", "", "&rThis item can be used in a", "&rworkbench and acts like Lapis Lazuli"); + public static final SlimefunItemStack SYNTHETIC_DIAMOND = new SlimefunItemStack("SYNTHETIC_DIAMOND", Material.DIAMOND, "&bSynthetic Diamond", "", "&fThis item can be used in a", "&fworkbench and acts like a normal Diamond"); + public static final SlimefunItemStack SYNTHETIC_EMERALD = new SlimefunItemStack("SYNTHETIC_EMERALD", Material.EMERALD, "&bSynthetic Emerald", "", "&fThis item can be used to", "&ftrade with Villagers"); + public static final SlimefunItemStack SYNTHETIC_SAPPHIRE = new SlimefunItemStack("SYNTHETIC_SAPPHIRE", HeadTexture.SAPPHIRE, "&bSynthetic Sapphire", "", "&fThis item can be used in a", "&fworkbench and acts like Lapis Lazuli"); public static final SlimefunItemStack CARBONADO = new SlimefunItemStack("CARBONADO", HeadTexture.CARBONADO, "&b&lCarbonado", "", "&7&o\"Black Diamond\""); public static final SlimefunItemStack RAW_CARBONADO = new SlimefunItemStack("RAW_CARBONADO", HeadTexture.RAW_CARBONADO, "&bRaw Carbonado"); @@ -495,19 +495,19 @@ public final class SlimefunItems { public static final SlimefunItemStack COMMON_TALISMAN = new SlimefunItemStack("COMMON_TALISMAN", Material.EMERALD, "&6Common Talisman"); public static final SlimefunItemStack ENDER_TALISMAN = new SlimefunItemStack("ENDER_TALISMAN", Material.EMERALD, "&5Ender Talisman"); - public static final SlimefunItemStack TALISMAN_ANVIL = new SlimefunItemStack("ANVIL_TALISMAN", Material.EMERALD, "&aTalisman of the Anvil", "", "&rEach Talisman can prevent", "&r1 Tool from breaking, but will then", "&rbe consumed", "", "&4&lWARNING:", "&4This Talisman does not work on", "&4Tools which are too powerful", "&4due to their complexity"); - public static final SlimefunItemStack TALISMAN_MINER = new SlimefunItemStack("MINER_TALISMAN", Material.EMERALD, "&aTalisman of the Miner", "", "&rWhile you have this Talisman", "&rin your Inventory it has", "&ra 20% chance of doubling", "&rall Ores you mine"); - public static final SlimefunItemStack TALISMAN_HUNTER = new SlimefunItemStack("HUNTER_TALISMAN", Material.EMERALD, "&aTalisman of the Hunter", "", "&rWhile you have this Talisman", "&rin your Inventory it has", "&ra 20% chance of doubling", "&rall Drops from Mobs you kill"); - public static final SlimefunItemStack TALISMAN_LAVA = new SlimefunItemStack("LAVA_TALISMAN", Material.EMERALD, "&aTalisman of the Lava Walker", "", "&rWhile you have this Talisman", "&rin your Inventory it will", "&rgive you Fire Resistance", "&ras soon as you touch Lava", "&rbut will then be consumed"); - public static final SlimefunItemStack TALISMAN_WATER = new SlimefunItemStack("WATER_TALISMAN", Material.EMERALD, "&aTalisman of the Water Breather", "", "&rWhile you have this Talisman", "&rin your Inventory it will", "&rgive you the ability", "&rto breath underwater as", "&rsoon as you start drowning", "&rbut will then be consumed"); - public static final SlimefunItemStack TALISMAN_ANGEL = new SlimefunItemStack("ANGEL_TALISMAN", Material.EMERALD, "&aTalisman of the Angel", "", "&rWhile you have this Talisman", "&rin your Inventory it has a", "&r75% chance to prevent you", "&rfrom taking Fall Damage"); - public static final SlimefunItemStack TALISMAN_FIRE = new SlimefunItemStack("FIRE_TALISMAN", Material.EMERALD, "&aTalisman of the Firefighter", "", "&rWhile you have this Talisman", "&rin your Inventory it will", "&rgive you Fire Resistance", "&ras soon as you start burning", "&rbut will then be consumed"); - public static final SlimefunItemStack TALISMAN_MAGICIAN = new SlimefunItemStack("MAGICIAN_TALISMAN", Material.EMERALD, "&aTalisman of the Magician", "", "&rWhile you have this Talisman", "&rin your Inventory it gives", "&ryou a 80% Luck Bonus on Enchanting", "&rYou will sometimes get an Extra Enchantment"); - public static final SlimefunItemStack TALISMAN_TRAVELLER = new SlimefunItemStack("TRAVELLER_TALISMAN", Material.EMERALD, "&aTalisman of the Traveller", "", "&rWhile you have this Talisman", "&rin your Inventory it gives", "&ryou a 60% Chance for a decent", "&rSpeed Buff when you start sprinting"); - public static final SlimefunItemStack TALISMAN_WARRIOR = new SlimefunItemStack("WARRIOR_TALISMAN", Material.EMERALD, "&aTalisman of the Warrior", "", "&rWhile you have this Talisman", "&rin your Inventory it gives", "&ryou Strength III whenever you get hit", "&rbut will then be consumed"); - public static final SlimefunItemStack TALISMAN_KNIGHT = new SlimefunItemStack("KNIGHT_TALISMAN", Material.EMERALD, "&aTalisman of the Knight", "", "&rWhile you have this Talisman", "&rin your Inventory it gives", "&ryou a 30% Chance for 5 Seconds of Regeneration", "&rwhenever You get hit", "&rbut will then be consumed"); - public static final SlimefunItemStack TALISMAN_WHIRLWIND = new SlimefunItemStack("WHIRLWIND_TALISMAN", Material.EMERALD, "&aTalisman of the Whirlwind", "", "&rWhile you have this Talisman", "&rin your Inventory it will reflect", "&r60% of all Projectiles fired at you"); - public static final SlimefunItemStack TALISMAN_WIZARD = new SlimefunItemStack("WIZARD_TALISMAN", Material.EMERALD, "&aTalisman of the Wizard", "", "&rWhile you have this Talisman", "&rin your Inventory it allows you to", "&robtain Fortune Level 4/5 however", "&rit also has a chance to lower the", "&rLevel of some Enchantments on your Item"); + public static final SlimefunItemStack TALISMAN_ANVIL = new SlimefunItemStack("ANVIL_TALISMAN", Material.EMERALD, "&aTalisman of the Anvil", "", "&fEach Talisman can prevent", "&f1 Tool from breaking, but will then", "&fbe consumed", "", "&4&lWARNING:", "&4This Talisman does not work on", "&4Tools which are too powerful", "&4due to their complexity"); + public static final SlimefunItemStack TALISMAN_MINER = new SlimefunItemStack("MINER_TALISMAN", Material.EMERALD, "&aTalisman of the Miner", "", "&fWhile you have this Talisman", "&fin your Inventory it has", "&fa 20% chance of doubling", "&fall Ores you mine"); + public static final SlimefunItemStack TALISMAN_HUNTER = new SlimefunItemStack("HUNTER_TALISMAN", Material.EMERALD, "&aTalisman of the Hunter", "", "&fWhile you have this Talisman", "&fin your Inventory it has", "&fa 20% chance of doubling", "&fall Drops from Mobs you kill"); + public static final SlimefunItemStack TALISMAN_LAVA = new SlimefunItemStack("LAVA_TALISMAN", Material.EMERALD, "&aTalisman of the Lava Walker", "", "&fWhile you have this Talisman", "&fin your Inventory it will", "&fgive you Fire Resistance", "&fas soon as you touch Lava", "&fbut will then be consumed"); + public static final SlimefunItemStack TALISMAN_WATER = new SlimefunItemStack("WATER_TALISMAN", Material.EMERALD, "&aTalisman of the Water Breather", "", "&fWhile you have this Talisman", "&fin your Inventory it will", "&fgive you the ability", "&fto breath underwater as", "&fsoon as you start drowning", "&fbut will then be consumed"); + public static final SlimefunItemStack TALISMAN_ANGEL = new SlimefunItemStack("ANGEL_TALISMAN", Material.EMERALD, "&aTalisman of the Angel", "", "&fWhile you have this Talisman", "&fin your Inventory it has a", "&f75% chance to prevent you", "&ffrom taking Fall Damage"); + public static final SlimefunItemStack TALISMAN_FIRE = new SlimefunItemStack("FIRE_TALISMAN", Material.EMERALD, "&aTalisman of the Firefighter", "", "&fWhile you have this Talisman", "&fin your Inventory it will", "&fgive you Fire Resistance", "&fas soon as you start burning", "&fbut will then be consumed"); + public static final SlimefunItemStack TALISMAN_MAGICIAN = new SlimefunItemStack("MAGICIAN_TALISMAN", Material.EMERALD, "&aTalisman of the Magician", "", "&fWhile you have this Talisman", "&fin your Inventory it gives", "&fyou a 80% Luck Bonus on Enchanting", "&fYou will sometimes get an Extra Enchantment"); + public static final SlimefunItemStack TALISMAN_TRAVELLER = new SlimefunItemStack("TRAVELLER_TALISMAN", Material.EMERALD, "&aTalisman of the Traveller", "", "&fWhile you have this Talisman", "&fin your Inventory it gives", "&fyou a 60% Chance for a decent", "&fSpeed Buff when you start sprinting"); + public static final SlimefunItemStack TALISMAN_WARRIOR = new SlimefunItemStack("WARRIOR_TALISMAN", Material.EMERALD, "&aTalisman of the Warrior", "", "&fWhile you have this Talisman", "&fin your Inventory it gives", "&fyou Strength III whenever you get hit", "&fbut will then be consumed"); + public static final SlimefunItemStack TALISMAN_KNIGHT = new SlimefunItemStack("KNIGHT_TALISMAN", Material.EMERALD, "&aTalisman of the Knight", "", "&fWhile you have this Talisman", "&fin your Inventory it gives", "&fyou a 30% Chance for 5 Seconds of Regeneration", "&fwhenever You get hit", "&fbut will then be consumed"); + public static final SlimefunItemStack TALISMAN_WHIRLWIND = new SlimefunItemStack("WHIRLWIND_TALISMAN", Material.EMERALD, "&aTalisman of the Whirlwind", "", "&fWhile you have this Talisman", "&fin your Inventory it will reflect", "&f60% of all Projectiles fired at you"); + public static final SlimefunItemStack TALISMAN_WIZARD = new SlimefunItemStack("WIZARD_TALISMAN", Material.EMERALD, "&aTalisman of the Wizard", "", "&fWhile you have this Talisman", "&fin your Inventory it allows you to", "&fobtain Fortune Level 4/5 however", "&fit also has a chance to lower the", "&fLevel of some Enchantments on your Item"); /* Staves */ public static final SlimefunItemStack STAFF_ELEMENTAL = new SlimefunItemStack("STAFF_ELEMENTAL", Material.STICK, "&6Elemental Staff"); @@ -528,7 +528,7 @@ public final class SlimefunItems { public static final SlimefunItemStack GRIND_STONE = new SlimefunItemStack("GRIND_STONE", Material.DISPENSER, "&bGrind Stone", "", "&aGrinds items down into other items"); public static final SlimefunItemStack ARMOR_FORGE = new SlimefunItemStack("ARMOR_FORGE", Material.ANVIL, "&6Armor Forge", "", "&aGives you the ability to create powerful armor"); public static final SlimefunItemStack MAKESHIFT_SMELTERY; - public static final SlimefunItemStack SMELTERY = new SlimefunItemStack("SMELTERY", Material.FURNACE, "&6Smeltery", "", "&rA high-temperature furnace", "&rthat allows you to smelt dusts", "&rinto ingots and create alloys."); + public static final SlimefunItemStack SMELTERY = new SlimefunItemStack("SMELTERY", Material.FURNACE, "&6Smeltery", "", "&fA high-temperature furnace", "&fthat allows you to smelt dusts", "&finto ingots and create alloys."); public static final SlimefunItemStack ORE_CRUSHER = new SlimefunItemStack("ORE_CRUSHER", Material.DISPENSER, "&bOre Crusher", "", "&aCrushes ores to double them"); public static final SlimefunItemStack COMPRESSOR = new SlimefunItemStack("COMPRESSOR", Material.PISTON, "&bCompressor", "", "&aCompresses Items"); public static final SlimefunItemStack PRESSURE_CHAMBER = new SlimefunItemStack("PRESSURE_CHAMBER", Material.GLASS, "&bPressure Chamber", "", "&aCompresses Items even further"); @@ -536,10 +536,10 @@ public final class SlimefunItems { public static final SlimefunItemStack ORE_WASHER = new SlimefunItemStack("ORE_WASHER", Material.CAULDRON, "&6Ore Washer", "", "&aWashes Sifted Ore to filter Ores", "&aand gives you small Stone Chunks"); public static final SlimefunItemStack TABLE_SAW; public static final SlimefunItemStack JUICER = new SlimefunItemStack("JUICER", Material.GLASS_BOTTLE, "&aJuicer", "", "&aAllows you to create delicious Juice"); - public static final SlimefunItemStack AUTOMATED_PANNING_MACHINE = new SlimefunItemStack("AUTOMATED_PANNING_MACHINE", Material.BOWL, "&eAutomated Panning Machine", "", "&rA MultiBlock Version of the Gold Pan", "&rand Nether Gold Pan combined in one machine."); + public static final SlimefunItemStack AUTOMATED_PANNING_MACHINE = new SlimefunItemStack("AUTOMATED_PANNING_MACHINE", Material.BOWL, "&eAutomated Panning Machine", "", "&fA MultiBlock Version of the Gold Pan", "&fand Nether Gold Pan combined in one machine."); - public static final SlimefunItemStack INDUSTRIAL_MINER = new SlimefunItemStack("INDUSTRIAL_MINER", Material.GOLDEN_PICKAXE, "&bIndustrial Miner", "", "&rThis Multiblock will mine any Ores", "&rin a 7x7 area underneath it.", "&rPlace coal or similar in its chest", "&rto fuel this machine."); - public static final SlimefunItemStack ADVANCED_INDUSTRIAL_MINER = new SlimefunItemStack("ADVANCED_INDUSTRIAL_MINER", Material.DIAMOND_PICKAXE, "&cAdvanced Industrial Miner", "", "&rThis Multiblock will mine any Ores", "&rin a 11x11 area underneath it.", "&rPlace a bucket of fuel or lava in", "&rits chest to fuel this machine.", "", "&a+ Silk Touch"); + public static final SlimefunItemStack INDUSTRIAL_MINER = new SlimefunItemStack("INDUSTRIAL_MINER", Material.GOLDEN_PICKAXE, "&bIndustrial Miner", "", "&fThis Multiblock will mine any Ores", "&fin a 7x7 area underneath it.", "&fPlace coal or similar in its chest", "&fto fuel this machine."); + public static final SlimefunItemStack ADVANCED_INDUSTRIAL_MINER = new SlimefunItemStack("ADVANCED_INDUSTRIAL_MINER", Material.DIAMOND_PICKAXE, "&cAdvanced Industrial Miner", "", "&fThis Multiblock will mine any Ores", "&fin a 11x11 area underneath it.", "&fPlace a bucket of fuel or lava in", "&fits chest to fuel this machine.", "", "&a+ Silk Touch"); static { ItemMeta meta = INDUSTRIAL_MINER.getItemMeta(); @@ -555,9 +555,9 @@ public final class SlimefunItems { public static final SlimefunItemStack COMPOSTER = new SlimefunItemStack("COMPOSTER", Material.CAULDRON, "&aComposter", "", "&a&oCan convert various Materials over Time..."); public static final SlimefunItemStack CRUCIBLE = new SlimefunItemStack("CRUCIBLE", Material.CAULDRON, "&cCrucible", "", "&a&oUsed to smelt Items into Liquids"); public static final SlimefunItemStack OUTPUT_CHEST = new SlimefunItemStack("OUTPUT_CHEST", Material.CHEST, "&4Output Chest", "", "&c&oA basic machine will try to put", "&c&oitems in this chest if it's placed", "&c&oadjacent to the dispenser."); - public static final SlimefunItemStack IGNITION_CHAMBER = new SlimefunItemStack("IGNITION_CHAMBER", Material.DROPPER, "&4Automatic Ignition Chamber", "", "&rPrevents the Smeltery from using up fire.", "&rJust fill it up with \"Flint and Steel\"", "&rand place it adjacent to the Smeltery's dispenser"); - public static final SlimefunItemStack HOLOGRAM_PROJECTOR = new SlimefunItemStack("HOLOGRAM_PROJECTOR", Material.QUARTZ_SLAB, "&bHologram Projector", "", "&rProjects an Editable Hologram"); - public static final SlimefunItemStack BLOCK_PLACER = new SlimefunItemStack("BLOCK_PLACER", Material.DISPENSER, "&aBlock Placer", "", "&rAll Blocks in this Dispenser", "&rwill automatically get placed"); + public static final SlimefunItemStack IGNITION_CHAMBER = new SlimefunItemStack("IGNITION_CHAMBER", Material.DROPPER, "&4Automatic Ignition Chamber", "", "&fPrevents the Smeltery from using up fire.", "&fJust fill it up with \"Flint and Steel\"", "&fand place it adjacent to the Smeltery's dispenser"); + public static final SlimefunItemStack HOLOGRAM_PROJECTOR = new SlimefunItemStack("HOLOGRAM_PROJECTOR", Material.QUARTZ_SLAB, "&bHologram Projector", "", "&fProjects an Editable Hologram"); + public static final SlimefunItemStack BLOCK_PLACER = new SlimefunItemStack("BLOCK_PLACER", Material.DISPENSER, "&aBlock Placer", "", "&fAll Blocks in this Dispenser", "&fwill automatically get placed"); /* Enhanced Furnaces */ public static final SlimefunItemStack ENHANCED_FURNACE = new SlimefunItemStack("ENHANCED_FURNACE", Material.FURNACE, "&7Enhanced Furnace - &eI", "", "&7Processing Speed: &e1x", "&7Fuel Efficiency: &e1x", "&7Luck Multiplier: &e1x"); @@ -617,9 +617,9 @@ public final class SlimefunItems { public static final SlimefunItemStack ELECTRIC_FURNACE_2 = new SlimefunItemStack("ELECTRIC_FURNACE_2", Material.FURNACE, "&cElectric Furnace &7- &eII", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(2), LoreBuilder.powerPerSecond(6)); public static final SlimefunItemStack ELECTRIC_FURNACE_3 = new SlimefunItemStack("ELECTRIC_FURNACE_3", Material.FURNACE, "&cElectric Furnace &7- &eIII", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(4), LoreBuilder.powerPerSecond(10)); - public static final SlimefunItemStack ELECTRIC_ORE_GRINDER = new SlimefunItemStack("ELECTRIC_ORE_GRINDER", Material.FURNACE, "&cElectric Ore Grinder", "", "&rWorks as an Ore Crusher and Grind Stone", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(12)); - public static final SlimefunItemStack ELECTRIC_ORE_GRINDER_2 = new SlimefunItemStack("ELECTRIC_ORE_GRINDER_2", Material.FURNACE, "&cElectric Ore Grinder &7(&eII&7)", "", "&rWorks as an Ore Crusher and Grind Stone", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(4), LoreBuilder.powerPerSecond(30)); - public static final SlimefunItemStack ELECTRIC_INGOT_PULVERIZER = new SlimefunItemStack("ELECTRIC_INGOT_PULVERIZER", Material.FURNACE, "&cElectric Ingot Pulverizer", "", "&rPulverizes Ingots into Dust", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(14)); + public static final SlimefunItemStack ELECTRIC_ORE_GRINDER = new SlimefunItemStack("ELECTRIC_ORE_GRINDER", Material.FURNACE, "&cElectric Ore Grinder", "", "&fWorks as an Ore Crusher and Grind Stone", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(12)); + public static final SlimefunItemStack ELECTRIC_ORE_GRINDER_2 = new SlimefunItemStack("ELECTRIC_ORE_GRINDER_2", Material.FURNACE, "&cElectric Ore Grinder &7(&eII&7)", "", "&fWorks as an Ore Crusher and Grind Stone", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(4), LoreBuilder.powerPerSecond(30)); + public static final SlimefunItemStack ELECTRIC_INGOT_PULVERIZER = new SlimefunItemStack("ELECTRIC_INGOT_PULVERIZER", Material.FURNACE, "&cElectric Ingot Pulverizer", "", "&fPulverizes Ingots into Dust", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(14)); public static final SlimefunItemStack AUTO_DRIER; public static final SlimefunItemStack AUTO_ENCHANTER = new SlimefunItemStack("AUTO_ENCHANTER", Material.ENCHANTING_TABLE, "&5Auto Enchanter", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(18)); public static final SlimefunItemStack AUTO_DISENCHANTER = new SlimefunItemStack("AUTO_DISENCHANTER", Material.ENCHANTING_TABLE, "&5Auto Disenchanter", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(18)); @@ -628,7 +628,7 @@ public final class SlimefunItems { public static final SlimefunItemStack AUTO_BREWER; public static final SlimefunItemStack BIO_REACTOR = new SlimefunItemStack("BIO_REACTOR", Material.LIME_TERRACOTTA, "&2Bio Reactor", "", LoreBuilder.machine(MachineTier.AVERAGE, MachineType.GENERATOR), LoreBuilder.powerBuffer(128), LoreBuilder.powerPerSecond(8)); - public static final SlimefunItemStack MULTIMETER = new SlimefunItemStack("MULTIMETER", Material.CLOCK, "&eMultimeter", "", "&rMeasures the Amount of stored", "&rEnergy in a Block"); + public static final SlimefunItemStack MULTIMETER = new SlimefunItemStack("MULTIMETER", Material.CLOCK, "&eMultimeter", "", "&fMeasures the Amount of stored", "&fEnergy in a Block"); public static final SlimefunItemStack SMALL_CAPACITOR = new SlimefunItemStack("SMALL_CAPACITOR", HeadTexture.CAPACITOR_25, "&aSmall Energy Capacitor", "", LoreBuilder.machine(MachineTier.BASIC, MachineType.CAPACITOR), "&8\u21E8 &e\u26A1 &7128 J Capacity"); public static final SlimefunItemStack MEDIUM_CAPACITOR = new SlimefunItemStack("MEDIUM_CAPACITOR", HeadTexture.CAPACITOR_25, "&aMedium Energy Capacitor", "", LoreBuilder.machine(MachineTier.AVERAGE, MachineType.CAPACITOR), "&8\u21E8 &e\u26A1 &7512 J Capacity"); @@ -659,31 +659,31 @@ public final class SlimefunItems { public static final SlimefunItemStack GPS_TRANSMITTER_3 = new SlimefunItemStack("GPS_TRANSMITTER_3", HeadTexture.GPS_TRANSMITTER, "&4Carbonado GPS Transmitter", "", LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(22)); public static final SlimefunItemStack GPS_TRANSMITTER_4 = new SlimefunItemStack("GPS_TRANSMITTER_4", HeadTexture.GPS_TRANSMITTER, "&eEnergized GPS Transmitter", "", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(92)); - public static final SlimefunItemStack GPS_MARKER_TOOL = new SlimefunItemStack("GPS_MARKER_TOOL", Material.REDSTONE_TORCH, "&bGPS Marker Tool", "", "&rAllows you to set a Waypoint at", "&rthe Location you place this"); - public static final SlimefunItemStack GPS_CONTROL_PANEL = new SlimefunItemStack("GPS_CONTROL_PANEL", HeadTexture.GPS_CONTROL_PANEL, "&bGPS Control Panel", "", "&rAllows you to track your Satellites", "&rand manage your Waypoints"); - public static final SlimefunItemStack GPS_EMERGENCY_TRANSMITTER = new SlimefunItemStack("GPS_EMERGENCY_TRANSMITTER", HeadTexture.GPS_TRANSMITTER, "&cGPS Emergency Transmitter", "", "&rCarrying this in your Inventory", "&rautomatically sets a Waypoint", "&rat your Location when you die."); + public static final SlimefunItemStack GPS_MARKER_TOOL = new SlimefunItemStack("GPS_MARKER_TOOL", Material.REDSTONE_TORCH, "&bGPS Marker Tool", "", "&fAllows you to set a Waypoint at", "&fthe Location you place this"); + public static final SlimefunItemStack GPS_CONTROL_PANEL = new SlimefunItemStack("GPS_CONTROL_PANEL", HeadTexture.GPS_CONTROL_PANEL, "&bGPS Control Panel", "", "&fAllows you to track your Satellites", "&fand manage your Waypoints"); + public static final SlimefunItemStack GPS_EMERGENCY_TRANSMITTER = new SlimefunItemStack("GPS_EMERGENCY_TRANSMITTER", HeadTexture.GPS_TRANSMITTER, "&cGPS Emergency Transmitter", "", "&fCarrying this in your Inventory", "&fautomatically sets a Waypoint", "&fat your Location when you die."); - public static final SlimefunItemStack ANDROID_INTERFACE_FUEL = new SlimefunItemStack("ANDROID_INTERFACE_FUEL", Material.DISPENSER, "&7Android Interface &c(Fuel)", "", "&rItems stored in this Interface", "&rwill be inserted into an Android's Fuel Slot", "&rwhen its Script tells them to do so"); - public static final SlimefunItemStack ANDROID_INTERFACE_ITEMS = new SlimefunItemStack("ANDROID_INTERFACE_ITEMS", Material.DISPENSER, "&7Android Interface &9(Items)", "", "&rItems stored in an Android's Inventory", "&rwill be inserted into this Interface", "&rwhen its Script tells them to do so"); + public static final SlimefunItemStack ANDROID_INTERFACE_FUEL = new SlimefunItemStack("ANDROID_INTERFACE_FUEL", Material.DISPENSER, "&7Android Interface &c(Fuel)", "", "&fItems stored in this Interface", "&fwill be inserted into an Android's Fuel Slot", "&fwhen its Script tells them to do so"); + public static final SlimefunItemStack ANDROID_INTERFACE_ITEMS = new SlimefunItemStack("ANDROID_INTERFACE_ITEMS", Material.DISPENSER, "&7Android Interface &9(Items)", "", "&fItems stored in an Android's Inventory", "&fwill be inserted into this Interface", "&fwhen its Script tells them to do so"); - public static final SlimefunItemStack GPS_GEO_SCANNER = new SlimefunItemStack("GPS_GEO_SCANNER", HeadTexture.GEO_SCANNER, "&bGPS Geo-Scanner", "", "&rScans a Chunk for natural Resources", "&rsuch as &8Oil"); - public static final SlimefunItemStack PORTABLE_GEO_SCANNER = new SlimefunItemStack("PORTABLE_GEO_SCANNER", Material.CLOCK, "&bPortable Geo-Scanner", "", "&rScans a Chunk for natural Resources", "", "&eRight Click&7 to scan"); + public static final SlimefunItemStack GPS_GEO_SCANNER = new SlimefunItemStack("GPS_GEO_SCANNER", HeadTexture.GEO_SCANNER, "&bGPS Geo-Scanner", "", "&fScans a Chunk for natural Resources", "&fsuch as &8Oil"); + public static final SlimefunItemStack PORTABLE_GEO_SCANNER = new SlimefunItemStack("PORTABLE_GEO_SCANNER", Material.CLOCK, "&bPortable Geo-Scanner", "", "&fScans a Chunk for natural Resources", "", "&eRight Click&7 to scan"); public static final SlimefunItemStack GEO_MINER = new SlimefunItemStack("GEO_MINER", HeadTexture.GEO_MINER, "&6GEO Miner", "", "&eMines up resources from the chunk", "&eThese Resources cannot be mined with a pickaxe", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(48), "", "&c&l! &cMake sure to Geo-Scan the Chunk first"); - public static final SlimefunItemStack OIL_PUMP = new SlimefunItemStack("OIL_PUMP", HeadTexture.OIL_PUMP, "&rOil Pump", "", "&7Pumps up Oil and fills it into Buckets", "", "&c&l! &cMake sure to Geo-Scan the Chunk first"); - public static final SlimefunItemStack OIL_BUCKET = new SlimefunItemStack("BUCKET_OF_OIL", HeadTexture.OIL_BUCKET, "&rBucket of Oil"); - public static final SlimefunItemStack FUEL_BUCKET = new SlimefunItemStack("BUCKET_OF_FUEL", HeadTexture.FUEL_BUCKET, "&rBucket of Fuel"); + public static final SlimefunItemStack OIL_PUMP = new SlimefunItemStack("OIL_PUMP", HeadTexture.OIL_PUMP, "&fOil Pump", "", "&7Pumps up Oil and fills it into Buckets", "", "&c&l! &cMake sure to Geo-Scan the Chunk first"); + public static final SlimefunItemStack OIL_BUCKET = new SlimefunItemStack("BUCKET_OF_OIL", HeadTexture.OIL_BUCKET, "&fBucket of Oil"); + public static final SlimefunItemStack FUEL_BUCKET = new SlimefunItemStack("BUCKET_OF_FUEL", HeadTexture.FUEL_BUCKET, "&fBucket of Fuel"); - public static final SlimefunItemStack REFINERY = new SlimefunItemStack("REFINERY", Material.PISTON, "&cRefinery", "", "&rRefines Oil to create Fuel"); + public static final SlimefunItemStack REFINERY = new SlimefunItemStack("REFINERY", Material.PISTON, "&cRefinery", "", "&fRefines Oil to create Fuel"); public static final SlimefunItemStack COMBUSTION_REACTOR = new SlimefunItemStack("COMBUSTION_REACTOR", HeadTexture.GENERATOR, "&cCombustion Reactor", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.GENERATOR), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(24)); public static final SlimefunItemStack ANDROID_MEMORY_CORE = new SlimefunItemStack("ANDROID_MEMORY_CORE", HeadTexture.ENERGY_REGULATOR, "&bAndroid Memory Core"); public static final SlimefunItemStack GPS_TELEPORTER_PYLON = new SlimefunItemStack("GPS_TELEPORTER_PYLON", Material.PURPLE_STAINED_GLASS, "&5GPS Teleporter Pylon", "", "&7Teleporter Component"); - public static final SlimefunItemStack GPS_TELEPORTATION_MATRIX = new SlimefunItemStack("GPS_TELEPORTATION_MATRIX", Material.IRON_BLOCK, "&bGPS Teleporter Matrix", "", "&rThis is your Teleporter's Main Component", "&rThis Matrix allows Players to choose from all", "&rWaypoints made by the Player who has placed", "&rthis Device."); - public static final SlimefunItemStack GPS_ACTIVATION_DEVICE_SHARED = new SlimefunItemStack("GPS_ACTIVATION_DEVICE_SHARED", Material.STONE_PRESSURE_PLATE, "&rGPS Activation Device &3(Shared)", "", "&rPlace this onto a Teleportation Matrix", "&rand step onto this Plate to activate", "&rthe Teleportation Process"); - public static final SlimefunItemStack GPS_ACTIVATION_DEVICE_PERSONAL = new SlimefunItemStack("GPS_ACTIVATION_DEVICE_PERSONAL", Material.STONE_PRESSURE_PLATE, "&rGPS Activation Device &a(Personal)", "", "&rPlace this onto a Teleportation Matrix", "&rand step onto this Plate to activate", "&rthe Teleportation Process", "", "&rThis Version only allows the Person who", "&rplaced this Device to use it"); + public static final SlimefunItemStack GPS_TELEPORTATION_MATRIX = new SlimefunItemStack("GPS_TELEPORTATION_MATRIX", Material.IRON_BLOCK, "&bGPS Teleporter Matrix", "", "&fThis is your Teleporter's Main Component", "&fThis Matrix allows Players to choose from all", "&fWaypoints made by the Player who has placed", "&fthis Device."); + public static final SlimefunItemStack GPS_ACTIVATION_DEVICE_SHARED = new SlimefunItemStack("GPS_ACTIVATION_DEVICE_SHARED", Material.STONE_PRESSURE_PLATE, "&fGPS Activation Device &3(Shared)", "", "&fPlace this onto a Teleportation Matrix", "&fand step onto this Plate to activate", "&fthe Teleportation Process"); + public static final SlimefunItemStack GPS_ACTIVATION_DEVICE_PERSONAL = new SlimefunItemStack("GPS_ACTIVATION_DEVICE_PERSONAL", Material.STONE_PRESSURE_PLATE, "&fGPS Activation Device &a(Personal)", "", "&fPlace this onto a Teleportation Matrix", "&fand step onto this Plate to activate", "&fthe Teleportation Process", "", "&fThis Version only allows the Person who", "&fplaced this Device to use it"); - public static final SlimefunItemStack ELEVATOR_PLATE = new SlimefunItemStack("ELEVATOR_PLATE", Material.STONE_PRESSURE_PLATE, "&bElevator Plate", "", "&rPlace an Elevator Plate on every floor", "&rand you will be able to teleport between them.", "", "&eRight Click this Block &7to name it"); - public static final SlimefunItemStack INFUSED_HOPPER = new SlimefunItemStack("INFUSED_HOPPER", Material.HOPPER, "&5Infused Hopper", "", "&rAutomatically picks up nearby Items in a 7x7x7", "&rRadius when placed."); + public static final SlimefunItemStack ELEVATOR_PLATE = new SlimefunItemStack("ELEVATOR_PLATE", Material.STONE_PRESSURE_PLATE, "&bElevator Plate", "", "&fPlace an Elevator Plate on every floor", "&fand you will be able to teleport between them.", "", "&eRight Click this Block &7to name it"); + public static final SlimefunItemStack INFUSED_HOPPER = new SlimefunItemStack("INFUSED_HOPPER", Material.HOPPER, "&5Infused Hopper", "", "&fAutomatically picks up nearby Items in a 7x7x7", "&fRadius when placed."); public static final SlimefunItemStack HEATED_PRESSURE_CHAMBER = new SlimefunItemStack("HEATED_PRESSURE_CHAMBER", Material.LIGHT_GRAY_STAINED_GLASS, "&cHeated Pressure Chamber", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(10)); public static final SlimefunItemStack HEATED_PRESSURE_CHAMBER_2 = new SlimefunItemStack("HEATED_PRESSURE_CHAMBER_2", Material.LIGHT_GRAY_STAINED_GLASS, "&cHeated Pressure Chamber &7- &eII", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(5), LoreBuilder.powerPerSecond(44)); @@ -706,21 +706,21 @@ public final class SlimefunItems { public static final SlimefunItemStack BLISTERING_INGOT_2 = new SlimefunItemStack("BLISTERING_INGOT_2", Material.GOLD_INGOT, "&6Blistering Ingot &7(66%)", "", LoreBuilder.radioactive(Radioactivity.VERY_HIGH), LoreBuilder.HAZMAT_SUIT_REQUIRED); public static final SlimefunItemStack BLISTERING_INGOT_3 = new SlimefunItemStack("BLISTERING_INGOT_3", Material.GOLD_INGOT, "&6Blistering Ingot", "", LoreBuilder.radioactive(Radioactivity.VERY_HIGH), LoreBuilder.HAZMAT_SUIT_REQUIRED); - public static final SlimefunItemStack ENERGY_REGULATOR = new SlimefunItemStack("ENERGY_REGULATOR", HeadTexture.ENERGY_REGULATOR, "&6Energy Regulator", "", "&rCore Component of an Energy Network"); - public static final SlimefunItemStack DEBUG_FISH = new SlimefunItemStack("DEBUG_FISH", Material.SALMON, "&3How much is the Fish?", "", "&eRight Click &rany Block to view it's BlockData", "&eLeft Click &rto break a Block", "&eShift + Left Click &rany Block to erase it's BlockData", "&eShift + Right Click &rto place a Placeholder Block"); + public static final SlimefunItemStack ENERGY_REGULATOR = new SlimefunItemStack("ENERGY_REGULATOR", HeadTexture.ENERGY_REGULATOR, "&6Energy Regulator", "", "&fCore Component of an Energy Network"); + public static final SlimefunItemStack DEBUG_FISH = new SlimefunItemStack("DEBUG_FISH", Material.SALMON, "&3How much is the Fish?", "", "&eRight Click &fany Block to view it's BlockData", "&eLeft Click &fto break a Block", "&eShift + Left Click &fany Block to erase it's BlockData", "&eShift + Right Click &fto place a Placeholder Block"); public static final SlimefunItemStack NETHER_ICE = new SlimefunItemStack("NETHER_ICE", HeadTexture.NETHER_ICE, "&eNether Ice", "", LoreBuilder.radioactive(Radioactivity.MODERATE), LoreBuilder.HAZMAT_SUIT_REQUIRED); public static final SlimefunItemStack ENRICHED_NETHER_ICE = new SlimefunItemStack("ENRICHED_NETHER_ICE", HeadTexture.ENRICHED_NETHER_ICE, "&eEnriched Nether Ice", "", LoreBuilder.radioactive(Radioactivity.VERY_HIGH), LoreBuilder.HAZMAT_SUIT_REQUIRED); public static final SlimefunItemStack NETHER_ICE_COOLANT_CELL = new SlimefunItemStack("NETHER_ICE_COOLANT_CELL", HeadTexture.NETHER_ICE_COOLANT_CELL, "&6Nether Ice Coolant Cell"); // Cargo - public static final SlimefunItemStack CARGO_MANAGER = new SlimefunItemStack("CARGO_MANAGER", HeadTexture.CARGO_MANAGER, "&6Cargo Manager", "", "&rCore Component of an Item Transport Network"); - public static final SlimefunItemStack CARGO_CONNECTOR_NODE = new SlimefunItemStack("CARGO_NODE", HeadTexture.CARGO_CONNECTOR_NODE, "&7Cargo Node &c(Connector)", "", "&rCargo Connector Pipe"); - public static final SlimefunItemStack CARGO_INPUT_NODE = new SlimefunItemStack("CARGO_NODE_INPUT", HeadTexture.CARGO_INPUT_NODE, "&7Cargo Node &c(Input)", "", "&rCargo Input Pipe"); - public static final SlimefunItemStack CARGO_OUTPUT_NODE = new SlimefunItemStack("CARGO_NODE_OUTPUT", HeadTexture.CARGO_OUTPUT_NODE, "&7Cargo Node &c(Output)", "", "&rCargo Output Pipe"); - public static final SlimefunItemStack CARGO_OUTPUT_NODE_2 = new SlimefunItemStack("CARGO_NODE_OUTPUT_ADVANCED", HeadTexture.CARGO_OUTPUT_NODE, "&6Advanced Cargo Node &c(Output)", "", "&rCargo Output Pipe"); + public static final SlimefunItemStack CARGO_MANAGER = new SlimefunItemStack("CARGO_MANAGER", HeadTexture.CARGO_MANAGER, "&6Cargo Manager", "", "&fCore Component of an Item Transport Network"); + public static final SlimefunItemStack CARGO_CONNECTOR_NODE = new SlimefunItemStack("CARGO_NODE", HeadTexture.CARGO_CONNECTOR_NODE, "&7Cargo Node &c(Connector)", "", "&fCargo Connector Pipe"); + public static final SlimefunItemStack CARGO_INPUT_NODE = new SlimefunItemStack("CARGO_NODE_INPUT", HeadTexture.CARGO_INPUT_NODE, "&7Cargo Node &c(Input)", "", "&fCargo Input Pipe"); + public static final SlimefunItemStack CARGO_OUTPUT_NODE = new SlimefunItemStack("CARGO_NODE_OUTPUT", HeadTexture.CARGO_OUTPUT_NODE, "&7Cargo Node &c(Output)", "", "&fCargo Output Pipe"); + public static final SlimefunItemStack CARGO_OUTPUT_NODE_2 = new SlimefunItemStack("CARGO_NODE_OUTPUT_ADVANCED", HeadTexture.CARGO_OUTPUT_NODE, "&6Advanced Cargo Node &c(Output)", "", "&fCargo Output Pipe"); - public static final SlimefunItemStack AUTO_BREEDER = new SlimefunItemStack("AUTO_BREEDER", Material.HAY_BLOCK, "&eAuto-Breeder", "", "&rRuns on &aOrganic Food", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.powerBuffer(1024), "&8\u21E8 &e\u26A1 &760 J/Animal"); + public static final SlimefunItemStack AUTO_BREEDER = new SlimefunItemStack("AUTO_BREEDER", Material.HAY_BLOCK, "&eAuto-Breeder", "", "&fRuns on &aOrganic Food", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.powerBuffer(1024), "&8\u21E8 &e\u26A1 &760 J/Animal"); public static final SlimefunItemStack ORGANIC_FOOD = new SlimefunItemStack("ORGANIC_FOOD", HeadTexture.FILLED_CAN, "&aOrganic Food", "&7Content: &9???"); public static final SlimefunItemStack WHEAT_ORGANIC_FOOD = new SlimefunItemStack("ORGANIC_FOOD_WHEAT", HeadTexture.FILLED_CAN, "&aOrganic Food", "&7Content: &9Wheat"); @@ -746,23 +746,23 @@ public final class SlimefunItems { public static final SlimefunItemStack KELP_FERTILIZER = new SlimefunItemStack("FERTILIZER_KELP", HeadTexture.FILLED_CAN, "&aOrganic Fertilizer", "&7Content: &9Dried Kelp"); public static final SlimefunItemStack COCOA_FERTILIZER = new SlimefunItemStack("FERTILIZER_COCOA", HeadTexture.FILLED_CAN, "&aOrganic Fertilizer", "&7Content: &9Cocoa beans"); - public static final SlimefunItemStack ANIMAL_GROWTH_ACCELERATOR = new SlimefunItemStack("ANIMAL_GROWTH_ACCELERATOR", Material.HAY_BLOCK, "&bAnimal Growth Accelerator", "", "&rRuns on &aOrganic Food", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(28)); - public static final SlimefunItemStack CROP_GROWTH_ACCELERATOR = new SlimefunItemStack("CROP_GROWTH_ACCELERATOR", Material.LIME_TERRACOTTA, "&aCrop Growth Accelerator", "", "&rRuns on &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Radius: 7x7", "&8\u21E8 &7Speed: &a3/time", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(50)); - public static final SlimefunItemStack CROP_GROWTH_ACCELERATOR_2 = new SlimefunItemStack("CROP_GROWTH_ACCELERATOR_2", Material.LIME_TERRACOTTA, "&aCrop Growth Accelerator &7(&eII&7)", "", "&rRuns on &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Radius: 9x9", "&8\u21E8 &7Speed: &a4/time", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(60)); - public static final SlimefunItemStack TREE_GROWTH_ACCELERATOR = new SlimefunItemStack("TREE_GROWTH_ACCELERATOR", Material.BROWN_TERRACOTTA, "&aTree Growth Accelerator", "", "&rRuns on &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Radius: 9x9", "&8\u21E8 &7Speed: &a4/time", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(48)); + public static final SlimefunItemStack ANIMAL_GROWTH_ACCELERATOR = new SlimefunItemStack("ANIMAL_GROWTH_ACCELERATOR", Material.HAY_BLOCK, "&bAnimal Growth Accelerator", "", "&fRuns on &aOrganic Food", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(28)); + public static final SlimefunItemStack CROP_GROWTH_ACCELERATOR = new SlimefunItemStack("CROP_GROWTH_ACCELERATOR", Material.LIME_TERRACOTTA, "&aCrop Growth Accelerator", "", "&fRuns on &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Radius: 7x7", "&8\u21E8 &7Speed: &a3/time", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(50)); + public static final SlimefunItemStack CROP_GROWTH_ACCELERATOR_2 = new SlimefunItemStack("CROP_GROWTH_ACCELERATOR_2", Material.LIME_TERRACOTTA, "&aCrop Growth Accelerator &7(&eII&7)", "", "&fRuns on &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Radius: 9x9", "&8\u21E8 &7Speed: &a4/time", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(60)); + public static final SlimefunItemStack TREE_GROWTH_ACCELERATOR = new SlimefunItemStack("TREE_GROWTH_ACCELERATOR", Material.BROWN_TERRACOTTA, "&aTree Growth Accelerator", "", "&fRuns on &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Radius: 9x9", "&8\u21E8 &7Speed: &a4/time", LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(48)); - public static final SlimefunItemStack FOOD_FABRICATOR = new SlimefunItemStack("FOOD_FABRICATOR", Material.GREEN_STAINED_GLASS, "&cFood Fabricator", "", "&rProduces &aOrganic Food", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(14)); - public static final SlimefunItemStack FOOD_FABRICATOR_2 = new SlimefunItemStack("FOOD_FABRICATOR_2", Material.GREEN_STAINED_GLASS, "&cFood Fabricator &7(&eII&7)", "", "&rProduces &aOrganic Food", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(6), LoreBuilder.powerBuffer(512), LoreBuilder.powerPerSecond(48)); + public static final SlimefunItemStack FOOD_FABRICATOR = new SlimefunItemStack("FOOD_FABRICATOR", Material.GREEN_STAINED_GLASS, "&cFood Fabricator", "", "&fProduces &aOrganic Food", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(14)); + public static final SlimefunItemStack FOOD_FABRICATOR_2 = new SlimefunItemStack("FOOD_FABRICATOR_2", Material.GREEN_STAINED_GLASS, "&cFood Fabricator &7(&eII&7)", "", "&fProduces &aOrganic Food", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(6), LoreBuilder.powerBuffer(512), LoreBuilder.powerPerSecond(48)); - public static final SlimefunItemStack FOOD_COMPOSTER = new SlimefunItemStack("FOOD_COMPOSTER", Material.GREEN_TERRACOTTA, "&cFood Composter", "", "&rProduces &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(16)); - public static final SlimefunItemStack FOOD_COMPOSTER_2 = new SlimefunItemStack("FOOD_COMPOSTER_2", Material.GREEN_TERRACOTTA, "&cFood Composter &7(&eII&7)", "", "&rProduces &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(10), LoreBuilder.powerBuffer(512), LoreBuilder.powerPerSecond(52)); + public static final SlimefunItemStack FOOD_COMPOSTER = new SlimefunItemStack("FOOD_COMPOSTER", Material.GREEN_TERRACOTTA, "&cFood Composter", "", "&fProduces &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(16)); + public static final SlimefunItemStack FOOD_COMPOSTER_2 = new SlimefunItemStack("FOOD_COMPOSTER_2", Material.GREEN_TERRACOTTA, "&cFood Composter &7(&eII&7)", "", "&fProduces &aOrganic Fertilizer", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(10), LoreBuilder.powerBuffer(512), LoreBuilder.powerPerSecond(52)); - public static final SlimefunItemStack EXP_COLLECTOR = new SlimefunItemStack("XP_COLLECTOR", HeadTexture.EXP_COLLECTOR, "&aEXP Collector", "", "&rCollects nearby Exp and stores it", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(20)); + public static final SlimefunItemStack EXP_COLLECTOR = new SlimefunItemStack("XP_COLLECTOR", HeadTexture.EXP_COLLECTOR, "&aEXP Collector", "", "&fCollects nearby Exp and stores it", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.powerBuffer(1024), LoreBuilder.powerPerSecond(20)); public static final SlimefunItemStack REACTOR_COOLANT_CELL = new SlimefunItemStack("REACTOR_COLLANT_CELL", HeadTexture.COOLANT_CELL, "&bReactor Coolant Cell"); - public static final SlimefunItemStack NUCLEAR_REACTOR = new SlimefunItemStack("NUCLEAR_REACTOR", HeadTexture.NUCLEAR_REACTOR, "&2Nuclear Reactor", "", "&rRequires Cooling!", "&8\u21E8 &bMust be surrounded by Water", "&8\u21E8 &bMust be supplied with Reactor Coolant Cells", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.GENERATOR), LoreBuilder.powerBuffer(16384), LoreBuilder.powerPerSecond(500)); + public static final SlimefunItemStack NUCLEAR_REACTOR = new SlimefunItemStack("NUCLEAR_REACTOR", HeadTexture.NUCLEAR_REACTOR, "&2Nuclear Reactor", "", "&fRequires Cooling!", "&8\u21E8 &bMust be surrounded by Water", "&8\u21E8 &bMust be supplied with Reactor Coolant Cells", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.GENERATOR), LoreBuilder.powerBuffer(16384), LoreBuilder.powerPerSecond(500)); public static final SlimefunItemStack NETHER_STAR_REACTOR = new SlimefunItemStack("NETHERSTAR_REACTOR", HeadTexture.NETHER_STAR_REACTOR, "&fNether Star Reactor", "", "&fRuns on Nether Stars", "&8\u21E8 &bMust be surrounded by Water", "&8\u21E8 &bMust be supplied with Nether Ice Coolant Cells", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.GENERATOR), LoreBuilder.powerBuffer(32768), LoreBuilder.powerPerSecond(1024), "&8\u21E8 &4Causes nearby Entities to get Withered"); - public static final SlimefunItemStack REACTOR_ACCESS_PORT = new SlimefunItemStack("REACTOR_ACCESS_PORT", Material.CYAN_TERRACOTTA, "&2Reactor Access Port", "", "&rAllows you to interact with a Reactor", "&rvia Cargo Nodes, can also be used", "&ras a Buffer", "", "&8\u21E8 &eMust be placed &a3 Blocks &eabove the Reactor"); + public static final SlimefunItemStack REACTOR_ACCESS_PORT = new SlimefunItemStack("REACTOR_ACCESS_PORT", Material.CYAN_TERRACOTTA, "&2Reactor Access Port", "", "&fAllows you to interact with a Reactor", "&fvia Cargo Nodes, can also be used", "&fas a Buffer", "", "&8\u21E8 &eMust be placed &a3 Blocks &eabove the Reactor"); public static final SlimefunItemStack FREEZER = new SlimefunItemStack("FREEZER", Material.LIGHT_BLUE_STAINED_GLASS, "&bFreezer", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(18)); public static final SlimefunItemStack FREEZER_2 = new SlimefunItemStack("FREEZER_2", Material.LIGHT_BLUE_STAINED_GLASS, "&bFreezer &7(&eII&7)", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), LoreBuilder.speed(2), LoreBuilder.powerBuffer(256), LoreBuilder.powerPerSecond(30)); @@ -781,11 +781,11 @@ public final class SlimefunItems { public static final SlimefunItemStack AUTOMATED_CRAFTING_CHAMBER = new SlimefunItemStack("AUTOMATED_CRAFTING_CHAMBER", Material.CRAFTING_TABLE, "&6Automated Crafting Chamber", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), "&8\u21E8 &e\u26A1 &710 J/Item"); public static final SlimefunItemStack FLUID_PUMP = new SlimefunItemStack("FLUID_PUMP", Material.BLUE_TERRACOTTA, "&9Fluid Pump", "", LoreBuilder.machine(MachineTier.ADVANCED, MachineType.MACHINE), "&8\u21E8 &e\u26A1 &732 J/Block"); - public static final SlimefunItemStack CHARGING_BENCH = new SlimefunItemStack("CHARGING_BENCH", Material.CRAFTING_TABLE, "&6Charging Bench", "", "&rCharges Items such as Jetpacks", "", LoreBuilder.machine(MachineTier.BASIC, MachineType.MACHINE), LoreBuilder.powerBuffer(128), "&8\u21E8 &e\u26A1 &7Energy Loss: &c50%"); + public static final SlimefunItemStack CHARGING_BENCH = new SlimefunItemStack("CHARGING_BENCH", Material.CRAFTING_TABLE, "&6Charging Bench", "", "&fCharges Items such as Jetpacks", "", LoreBuilder.machine(MachineTier.BASIC, MachineType.MACHINE), LoreBuilder.powerBuffer(128), "&8\u21E8 &e\u26A1 &7Energy Loss: &c50%"); public static final SlimefunItemStack WITHER_ASSEMBLER = new SlimefunItemStack("WITHER_ASSEMBLER", Material.OBSIDIAN, "&5Wither Assembler", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.MACHINE), "&8\u21E8 &7Cooldown: &b30 Seconds", LoreBuilder.powerBuffer(4096), "&8\u21E8 &e\u26A1 &74096 J/Wither"); - public static final SlimefunItemStack TRASH_CAN = new SlimefunItemStack("TRASH_CAN_BLOCK", HeadTexture.TRASH_CAN, "&3Trash Can", "", "&rWill destroy all Items put into it"); + public static final SlimefunItemStack TRASH_CAN = new SlimefunItemStack("TRASH_CAN_BLOCK", HeadTexture.TRASH_CAN, "&3Trash Can", "", "&fWill destroy all Items put into it"); public static final SlimefunItemStack ELYTRA_SCALE = new SlimefunItemStack("ELYTRA_SCALE", Material.FEATHER, "&bElytra Scale"); public static final SlimefunItemStack INFUSED_ELYTRA = new SlimefunItemStack("INFUSED_ELYTRA", Material.ELYTRA, "&5Infused Elytra"); @@ -799,13 +799,13 @@ public final class SlimefunItems { if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_14)) { TABLE_SAW = new SlimefunItemStack("TABLE_SAW", Material.STONECUTTER, "&6Table Saw", "", "&aAllows you to get 8 planks from 1 Log", "&a(Works with all log types)"); - MAKESHIFT_SMELTERY = new SlimefunItemStack("MAKESHIFT_SMELTERY", Material.BLAST_FURNACE, "&eMakeshift Smeltery", "", "&rImprovised version of the Smeltery", "&rthat only allows you to", "&rsmelt dusts into ingots"); + MAKESHIFT_SMELTERY = new SlimefunItemStack("MAKESHIFT_SMELTERY", Material.BLAST_FURNACE, "&eMakeshift Smeltery", "", "&fImprovised version of the Smeltery", "&fthat only allows you to", "&fsmelt dusts into ingots"); AUTO_DRIER = new SlimefunItemStack("AUTO_DRIER", Material.SMOKER, "&eAuto Drier", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(10)); AUTO_BREWER = new SlimefunItemStack("AUTO_BREWER", Material.SMOKER, "&eAuto Brewer", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(12)); } else { TABLE_SAW = null; - MAKESHIFT_SMELTERY = new SlimefunItemStack("MAKESHIFT_SMELTERY", Material.FURNACE, "&eMakeshift Smeltery", "", "&rImprovised version of the Smeltery", "&rthat only allows you to", "&rsmelt dusts into ingots"); + MAKESHIFT_SMELTERY = new SlimefunItemStack("MAKESHIFT_SMELTERY", Material.FURNACE, "&eMakeshift Smeltery", "", "&fImprovised version of the Smeltery", "&fthat only allows you to", "&fsmelt dusts into ingots"); AUTO_DRIER = new SlimefunItemStack("AUTO_DRIER", Material.FURNACE, "&eAuto Drier", "", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(10)); AUTO_BREWER = new SlimefunItemStack("AUTO_BREWER", Material.BREWING_STAND, "&eAuto Brewer", LoreBuilder.machine(MachineTier.MEDIUM, MachineType.MACHINE), LoreBuilder.speed(1), LoreBuilder.powerPerSecond(12)); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java index 6e75a706b..0b7974360 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java @@ -55,13 +55,13 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { private final boolean showVanillaRecipes; public ChestSlimefunGuide(boolean vanillaRecipes) { + showVanillaRecipes = vanillaRecipes; + if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_14)) { sound = Sound.ITEM_BOOK_PAGE_TURN; - showVanillaRecipes = vanillaRecipes; } else { sound = Sound.ENTITY_BAT_TAKEOFF; - showVanillaRecipes = false; } } @@ -153,7 +153,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { lore.add(""); for (String line : SlimefunPlugin.getLocal().getMessages(p, "guide.locked-category")) { - lore.add(ChatColor.RESET + line); + lore.add(ChatColor.WHITE + line); } lore.add(""); @@ -162,7 +162,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { lore.add(parent.getItem(p).getItemMeta().getDisplayName()); } - menu.addItem(index, new CustomItem(Material.BARRIER, "&4" + SlimefunPlugin.getLocal().getMessage(p, "guide.locked") + " &7- &r" + category.getItem(p).getItemMeta().getDisplayName(), lore.toArray(new String[0]))); + menu.addItem(index, new CustomItem(Material.BARRIER, "&4" + SlimefunPlugin.getLocal().getMessage(p, "guide.locked") + " &7- &f" + category.getItem(p).getItemMeta().getDisplayName(), lore.toArray(new String[0]))); menu.addMenuClickHandler(index, ChestMenuUtils.getEmptyClickHandler()); } } @@ -228,7 +228,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { index++; } else if (isSurvivalMode() && research != null && !profile.hasUnlocked(research)) { - menu.addItem(index, new CustomItem(Material.BARRIER, "&r" + ItemUtils.getItemName(sfitem.getItem()), "&4&l" + SlimefunPlugin.getLocal().getMessage(p, "guide.locked"), "", "&a> Click to unlock", "", "&7Cost: &b" + research.getCost() + " Level(s)")); + menu.addItem(index, new CustomItem(Material.BARRIER, ChatColor.WHITE + ItemUtils.getItemName(sfitem.getItem()), "&4&l" + SlimefunPlugin.getLocal().getMessage(p, "guide.locked"), "", "&a> Click to unlock", "", "&7Cost: &b" + research.getCost() + " Level(s)")); menu.addMenuClickHandler(index, (pl, slot, item, action) -> { if (!SlimefunPlugin.getRegistry().getCurrentlyResearchingPlayers().contains(pl.getUniqueId())) { if (research.canUnlock(pl)) { @@ -287,7 +287,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { return; } - ChestMenu menu = new ChestMenu(SlimefunPlugin.getLocal().getMessage(p, "guide.search.inventory").replace("%item%", ChatUtils.crop(ChatColor.RESET, input))); + ChestMenu menu = new ChestMenu(SlimefunPlugin.getLocal().getMessage(p, "guide.search.inventory").replace("%item%", ChatUtils.crop(ChatColor.WHITE, input))); String searchTerm = input.toLowerCase(Locale.ROOT); if (addToHistory) { @@ -316,7 +316,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { ItemStack categoryItem = category.getItem(p); if (categoryItem != null && categoryItem.hasItemMeta() && categoryItem.getItemMeta().hasDisplayName()) { - lore = Arrays.asList("", ChatColor.DARK_GRAY + "\u21E8 " + ChatColor.RESET + categoryItem.getItemMeta().getDisplayName()); + lore = Arrays.asList("", ChatColor.DARK_GRAY + "\u21E8 " + ChatColor.WHITE + categoryItem.getItemMeta().getDisplayName()); } } @@ -455,13 +455,16 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { @Override public void displayItem(PlayerProfile profile, SlimefunItem item, boolean addToHistory) { Player p = profile.getPlayer(); - if (p == null) return; + + if (p == null) { + return; + } ChestMenu menu = create(p); Optional wiki = item.getWikipage(); if (wiki.isPresent()) { - menu.addItem(8, new CustomItem(Material.KNOWLEDGE_BOOK, ChatColor.RESET + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.wiki"), "", ChatColor.GRAY + "\u21E8 " + ChatColor.GREEN + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.open-category"))); + menu.addItem(8, new CustomItem(Material.KNOWLEDGE_BOOK, ChatColor.WHITE + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.wiki"), "", ChatColor.GRAY + "\u21E8 " + ChatColor.GREEN + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.open-category"))); menu.addMenuClickHandler(8, (pl, slot, itemstack, action) -> { pl.closeInventory(); ChatUtils.sendURL(pl, wiki.get()); @@ -559,7 +562,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { GuideHistory history = profile.getGuideHistory(); if (isSurvivalMode() && history.size() > 1) { - menu.addItem(slot, new CustomItem(ChestMenuUtils.getBackButton(p, "", "&rLeft Click: &7Go back to previous Page", "&rShift + left Click: &7Go back to Main Menu"))); + menu.addItem(slot, new CustomItem(ChestMenuUtils.getBackButton(p, "", "&fLeft Click: &7Go back to previous Page", "&fShift + left Click: &7Go back to Main Menu"))); menu.addMenuClickHandler(slot, (pl, s, is, action) -> { if (action.isShiftClicked()) { @@ -589,7 +592,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { return item; } - String lore = Slimefun.hasPermission(p, slimefunItem, false) ? "&rNeeds to be unlocked elsewhere" : "&rNo Permission"; + String lore = Slimefun.hasPermission(p, slimefunItem, false) ? "&fNeeds to be unlocked elsewhere" : "&fNo Permission"; return Slimefun.hasUnlocked(p, slimefunItem, false) ? item : new CustomItem(Material.BARRIER, ItemUtils.getItemName(item), "&4&l" + SlimefunPlugin.getLocal().getMessage(p, "guide.locked"), "", lore); } else { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java index d513e2fff..6d8980c40 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java @@ -17,19 +17,6 @@ import java.util.logging.Level; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.github.thebusybiscuit.cscorelib2.chat.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.ErrorReport; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; -import me.mrCookieSlime.Slimefun.SlimefunPlugin; -import me.mrCookieSlime.Slimefun.api.BlockStorage; -import me.mrCookieSlime.Slimefun.api.Slimefun; -import net.md_5.bungee.api.chat.ComponentBuilder; -import net.md_5.bungee.api.chat.HoverEvent; -import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.chat.TextComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Chunk; @@ -39,9 +26,21 @@ import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import io.github.thebusybiscuit.cscorelib2.chat.ChatColors; +import io.github.thebusybiscuit.slimefun4.api.ErrorReport; +import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; +import me.mrCookieSlime.Slimefun.api.BlockStorage; +import me.mrCookieSlime.Slimefun.api.Slimefun; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; + public class TickerTask implements Runnable { - private static final int VISIBILITY_THRESHOLD = 200_000; + private static final int VISIBILITY_THRESHOLD = 225_000; private final Set tickers = new HashSet<>(); @@ -268,10 +267,7 @@ public class TickerTask implements Runnable { } builder.append("\n\n&c+ &4").append(hidden).append(" Hidden"); - - component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, - TextComponent.fromLegacyText(builder.toString()))); - + component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(ChatColors.color(builder.toString())))); sender.spigot().sendMessage(component); } else { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java index 785deb4b9..a2ae247f3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java @@ -74,7 +74,7 @@ public final class ChestMenuUtils { } return new CustomItem(PREV_BUTTON_ACTIVE, meta -> { - meta.setDisplayName(ChatColor.RESET + "\u21E6 " + SlimefunPlugin.getLocal().getMessage(p, "guide.pages.previous")); + meta.setDisplayName(ChatColor.WHITE + "\u21E6 " + SlimefunPlugin.getLocal().getMessage(p, "guide.pages.previous")); meta.setLore(Arrays.asList("", ChatColor.GRAY + "(" + page + " / " + pages + ")")); }); } @@ -88,7 +88,7 @@ public final class ChestMenuUtils { } return new CustomItem(NEXT_BUTTON_ACTIVE, meta -> { - meta.setDisplayName(ChatColor.RESET + SlimefunPlugin.getLocal().getMessage(p, "guide.pages.next") + " \u21E8"); + meta.setDisplayName(ChatColor.WHITE + SlimefunPlugin.getLocal().getMessage(p, "guide.pages.next") + " \u21E8"); meta.setLore(Arrays.asList("", ChatColor.GRAY + "(" + page + " / " + pages + ")")); }); } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index ab6212b20..635821e44 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -96,15 +96,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.inventory.UniversalBlockMenu; -import org.bukkit.Bukkit; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.plugin.java.JavaPluginLoader; /** * This is the main class of Slimefun. @@ -169,7 +160,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { local = new LocalizationService(this, "", null); gpsNetwork = new GPSNetwork(); command.register(); - } else if (getServer().getPluginManager().isPluginEnabled("CS-CoreLib")) { + } + else if (getServer().getPluginManager().isPluginEnabled("CS-CoreLib")) { long timestamp = System.nanoTime(); // We wanna ensure that the Server uses a compatible version of Minecraft @@ -207,7 +199,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { if (config.getBoolean("options.auto-update")) { getLogger().log(Level.INFO, "Starting Auto-Updater..."); updaterService.start(); - } else { + } + else { updaterService.disable(); } @@ -301,7 +294,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { // Hooray! getLogger().log(Level.INFO, "Slimefun has finished loading in {0}", getStartupTime(timestamp)); - } else { + } + else { getLogger().log(Level.INFO, "#################### - INFO - ####################"); getLogger().log(Level.INFO, " "); getLogger().log(Level.INFO, "Slimefun could not be loaded (yet)."); @@ -322,7 +316,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { if (ms > 1000) { return DoubleHandler.fixDouble(ms / 1000.0) + "s"; - } else { + } + else { return DoubleHandler.fixDouble(ms) + "ms"; } } @@ -382,11 +377,9 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { // Cancel all tasks from this plugin immediately Bukkit.getScheduler().cancelTasks(this); - if (ticker != null) { - // Finishes all started movements/removals of block data - ticker.halt(); - ticker.run(); - } + // Finishes all started movements/removals of block data + ticker.halt(); + ticker.run(); // Save all Player Profiles that are still in memory PlayerProfile.iterator().forEachRemaining(profile -> { @@ -433,8 +426,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { } private void createDirectories() { - String[] storageFolders = {"Players", "blocks", "stored-blocks", "stored-inventories", "stored-chunks", "universal-inventories", "waypoints", "block-backups"}; - String[] pluginFolders = {"scripts", "generators", "error-reports", "cache/github", "world-settings"}; + String[] storageFolders = { "Players", "blocks", "stored-blocks", "stored-inventories", "stored-chunks", "universal-inventories", "waypoints", "block-backups" }; + String[] pluginFolders = { "scripts", "generators", "error-reports", "cache/github", "world-settings" }; for (String folder : storageFolders) { File file = new File("data-storage/Slimefun", folder); From 2ed8fdda1233b6fa992d22300a41a0eaf33f401a Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 14:47:10 +0200 Subject: [PATCH 29/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad36c0fbf..4cace9dcc 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Here is a full summary of the differences between the two different versions of | | development (latest) | "stable" | | ------------------ | -------- | -------- | -| **Minecraft version(s)** | :video_game: 1.13.X - 1.16.X | :video_game: 1.13.X - 1.15.X | +| **Minecraft version(s)** | :video_game: **1.13.\* - 1.16.\*** | :video_game: **1.13.\* - 1.15.\*** | | **automatic updates** | :heavy_check_mark: | :heavy_check_mark: | | **frequent updates** | :heavy_check_mark: | :x: | | **latest content** | :heavy_check_mark: | :x: | From 311202ce3501cba4dd06f6bcbcb3ec559c1a39a8 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 15:14:58 +0200 Subject: [PATCH 30/32] Another patch for 1.16 compatibility --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b90c97da..ecdc0c245 100644 --- a/pom.xml +++ b/pom.xml @@ -306,7 +306,7 @@ com.github.TheBusyBiscuit CS-CoreLib2 - 0.23 + 0.23.2 compile From e66aa0baa574ae56f9de158c4fd33dcf89368ea8 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 15:18:31 +0200 Subject: [PATCH 31/32] Added Smithing Table Recipe support --- src/main/resources/languages/recipes_en.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/languages/recipes_en.yml b/src/main/resources/languages/recipes_en.yml index 45a1680c6..9f82f5b76 100644 --- a/src/main/resources/languages/recipes_en.yml +++ b/src/main/resources/languages/recipes_en.yml @@ -186,3 +186,9 @@ minecraft: lore: - 'Craft this Item as shown' - 'using a Stonecutter' + + smithing: + name: 'Smithing Table Recipe' + lore: + - 'Craft this Item as shown' + - 'using a Smithing Table' From d18af0c211dd9155ac940b98dbb4e897f618c7ee Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 25 Jun 2020 15:27:18 +0200 Subject: [PATCH 32/32] Ore Crusher now also accepts Nether Gold Ore --- CHANGELOG.md | 4 ++++ .../implementation/items/multiblocks/OreCrusher.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 900e037fc..517599a59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ * Added Nether Quartz Ore Crusher Recipe * Added a new language: Tagalog * Added Magical Zombie Pills +* Added 1.13 compatibility to the Auto Drier +* (1.16+) Slimefun guide can now show Smithing Table recipes +* (1.16+) Added Nether Gold Ore recipe to the Ore Crusher #### Changes * Coolant Cells now last twice as long @@ -42,6 +45,7 @@ * Multi Tool lore now says "Crouch" instead of "Hold Shift" * items which cannot be distributed by a Cargo Net will be dropped on the ground now instead of getting deleted * Small performance improvements to the Cargo Net +* Slimefun no longer supports CraftBukkit #### Fixes * Fixed #2005 diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java index 03b37556e..95f0f1c3a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java @@ -14,6 +14,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; +import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; @@ -43,6 +44,11 @@ public class OreCrusher extends MultiBlockMachine { super.postRegister(); displayRecipes.addAll(Arrays.asList(new ItemStack(Material.COAL_ORE), doubleOres.getCoal(), new ItemStack(Material.LAPIS_ORE), doubleOres.getLapisLazuli(), new ItemStack(Material.REDSTONE_ORE), doubleOres.getRedstone(), new ItemStack(Material.DIAMOND_ORE), doubleOres.getDiamond(), new ItemStack(Material.EMERALD_ORE), doubleOres.getEmerald(), new ItemStack(Material.NETHER_QUARTZ_ORE), doubleOres.getNetherQuartz())); + + if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { + displayRecipes.add(new ItemStack(Material.NETHER_GOLD_ORE)); + displayRecipes.add(doubleOres.getGoldNuggets()); + } } @Override @@ -86,6 +92,7 @@ public class OreCrusher extends MultiBlockMachine { private final ItemStack diamond = new ItemStack(Material.DIAMOND, 1); private final ItemStack emerald = new ItemStack(Material.EMERALD, 1); private final ItemStack quartz = new ItemStack(Material.QUARTZ, 1); + private final ItemStack goldNuggets = new ItemStack(Material.GOLD_NUGGET, 4); public DoubleOreSetting() { super("double-ores", true); @@ -98,6 +105,7 @@ public class OreCrusher extends MultiBlockMachine { diamond.setAmount(value ? 2 : 1); emerald.setAmount(value ? 2 : 1); quartz.setAmount(value ? 2 : 1); + goldNuggets.setAmount(value ? 8 : 4); SlimefunItem ironDust = SlimefunItem.getByID("IRON_DUST"); if (ironDust != null) { @@ -146,6 +154,10 @@ public class OreCrusher extends MultiBlockMachine { return quartz; } + public ItemStack getGoldNuggets() { + return goldNuggets; + } + } }