Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GeorgH93/MarriageMaster
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.7.2
Choose a base ref
...
head repository: GeorgH93/MarriageMaster
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Dec 21, 2023

  1. Use Java 17 for sonarcloud

    GeorgH93 committed Dec 21, 2023
    Copy the full SHA
    6887635 View commit details

Commits on Jan 24, 2024

  1. Copy the full SHA
    a738290 View commit details

Commits on Jan 30, 2024

  1. Copy the full SHA
    853410c View commit details

Commits on Jan 31, 2024

  1. BungeeCord improvements

    GeorgH93 committed Jan 31, 2024
    Copy the full SHA
    d4f78c4 View commit details

Commits on Feb 5, 2024

  1. Update log messages

    GeorgH93 committed Feb 5, 2024
    Copy the full SHA
    2452f71 View commit details
  2. Copy the full SHA
    baf2f32 View commit details
  3. Copy the full SHA
    46873fb View commit details
  4. Copy the full SHA
    36ba49d View commit details

Commits on Feb 7, 2024

  1. Copy the full SHA
    11e9565 View commit details
  2. Merge pull request #325 from ArmaRealms/dev/force-marry

    I hope it goes without saying, use at your own risk :D
    GeorgH93 authored Feb 7, 2024
    Copy the full SHA
    0bf573b View commit details

Commits on Feb 11, 2024

  1. fix: upgrade net.md-5:bungeecord-api from 1.15-SNAPSHOT to 1.20-R0.2

    Snyk has created this PR to upgrade net.md-5:bungeecord-api from 1.15-SNAPSHOT to 1.20-R0.2.
    
    See this package in Maven Repository:
    https://mvnrepository.com/artifact/net.md-5/bungeecord-api/
    
    See this project in Snyk:
    https://app.snyk.io/org/georgh93/project/fe5c260d-2a4a-4315-b46a-47d725cdd80e?utm_source=github&utm_medium=referral&page=upgrade-pr
    snyk-bot committed Feb 11, 2024
    Copy the full SHA
    f5a8ceb View commit details

Commits on Feb 14, 2024

  1. Merge pull request #326 from GeorgH93/snyk-upgrade-d7b47dd5db2c2e1304…

    …fb0f4e69dc6eed
    
    [Snyk] Upgrade net.md-5:bungeecord-api from 1.15-SNAPSHOT to 1.20-R0.2
    GeorgH93 authored Feb 14, 2024
    Copy the full SHA
    85d0e1b View commit details

Commits on Feb 16, 2024

  1. Build with java 21

    GeorgH93 committed Feb 16, 2024
    Copy the full SHA
    4db62cb View commit details

Commits on Feb 19, 2024

  1. Update maven-shade

    GeorgH93 committed Feb 19, 2024
    Copy the full SHA
    84e667f View commit details

Commits on Apr 14, 2024

  1. fix: upgrade org.projectlombok:lombok from 1.18.30 to 1.18.32

    Snyk has created this PR to upgrade org.projectlombok:lombok from 1.18.30 to 1.18.32.
    
    See this package in Maven Repository:
    https://mvnrepository.com/artifact/org.projectlombok/lombok/
    
    See this project in Snyk:
    https://app.snyk.io/org/georgh93/project/47b930c7-c295-4ff0-9a4b-a9b11413d0c2?utm_source=github&utm_medium=referral&page=upgrade-pr
    snyk-bot committed Apr 14, 2024
    Copy the full SHA
    b9feec5 View commit details

Commits on Apr 21, 2024

  1. Update to v2.7.4

    GeorgH93 committed Apr 21, 2024
    Copy the full SHA
    3d02a46 View commit details

Commits on Apr 24, 2024

  1. Update dependencies

    GeorgH93 committed Apr 24, 2024
    Copy the full SHA
    861b741 View commit details

Commits on Apr 25, 2024

  1. Merge pull request #331 from GeorgH93/snyk-upgrade-a099a84382f84364ab…

    …92db4ca29e585b
    
    [Snyk] Upgrade org.projectlombok:lombok from 1.18.30 to 1.18.32
    GeorgH93 authored Apr 25, 2024
    Copy the full SHA
    fc3b731 View commit details

Commits on May 6, 2024

  1. Update ru.yml

    A small correction, as well as the return of the line "Language file version" from the original file in order to avoid conflicts
    authorless authored May 6, 2024
    Copy the full SHA
    a430963 View commit details

Commits on May 7, 2024

  1. Merge pull request #332 from authorless/patch-2

    Update ru.yml
    GeorgH93 authored May 7, 2024
    Copy the full SHA
    da5d7d1 View commit details
  2. Set lang file version

    GeorgH93 committed May 7, 2024
    Copy the full SHA
    2f71b06 View commit details

Commits on May 13, 2024

  1. Update pcgf plugin lib

    GeorgH93 committed May 13, 2024
    Copy the full SHA
    2957d4d View commit details

Commits on Jun 17, 2024

  1. Update for MC 1.21

    GeorgH93 committed Jun 17, 2024
    Copy the full SHA
    273dc66 View commit details

Commits on Jul 18, 2024

  1. Copy the full SHA
    2c77339 View commit details
  2. Merge pull request #342 from PureGero/feature/teleport-async

    Use Paper's teleportAsync if available
    GeorgH93 authored Jul 18, 2024
    Copy the full SHA
    4af0e07 View commit details
  3. Update to v2.7.7

    GeorgH93 committed Jul 18, 2024
    Copy the full SHA
    5af9abe View commit details

Commits on Jul 21, 2024

  1. fix: upgrade org.projectlombok:lombok from 1.18.32 to 1.18.34

    Snyk has created this PR to upgrade org.projectlombok:lombok from 1.18.32 to 1.18.34.
    
    See this package in maven:
    org.projectlombok:lombok
    
    See this project in Snyk:
    https://app.snyk.io/org/georgh93/project/d7be8226-1bf0-49b6-8242-9ddd3278aeda?utm_source=github&utm_medium=referral&page=upgrade-pr
    snyk-bot committed Jul 21, 2024
    Copy the full SHA
    933c949 View commit details

Commits on Aug 12, 2024

  1. Added Portuguese language (made from 0)

    (made from 0, the old one was mostly in English)
    davidcanas authored Aug 12, 2024
    Copy the full SHA
    93b6da9 View commit details

Commits on Dec 9, 2024

  1. Copy the full SHA
    14cd2b4 View commit details

Commits on Dec 22, 2024

  1. Merge pull request #345 from davidcanas/patch-1

    Added Portuguese language (made from 0)
    GeorgH93 authored Dec 22, 2024
    Copy the full SHA
    68b9e6d View commit details

Commits on Jan 12, 2025

  1. Merge pull request #343 from GeorgH93/snyk-upgrade-514a7261f57217455c…

    …709ef705487b93
    
    [Snyk] Upgrade org.projectlombok:lombok from 1.18.32 to 1.18.34
    GeorgH93 authored Jan 12, 2025
    Copy the full SHA
    458bb41 View commit details

Commits on Jan 14, 2025

  1. fix: upgrade org.projectlombok:lombok from 1.18.34 to 1.18.36

    Snyk has created this PR to upgrade org.projectlombok:lombok from 1.18.34 to 1.18.36.
    
    See this package in maven:
    org.projectlombok:lombok
    
    See this project in Snyk:
    https://app.snyk.io/org/georgh93/project/f5deb96f-bf88-49fb-91ea-380da834154d?utm_source=github&utm_medium=referral&page=upgrade-pr
    snyk-bot committed Jan 14, 2025
    Copy the full SHA
    befb911 View commit details

Commits on Feb 1, 2025

  1. Merge pull request #357 from GeorgH93/snyk-upgrade-b9f1b2bf5b11747fcd…

    …546f51836add2a
    
    [Snyk] Upgrade org.projectlombok:lombok from 1.18.34 to 1.18.36
    GeorgH93 authored Feb 1, 2025
    Copy the full SHA
    4525e82 View commit details
Showing with 960 additions and 308 deletions.
  1. +1 −0 .github/workflows/maven.yml
  2. +2 −2 .github/workflows/release.yml
  3. +2 −2 .github/workflows/sonarcloud.yml
  4. +11 −0 API/MarriageMaster-API-Common/src/at/pcgamingfreaks/MarriageMaster/API/MarriageManager.java
  5. +2 −25 MarriageMaster/pom.xml
  6. +352 −233 MarriageMaster/resources/lang/pt.yml
  7. +3 −3 MarriageMaster/resources/lang/ru.yml
  8. +470 −0 MarriageMaster/resources/lang/ua.yml
  9. +3 −0 MarriageMaster/resources/plugin.yml
  10. +1 −1 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/HomeCommand.java
  11. +14 −1 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/TpCommand.java
  12. +11 −1 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Config.java
  13. +32 −4 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Listener/PluginChannelCommunicator.java
  14. +23 −6 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Management/MarriageManagerImpl.java
  15. +2 −2 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bungee/Commands/HomeCommand.java
  16. +2 −2 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bungee/Commands/TpCommand.java
  17. +3 −1 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bungee/Listener/PluginChannelCommunicator.java
  18. +9 −12 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/Backend/SQL.java
  19. +6 −3 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/BaseDatabase.java
  20. +2 −2 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/PluginChannelCommunicatorBase.java
  21. +1 −0 MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Permissions.java
  22. +1 −1 MarriageMaster/test/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Listener/EconomyHandlerTest.java
  23. +7 −7 pom.xml
1 change: 1 addition & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ jobs:
- 8
- 11
- 17
- 21
steps:
- name: Checkout
uses: actions/checkout@v3
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup workspace
run: mkdir artifacts
4 changes: 2 additions & 2 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 21
distribution: temurin
- name: Cache SonarCloud packages
uses: actions/cache@v3
Original file line number Diff line number Diff line change
@@ -194,4 +194,15 @@ public interface MarriageManager<MARRIAGE extends Marriage, MARRIAGE_PLAYER exte
* @param surname The surname for the new married couple.
*/
void marry(@NotNull MARRIAGE_PLAYER player1, @NotNull MARRIAGE_PLAYER player2, @NotNull MARRIAGE_PLAYER priest, @Nullable String surname);

/**
* Initiates a marriage between two players, instantly uniting them in-game if 'forceMarry' is set to true, bypassing any preconditions.
* If 'forceMarry' is false, the marriage proceeds only if all necessary conditions are met.
*
* @param player1 The first player to be married, must be non-null and represents one of the entities entering into marriage.
* @param player2 The second player to be married, also must be non-null, representing the other entity entering into marriage.
* @param forceMarry A boolean indicating the marriage type. True for immediate marriage without precondition checks,
* false for a conditional marriage that requires all preconditions to be satisfied.
*/
void marry(@NotNull MARRIAGE_PLAYER player1, @NotNull MARRIAGE_PLAYER player2, boolean forceMarry);
}
27 changes: 2 additions & 25 deletions MarriageMaster/pom.xml
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.0</version>
<version>5.11.0-M1</version>
<scope>test</scope>
</dependency>
<!-- endregion -->
@@ -218,31 +218,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.2.5</version>
</plugin>
<!-- Creates the coverage report -->
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<formats>
<format>xml</format>
<format>html</format>
</formats>
<aggregate>true</aggregate>
<check/>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>cobertura</goal>
</goals>
</execution>
</executions>
</plugin>-->
<!-- endregion -->
</plugins>
</build>

Loading