Skip to content

Commit

Permalink
Merge #15 Refactor to Kotlin
Browse files Browse the repository at this point in the history
kotlin 🔥
  • Loading branch information
l3nnartt committed Jul 6, 2023
2 parents b57855f + 0f39efd commit d3d5259
Show file tree
Hide file tree
Showing 44 changed files with 1,228 additions and 1,507 deletions.
85 changes: 85 additions & 0 deletions docs/team/translate/de.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
rank.builder.description= Das Bauteam kreiert neue Maps und Lobbys für alle Gelegenheiten und Spielmodi auf Timolia. \
Sie betreuen die architektonische Gestaltung neuer Modi und betreuen externe Mapeinsendungen.
rank.builder_plus.description= Builder+ übernehmen zusätzliche organisatorische Verantwortung durch ihre hohe Erfahrung sowohl im Level Design als auch im Team. \
So leiten sie beispielsweise Projekte oder sind Ansprechpartner für neue Builder.
rank.content.description= Als kreative Ader sind sie für die verschiedensten Belange von Grafikdesign bis Übersetzung zuständig.
rank.developer.description= Developer kümmern sich um die Timolia Plugins, entwickeln neue Features und Spielmodi und kümmern sich um die Bugs, pardon, Features auf Timolia.
rank.developer_plus.description= Sie verfügen über langjährige Erfahrung als Entwickler auf Timolia und stehen bei internen Fragen zum Development zur Verfügung. \
Auch kümmern sie sich um Timolia Plugins, entwickeln neue Features und Spielmodi und beheben mögliche Spielfehler.
rank.head_builder.description= Sie leiten und organisieren das Bauteam und dienen als erste Ansprechpartner für alle Builder. \
Außerdem kümmern sie sich um die Auswahl und Einarbeitung neuer Builder und sind die Schnittstelle zwischen dem Bauteam und der allgemeinen Projektorganisation.
rank.administrator.description= Diese Teamler bilden die Leitung Timolias. Sie kümmern sich um die Verwaltung, Organisation und die Teamleitung.
rank.moderator.description= Moderatoren sind langjährige und besonders erfahrene Teamler, die einzigartige Expertise in ihrem jeweiligen Fachgebiet aufweisen. \
Sie dienen als interne Ansprechpartner bei Fragen und koordinieren häufig einzelne Aufgabengebiete.
rank.supporter.description= Supporter stehen für alle grundlegenden Fragen und Reports zur Verfügung und sind die ersten, an die sich Spieler mit ihren Anliegen wenden können.
rank.supporter_plus.description= Sie verfügen über ein umfassendes Fachwissen und stehen für alle Fragen und Reports zur Verfügung. \
Sie sind die ersten, an die sich Spieler mit ihren Anliegen wenden können.
rank.sysadmin.description= Systemadministratoren planen, installieren, konfigurieren und warten die technischen Systeme Timolias. \
Sie führen Updates durch und sorgen für ein reibungsloses Spielerlebnis im Alltag.
page.rank-change.first= Hier werden alle Aus- und Eintritte bzw. Beförderungen und Degradierungen aufgelistet.
player= Spieler
page.rank-change.rank-previous= Vorheriger Rang
page.rank-change.rank-new= Jetziger Rang
date= Datum
page.members.first-1= Das Timolia-Team besteht aktuell aus
page.members.first-2= Mitgliedern und ist in die Ränge
and= und
page.members.first-3= aufgeteilt.
page.members.first-4= Nachfolgend findet ihr eine Liste aller Teammitglieder von Timolia sowie deren Aufgabenbereiche und Verantwortlichkeiten. Diese Zuteilung heißt nicht, dass ausschießlich diese Teamler in diesem Bereich aktiv sind. \
Die Planung und Entwicklung von neuen Modi, Updates, Events und Ähnlichem liegt ausdrücklich nicht bei einem festen Teammitglied oder einer festen Gruppe von Teammitgliedern sondern unterscheidet sich von Projekt zu Projekt oder ändert sich zum Teil im Laufe des Projekts.
page.members.first-5= Die Ränge auf Timolia
page.members.rank-ingame= Rang (ingame)
page.members.hv= Hauptverantwortlich
page.members.nv= Nebenverantwortlich
page.members.fields= Bereiche
page.responsibilities.project-team-orga= Projekt- und Teamorganisation
page.responsibilities.teamleader= Team-Leiter
page.responsibilities.teamleader.desc= Im Timolia Team gibt es kleinere Teams, welche unter anderem durch diese Verantwortlichen organisiert werden.
page.responsibilities.project-team-orga.apply.builder= Teamlerauswahl Builder und Timolia Creative
page.responsibilities.project-team-orga.apply.content= Teamlerauswahl Content
page.responsibilities.project-team-orga.apply.development= Teamlerauswahl Development
page.responsibilities.project-team-orga.apply.support= Teamlerauswahl Support
page.responsibilities.project-team-orga.apply.support.desc= Wenn es wieder daran geht, neue Teammitglieder für den Support in unsere Reihen zu holen, kümmern sich diese Verantwortlichen darum.
page.responsibilities.project-team-orga.howto= Timolia HowTo
page.responsibilities.project-team-orga.howto.desc= Diese Teamler kümmern sich um's Aktualisieren und Erstellen des HowTos Timolias.
page.responsibilities.project-team-orga.tournament= Timolia Turnier Organisation
page.responsibilities.project-team-orga.tournament.desc= Dieses Team entscheidet über die Turniereinstellungen bei den Freitagsturnieren.
page.responsibilities.project-team-orga.uhc= UHC
page.responsibilities.project-team-orga.uhc.desc= Diese Teammitglieder kümmern sich um die Organisation und den reibungslosen Ablauf aller Timolia UHCs.
page.responsibilities.project-team-orga.youtuber= Youtuber-Ränge
page.responsibilities.project-team-orga.youtuber.desc= Wenn sich ein YouTuber für einen Rang auf Timolia interessiert, werden die Anfragen von diesem Team bearbeitet.
page.responsibilities.communication-platforms= Kommunikationsplattformen
page.responsibilities.communication-platforms.community-discord= Community-Discord
page.responsibilities.communication-platforms.community-discord.desc= Der Community-Discord von Timolia ist unter [https://timolia.de/discord](https://timolia.de/discord) zu erreichen. Er wird betreut von diesen Teamlern.
page.responsibilities.communication-platforms.bug-reports= Bug Reports
page.responsibilities.communication-platforms.appeal= Entschuldigungen
page.responsibilities.communication-platforms.falsely-banned= Zu Unrecht gebannt
page.responsibilities.communication-platforms.socialmedia= Social Media
page.responsibilities.communication-platforms.socialmedia.desc= Für einen ständigen Support und Content auf Twitter und anderen sozialen Medien sorgen diese Teamler.
page.responsibilities.communication-platforms.teamspeak= TeamSpeak
page.responsibilities.communication-platforms.teamspeak.desc= Der TeamSpeak von Timolia ist unter `ts.timolia.de` zu erreichen. Er wird betreut von diesen Teamlern.
page.responsibilities.other-responsibilities= Sonstige Aufgaben
page.responsibilities.other-responsibilities.translation= Translation und Content creation
page.responsibilities.other-responsibilities.map-submissions= Map-Einsendungen
page.responsibilities.other-responsibilities.graphicdesign= Grafikdesign
page.responsibilities.other-responsibilities.announcements= Ankündigungen
page.responsibilities.other-responsibilities.monthly-winner= Monatssieger
page.responsibilities.info= Hier werden die verschiedenen Aufgabenbereiche der Timolia Teamler aufgelistet.
page.responsibilities.custom.bug-reports.modsanddevs= Moderatoren und Developer
page.responsibilities.custom.sm.title= Projekte u. Verantwortungsgrad
page.responsibilities.custom.sm.twitter= Twitter
page.responsibilities.custom.sm.twitter-builder= Bauteam-Twitter
page.responsibilities.custom.sm.twitter.hv= Twitter HV
page.responsibilities.custom.sm.twitter.nv= Twitter NV
page.responsibilities.custom.sm.twitter-builder.hv= Bauteam-Twitter MR
page.responsibilities.custom.sm.twitter-builder.nv= Bauteam-Twitter SR
page.responsibilities.custom.teamleader.title= Zuständigkeit
page.responsibilities.custom.teamleader.whole-team= Management des Timolia-Teams
page.responsibilities.custom.teamleader.builder= Management des Bau-Teams
page.responsibilities.custom.teamleader.content= Management des Content-Teams
page.responsibilities.custom.teamleader.development= Management des Dev-Teams
page.responsibilities.custom.yter.title= Zuständigkeit
page.responsibilities.teamler= Teamler
page.responsibilities.responsib= Verantwortungsgrad
page.responsibilities.hv= Hauptverantwortlich
page.responsibilities.nv= Nebenverantwortlich
86 changes: 86 additions & 0 deletions docs/team/translate/en.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
rank.builder.description= The builder team creates new maps and lobbies for all occasions and game modes on Timolia. \
They supervise the architectural design of new game modes and manage external map submissions.
rank.builder_plus.description= Builder+ take on additional organizational responsibility through their high level of experience in both level design and the team. \
For example, they manage projects or are the contact person for new builders.
rank.content.description= As a creative streak, they are responsible for a wide range of interests from graphic design to translation.
rank.developer.description= Developers take care of Timolia plugins, develop new features and game modes and fix bugs (oh sorry, we really mean features) features on Timolia.
rank.developer_plus.description= They have many years of experience as a developer on Timolia and are available to answer internal questions about development. \
They also take care of Timolia plugins, develop new features and game modes and fix possible bugs in games.
rank.head_builder.description= They lead and organize the builder team and act as the first point of contact for all builders. \
Moreover, they take care of the selection and training of new builders and are the link between the builder team and the general project organization.
rank.administrator.description= These team members form the leadership of Timolia. They take care of administration, organization and team management.
rank.moderator.description= Moderators are long-term and outstandingly experienced team members who have unique knowledge in their respective fields. \
They serve as internal contacts for questions and often coordinate individual areas of responsibility.
rank.supporter.description= Supporters are available for all basic questions and reports and \
are the first to whom players can address their concerns.
rank.supporter_plus.description= They have comprehensive specialized knowledge and are available for all questions and reports. \
They are the first to whom players can turn with their concerns.
rank.sysadmin.description= System administrators plan, install, configure and maintain Timolia's technical systems. \
They carry out updates and ensure a smooth gaming experience in everyday life.
page.rank-change.first= Here, all team entries and resignations as well as promotions and demotions are listed.
player= Name
page.rank-change.rank-previous= Previous rank
page.rank-change.rank-new= Current Rank
date= Date
page.members.first-1= The Timolia team currently consists of
page.members.first-2= team members and is divided into the ranks
and= and
page.members.first-3= .
page.members.first-4= Below you will find a list of all team members of Timolia and their responsibilities aswell as their fields of operation. This does not mean that these team members alone are active in that specific field. \
Planning and developing new game modes, updates and events is not assigned to one specific team member or a specific group of team members. It rather differs from one project to another and may change during the course of the project.
page.members.first-5= The ranks on Timolia
page.members.rank-ingame= Rang (ingame)
page.members.hv= Main responsibilities
page.members.nv= Secondary responsibilities
page.members.fields= Fields
page.responsibilities.project-team-orga= Project- and Teamorganization
page.responsibilities.teamleader= Team Leader
page.responsibilities.teamleader.desc= In the Timolia team, there are smaller teams, which are organized among others by these responsible persons.
page.responsibilities.project-team-orga.apply.builder= Staff selection builder and Timolia Creative
page.responsibilities.project-team-orga.apply.content= Staff selection content
page.responsibilities.project-team-orga.apply.development= Staff selection development
page.responsibilities.project-team-orga.apply.support= Staff selection support
page.responsibilities.project-team-orga.apply.support.desc= When it comes to recruiting new supporters, those team members will take care of it.
page.responsibilities.project-team-orga.howto= Timolia HowTo
page.responsibilities.project-team-orga.howto.desc= These team members are responsible for updating and creating Timolia's HowTos.
page.responsibilities.project-team-orga.tournament= Timolia Tournament Organization
page.responsibilities.project-team-orga.tournament.desc= This team decides on the tournament settings for the Friday tournaments.
page.responsibilities.project-team-orga.uhc= UHC
page.responsibilities.project-team-orga.uhc.desc= These team members take care of the organization and seamless experience of all Timolia UHCs.
page.responsibilities.project-team-orga.youtuber= YouTuber Ranks
page.responsibilities.project-team-orga.youtuber.desc= If a YouTuber is interested in a rank on Timolia, the requests are processed by this team.
page.responsibilities.communication-platforms= Communication platforms
page.responsibilities.communication-platforms.community-discord= Community-Discord
page.responsibilities.communication-platforms.community-discord.desc= The Community-Discord of Timolia can be reached at [https://timolia.de/discord](https://timolia.de/discord). It is maintained by these team members.
page.responsibilities.communication-platforms.bug-reports= Bug Reports
page.responsibilities.communication-platforms.appeal= Appeals
page.responsibilities.communication-platforms.falsely-banned= Falsely banned
page.responsibilities.communication-platforms.socialmedia= Social Media
page.responsibilities.communication-platforms.socialmedia.desc= These team members provide ongoing support and content on Twitter and other social media.
page.responsibilities.communication-platforms.teamspeak= TeamSpeak
page.responsibilities.communication-platforms.teamspeak.desc= The TeamSpeak of Timolia can be reached at `ts.timolia.de`. It is supervised by these team members.
page.responsibilities.other-responsibilities= Other responsibilites
page.responsibilities.other-responsibilities.translation= Translation and Content creation
page.responsibilities.other-responsibilities.map-submissions= Map submissions
page.responsibilities.other-responsibilities.graphicdesign= Graphic design
page.responsibilities.other-responsibilities.announcements= Announcements
page.responsibilities.other-responsibilities.monthly-winner= Monthly winner
page.responsibilities.info= The various areas of responsibility of the Timolia team members are listed here.
page.responsibilities.custom.bug-reports.modsanddevs= Moderators and Developers
page.responsibilities.custom.sm.title= Projects and level of responsibility
page.responsibilities.custom.sm.twitter= Twitter
page.responsibilities.custom.sm.twitter-builder= Builder Team-Twitter
page.responsibilities.custom.sm.twitter.hv= Twitter MR
page.responsibilities.custom.sm.twitter.nv= Twitter SR
page.responsibilities.custom.sm.twitter-builder.hv= Builder Team-Twitter MR
page.responsibilities.custom.sm.twitter-builder.nv= Builder Team-Twitter SR
page.responsibilities.custom.teamleader.title= Responsibility
page.responsibilities.custom.teamleader.whole-team= Management of the Timolia team
page.responsibilities.custom.teamleader.builder= Management of the builder team
page.responsibilities.custom.teamleader.content= Management of the content team
page.responsibilities.custom.teamleader.development= Management of the development team
page.responsibilities.custom.yter.title= Responsibility
page.responsibilities.teamler= Team member
page.responsibilities.responsib= Level of responsibility
page.responsibilities.hv= Main responsibility
page.responsibilities.nv= Secondary responsibility
12 changes: 6 additions & 6 deletions howto-dapp/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'org.jetbrains.kotlin.jvm' version '1.8.21'
}

group 'de.timolia.howto'
Expand All @@ -13,19 +14,18 @@ repositories {
dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
implementation 'com.google.code.gson:gson:2.8.8'
implementation 'mysql:mysql-connector-java:8.0.25'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'mysql:mysql-connector-java:8.0.28'

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
}

test {
useJUnitPlatform()
}

jar {
manifest {
attributes 'Main-Class': 'de.timolia.howto.Dapp'
}
}
kotlin {
jvmToolchain(17)
}
Binary file modified howto-dapp/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions howto-dapp/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion howto-dapp/gradlew → howto-dapp/src/gradlew
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ case "`uname`" in
Darwin* )
darwin=true
;;
MINGW* )
MSYS* | MINGW* )
msys=true
;;
NONSTOP* )
Expand Down
2 changes: 1 addition & 1 deletion howto-dapp/gradlew.bat → howto-dapp/src/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" "-Dfile.encoding=UTF-8"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
Loading

0 comments on commit d3d5259

Please sign in to comment.