Skip to content
This repository was archived by the owner on Jun 14, 2024. It is now read-only.
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: TheNewEconomy/TNE-Bukkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: TNE-0.1.1.16
Choose a base ref
...
head repository: TheNewEconomy/TNE-Bukkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 10 commits
  • 115 files changed
  • 2 contributors

Commits on Dec 16, 2021

  1. Copy the full SHA
    f9c002a View commit details

Commits on Dec 18, 2021

  1. Copy the full SHA
    cb3f5d0 View commit details

Commits on Dec 22, 2021

  1. Copy the full SHA
    0d44ae1 View commit details

Commits on Feb 20, 2022

  1. Copy the full SHA
    7d3f429 View commit details
  2. Copy the full SHA
    96f9022 View commit details

Commits on Jun 27, 2022

  1. Bump gson from 2.8.0 to 2.8.9 in /Web (#507)

    Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.9.
    - [Release notes](https://github.com/google/gson/releases)
    - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
    - [Commits](google/gson@gson-parent-2.8.0...gson-parent-2.8.9)
    
    ---
    updated-dependencies:
    - dependency-name: com.google.code.gson:gson
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 27, 2022
    Copy the full SHA
    49154b9 View commit details

Commits on Jul 3, 2022

  1. fixes.

    creatorfromhell committed Jul 3, 2022
    Copy the full SHA
    bfb9cdc View commit details

Commits on May 25, 2023

  1. fixes.

    creatorfromhell committed May 25, 2023
    Copy the full SHA
    3e3b30d View commit details
  2. Copy the full SHA
    95887ea View commit details

Commits on Jun 14, 2024

  1. Copy the full SHA
    fa11ef6 View commit details
Showing with 1,256 additions and 1,170 deletions.
  1. +27 −0 .github/ISSUE_TEMPLATE/request-a-feature.yml
  2. +112 −0 Bungee/pom.xml
  3. +35 −0 Bungee/src/net/tnemc/bungee/core/MessageHandler.java
  4. +71 −0 Bungee/src/net/tnemc/bungee/core/MessageListener.java
  5. +29 −0 Bungee/src/net/tnemc/bungee/core/TNEConnect.java
  6. +49 −0 Bungee/src/net/tnemc/bungee/core/messages/BalanceMessageHandler.java
  7. 0 {TNE/src/net/tnemc/core/common/menu/consumable → Bungee/src/net/tnemc/bungee}/placeholder.md
  8. +4 −0 Bungee/src/net/tnemc/bungee/resources/plugin.yml
  9. +219 −0 Core/dependency-reduced-pom.xml
  10. +5 −0 README.md
  11. +14 −29 TNE/dependency-reduced-pom.xml
  12. +51 −22 TNE/pom.xml
  13. +37 −28 TNE/src/net/tnemc/core/TNE.java
  14. +9 −7 TNE/src/net/tnemc/core/WorldGuardManager.java
  15. +4 −2 TNE/src/net/tnemc/core/commands/money/MoneyGiveCommand.java
  16. +4 −2 TNE/src/net/tnemc/core/commands/money/MoneyOtherCommand.java
  17. +5 −2 TNE/src/net/tnemc/core/commands/money/MoneyPayCommand.java
  18. +4 −2 TNE/src/net/tnemc/core/commands/money/MoneyPayFromCommand.java
  19. +4 −2 TNE/src/net/tnemc/core/commands/money/MoneySetCommand.java
  20. +4 −2 TNE/src/net/tnemc/core/commands/money/MoneyTakeCommand.java
  21. +1 −2 TNE/src/net/tnemc/core/common/CurrencyManager.java
  22. +15 −1 TNE/src/net/tnemc/core/common/EconomyManager.java
  23. +12 −0 TNE/src/net/tnemc/core/common/account/TNEAccount.java
  24. +5 −5 TNE/src/net/tnemc/core/common/api/Economy_TheNewEconomy.java
  25. +0 −1 TNE/src/net/tnemc/core/common/configurations/ConfigurationManager.java
  26. +4 −0 TNE/src/net/tnemc/core/common/currency/TNECurrency.java
  27. +11 −3 TNE/src/net/tnemc/core/common/currency/formatter/CurrencyFormatter.java
  28. +1 −1 TNE/src/net/tnemc/core/common/currency/type/MixedType.java
  29. +10 −4 TNE/src/net/tnemc/core/common/currency/type/VirtualType.java
  30. +4 −1 TNE/src/net/tnemc/core/common/data/TNESaveManager.java
  31. +0 −110 TNE/src/net/tnemc/core/common/menu/ConvertableData.java
  32. +0 −50 TNE/src/net/tnemc/core/common/menu/Menu.java
  33. +0 −18 TNE/src/net/tnemc/core/common/menu/MenuClickType.java
  34. +0 −14 TNE/src/net/tnemc/core/common/menu/NewMenuManager.java
  35. +0 −14 TNE/src/net/tnemc/core/common/menu/consumable/menu/MenuOpen.java
  36. +0 −15 TNE/src/net/tnemc/core/common/menu/consumable/menu/icon/ChatValidator.java
  37. +0 −39 TNE/src/net/tnemc/core/common/menu/consumable/menu/icon/IconBuild.java
  38. +0 −62 TNE/src/net/tnemc/core/common/menu/consumable/menu/icon/IconClick.java
  39. +0 −14 TNE/src/net/tnemc/core/common/menu/consumable/menu/layout/LayoutBuild.java
  40. +0 −14 TNE/src/net/tnemc/core/common/menu/consumable/menu/layout/LayoutClick.java
  41. +0 −14 TNE/src/net/tnemc/core/common/menu/consumable/menu/page/PageSwitch.java
  42. +0 −47 TNE/src/net/tnemc/core/common/menu/icon/ChatResponse.java
  43. +0 −197 TNE/src/net/tnemc/core/common/menu/icon/IconType.java
  44. +0 −64 TNE/src/net/tnemc/core/common/menu/layout/Container.java
  45. +0 −125 TNE/src/net/tnemc/core/common/menu/layout/Layout.java
  46. +0 −28 TNE/src/net/tnemc/core/common/menu/layout/LayoutOrder.java
  47. 0 TNE/src/net/tnemc/core/common/menu/placeholder.md
  48. +1 −0 TNE/src/net/tnemc/core/common/module/ModuleInfo.java
  49. +2 −1 TNE/src/net/tnemc/core/common/utils/MISCUtils.java
  50. +1 −1 TNE/src/net/tnemc/core/common/utils/MaterialUtils.java
  51. +1 −0 TNE/src/net/tnemc/core/listeners/player/PlayerChannelListener.java
  52. +15 −12 TNE/src/net/tnemc/core/listeners/player/PlayerJoinListener.java
  53. +0 −5 TNE/src/net/tnemc/core/listeners/player/PlayerPreLoginListener.java
  54. +4 −4 ...c/core/{common/menu/consumable/menu/MenuClose.java → listeners/plugin/PluginChannelListener.java}
  55. +52 −0 TNE/src/net/tnemc/core/message/BungeeMessage.java
  56. +7 −3 ...c/net/tnemc/core/{listeners/message/TNEMessageListener.java → message/BungeeMessageListener.java}
  57. +62 −0 TNE/src/net/tnemc/core/message/BungeeMessageManager.java
  58. +65 −0 TNE/src/net/tnemc/core/message/BungeeMessageWrapper.java
  59. +82 −0 TNE/src/net/tnemc/core/message/impl/BungeeBalanceMessage.java
  60. +15 −12 TNE/src/net/tnemc/resources/menus.yml
  61. +5 −1 TNE/src/net/tnemc/resources/plugin.yml
  62. +1 −1 TNEConversion/pom.xml
  63. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/AConomy.java
  64. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/AdvancedEconomy.java
  65. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/BConomy.java
  66. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/BEconomy.java
  67. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/BasicEconomy.java
  68. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/Blings.java
  69. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/CMI.java
  70. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/DevCoinSystem.java
  71. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/ECEconomy.java
  72. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/EcoPlugin.java
  73. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/EcoSystem.java
  74. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/EconomyAPI.java
  75. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/Essentials.java
  76. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/FeConomy.java
  77. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/FeatherEconomy.java
  78. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/GMoney.java
  79. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/GemsEconomy.java
  80. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/Meep.java
  81. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/Meller.java
  82. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/MineCoin.java
  83. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/MineCoinsYML.java
  84. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/MineConomy.java
  85. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/MinetopiaEconomy.java
  86. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/MoConomy.java
  87. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/MySQLBridge.java
  88. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/SQLConomy.java
  89. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/SaneEconomy.java
  90. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/SimpleConomy.java
  91. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/SimplisticEconomy.java
  92. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/SwiftEconomy.java
  93. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/TokensEconomy.java
  94. +3 −3 TNEConversion/src/net/tnemc/conversion/impl/TownyEco.java
  95. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/UltimateEconomy.java
  96. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/XConomy.java
  97. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/iConomy.java
  98. +2 −2 TNEConversion/src/net/tnemc/conversion/impl/iConomy7.java
  99. +0 −40 TNEDiscord/discord.yml
  100. +0 −1 TNEDiscord/module.tne
  101. +7 −7 TNEDiscord/pom.xml
  102. +1 −1 TNEDiscord/src/net/tnemc/discord/DiscordListener.java
  103. +24 −4 TNEDiscord/src/net/tnemc/discord/DiscordModule.java
  104. +1 −1 TNEDiscord/src/net/tnemc/discord/TransactionListener.java
  105. +14 −12 TNEDiscord/src/net/tnemc/discord/command/DiscordCommand.java
  106. +12 −7 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoBalanceCommand.java
  107. +6 −6 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoBalanceOtherCommand.java
  108. +3 −1 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoCommand.java
  109. +9 −4 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoGiveCommand.java
  110. +9 −4 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoPayCommand.java
  111. +13 −8 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoSetCommand.java
  112. +3 −1 TNEDiscord/src/net/tnemc/discord/command/eco/DiscordEcoTakeCommand.java
  113. +2 −2 TNEDiscord/src/net/tnemc/discord/transaction/MultiTransactionData.java
  114. +3 −4 TNEDiscord/src/net/tnemc/discord/transaction/MultiTransactionHandler.java
  115. +1 −1 Web/pom.xml
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/request-a-feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Feature Request
description: Suggest a feature to be added in order to help TNE improve.
title: "[FEAT]: "
labels: ["feature"]
assignees:
- creatorfromhell

body:
- type: markdown
attributes:
value: Thanks for helping to improve The New Economy with feature requests!
- type: textarea
attributes:
label: Feature Description
description: Describe the feature you're requesting to be added here.
placeholder: |
Example: "Add /oprahpay to celebrate global giving!!@#!"
validations:
required: true
- type: textarea
attributes:
label: Reasoning
description: Why should this be added? What is the use-case?
placeholder: |
Example: "Global wealth!@#!@#!"
validations:
required: true
112 changes: 112 additions & 0 deletions Bungee/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.tnemc</groupId>
<artifactId>TNE-Bungee</artifactId>
<version>1.0.0-PRE-1</version>
<packaging>jar</packaging>
<name>The New Economy - Bungee</name>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<directory>target</directory>
<outputDirectory>target/classes</outputDirectory>
<finalName>${project.artifactId}-${project.version}</finalName>
<testOutputDirectory>target/test-classes</testOutputDirectory>
<sourceDirectory>src/</sourceDirectory>
<resources>
<resource>
<directory>src/net/tnemc/bungee/resources/</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.1-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<organization>
<name>The New Economy</name>
<url>https://tnemc.net</url>
</organization>

<developers>
<developer>
<id>creatorfromhell</id>
<name>Daniel "creatorfromhell" Vidmar</name>
<email>daniel.viddy@gmail.com</email>
<url>https://creatorfromhell.com</url>
<organization>The New Economy</organization>
<organizationUrl>https://tnemc.net</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>America/New_York</timezone>
</developer>
</developers>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>maven-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
35 changes: 35 additions & 0 deletions Bungee/src/net/tnemc/bungee/core/MessageHandler.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package net.tnemc.bungee.core;

import com.google.common.io.ByteArrayDataOutput;

import java.io.DataInputStream;
import java.util.UUID;

/**
* The New Economy Minecraft Server Plugin
* <p>
* Created by creatorfromhell on 12/17/2021.
* <p>
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to
* Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
* Created by creatorfromhell on 06/30/2017.
*/
public abstract class MessageHandler {

private String tag;

public MessageHandler(String tag) {
this.tag = tag;
}

public static void sendToAll(final String channel, ByteArrayDataOutput out) {
TNEConnect.instance().getProxy().getServers().values().forEach(server->{
if(server.getPlayers().size() > 0) {
server.sendData(channel, out.toByteArray(), false);
}
});
}

public abstract void handle(UUID player, UUID server, DataInputStream stream);
}
71 changes: 71 additions & 0 deletions Bungee/src/net/tnemc/bungee/core/MessageListener.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package net.tnemc.bungee.core;

/**
* The New Economy Minecraft Server Plugin
* <p>
* Created by creatorfromhell on 12/17/2021.
* <p>
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to
* Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
* Created by creatorfromhell on 06/30/2017.
*/

import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;
import net.tnemc.bungee.core.messages.BalanceMessageHandler;

import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

/**
* Manages all Plugin Channel messages.
*
* @author creatorfromhell
* @since 1.0.0
*/
public class MessageListener implements Listener {

private Map<String, MessageHandler> handlers = new HashMap<>();

public MessageListener() {
handlers.put("balance", new BalanceMessageHandler());
}


@EventHandler
public void onMessage(PluginMessageEvent event) {
if(!event.getTag().startsWith("tne:")) {
return;
}

if(!(event.getSender() instanceof Server)) {
System.out.println("Event sender not server.");
event.setCancelled(true);
return;
}

final String tag = event.getTag().replace("tne:", "");

if(handlers.containsKey(tag)) {
try {
ByteArrayInputStream stream = new ByteArrayInputStream(event.getData());
DataInputStream in = new DataInputStream(stream);

UUID server = UUID.fromString(in.readUTF());
UUID player = UUID.fromString(in.readUTF());
handlers.get(tag).handle(player, server, in);

in.close();
stream.close();
} catch(Exception e) {
e.printStackTrace();
}
}
}
}
29 changes: 29 additions & 0 deletions Bungee/src/net/tnemc/bungee/core/TNEConnect.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package net.tnemc.bungee.core;

import net.md_5.bungee.api.plugin.Plugin;

/**
* The New Economy Minecraft Server Plugin
* <p>
* Created by creatorfromhell on 12/17/2021.
* <p>
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to
* Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
* Created by creatorfromhell on 06/30/2017.
*/
public class TNEConnect extends Plugin {

private static TNEConnect instance;

@Override
public void onEnable() {
instance = this;
getProxy().registerChannel("tne:balance");
getProxy().getPluginManager().registerListener(this, new MessageListener());
}

public static TNEConnect instance() {
return instance;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package net.tnemc.bungee.core.messages;

import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import net.tnemc.bungee.core.MessageHandler;

import java.io.DataInputStream;
import java.io.IOException;
import java.util.UUID;

/**
* The New Economy Minecraft Server Plugin
* <p>
* Created by creatorfromhell on 12/17/2021.
* <p>
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to
* Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
* Created by creatorfromhell on 06/30/2017.
*/
public class BalanceMessageHandler extends MessageHandler {
public BalanceMessageHandler() {
super("balance");
}

@Override
public void handle(UUID player, UUID server, DataInputStream stream) {

try {
final String world = stream.readUTF();
final String currency = stream.readUTF();
final String amount = stream.readUTF();
send(server, player, world, currency, amount);
} catch (IOException e) {
e.printStackTrace();
}

}

public static void send(UUID server, UUID player, String world, String currency, String amount) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF(server.toString());
out.writeUTF(player.toString());
out.writeUTF(world);
out.writeUTF(currency);
out.writeUTF(amount);
sendToAll("tne:balance", out);
}
}
4 changes: 4 additions & 0 deletions Bungee/src/net/tnemc/bungee/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
name: TheNewEconomyConnect
main: net.tnemc.bungee.core.TNEConnect
version: 1.0.0
author: creatorfromhell
Loading