Upstream/UltimateRepairing
1
0
Fork 0
mirror of https://github.com/songoda/UltimateRepairing.git synced 2024-11-25 03:55:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2024-10-02 15:55:32 +02:00
commit 1096e3579d
No known key found for this signature in database
GPG Key ID: 6A4A09E8ED946113
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>com.craftaro</groupId> <groupId>com.craftaro</groupId>
<artifactId>UltimateRepairing</artifactId> <artifactId>UltimateRepairing</artifactId>
<version>2.0.1</version> <version>2.3.0</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
@ -48,7 +48,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version> <version>3.5.3</version>
<executions> <executions>
<execution> <execution>
<id>shaded</id> <id>shaded</id>
@ -81,10 +81,10 @@
<excludeDefaults>false</excludeDefaults> <excludeDefaults>false</excludeDefaults>
<includes> <includes>
<include>**/nms/v*/**</include> <include>**/nms/v*/**</include>
<include>**/third_party/net/kyori/**</include>
</includes> </includes>
<excludes> <excludes>
<exclude>**/third_party/org/apache/**</exclude> <exclude>**/third_party/org/apache/**</exclude>
<exclude>**/third_party/net/kyori/**</exclude>
<exclude>**/third_party/com/zaxxer/**</exclude> <exclude>**/third_party/com/zaxxer/**</exclude>
<exclude>**/third_party/org/jooq/**</exclude> <exclude>**/third_party/org/jooq/**</exclude>
<exclude>**/third_party/org/mariadb/**</exclude> <exclude>**/third_party/org/mariadb/**</exclude>
@ -131,7 +131,7 @@
<dependency> <dependency>
<groupId>com.craftaro</groupId> <groupId>com.craftaro</groupId>
<artifactId>CraftaroCore</artifactId> <artifactId>CraftaroCore</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

8
src/main/java/com/craftaro/ultimaterepairing/anvil/UAnvil.java
View File

@ -39,14 +39,14 @@ public class UAnvil {
ArrayList<String> lines = new ArrayList<>(); ArrayList<String> lines = new ArrayList<>();
if (!Settings.ENABLE_ANVIL_DEFAULT_FUNCTION.getBoolean()) { if (!Settings.ENABLE_ANVIL_DEFAULT_FUNCTION.getBoolean()) {
lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.oneclick").getMessage()); lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.oneclick").toText());
} else if (Settings.SWAP_LEFT_RIGHT.getBoolean()) { } else if (Settings.SWAP_LEFT_RIGHT.getBoolean()) {
lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.swapclick").getMessage()); lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.swapclick").toText());
} else { } else {
lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.click").getMessage()); lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.click").toText());
} }
lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.torepair").getMessage()); lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.torepair").toText());
if (!HologramManager.isHologramLoaded(hologramId)) { if (!HologramManager.isHologramLoaded(hologramId)) {
HologramManager.createHologram(hologramId, getLocation().add(0, .1, 0), lines); HologramManager.createHologram(hologramId, getLocation().add(0, .1, 0), lines);

2
src/main/java/com/craftaro/ultimaterepairing/gui/RepairGui.java
View File

@ -61,7 +61,7 @@ public class RepairGui extends Gui {
if (Arrays.stream(RepairType.values()).filter(p -> p.hasPermission(player)).count() > 1) if (Arrays.stream(RepairType.values()).filter(p -> p.hasPermission(player)).count() > 1)
setButton(4, GuiUtils.createButtonItem(type.getMaterial(), setButton(4, GuiUtils.createButtonItem(type.getMaterial(),
type.getTitle(), type.getTitle(),
plugin.getLocale().getMessage("interface.repair.swap").getMessage()), (event) -> plugin.getLocale().getMessage("interface.repair.swap").toText()), (event) ->
init(type.getNext(player))); init(type.getNext(player)));

4
src/main/java/com/craftaro/ultimaterepairing/handlers/RepairHandler.java
View File

@ -230,11 +230,11 @@ public class RepairHandler {
if (type == RepairType.ECONOMY) { if (type == RepairType.ECONOMY) {
plugin.getLocale().getMessage("event.repair.notenough") plugin.getLocale().getMessage("event.repair.notenough")
.processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.eco").getMessage()) .processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.eco").toText())
.sendPrefixedMessage(player); .sendPrefixedMessage(player);
} else if (type == RepairType.EXPERIENCE) } else if (type == RepairType.EXPERIENCE)
plugin.getLocale().getMessage("event.repair.notenough") plugin.getLocale().getMessage("event.repair.notenough")
.processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.xp").getMessage()) .processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.xp").toText())
.sendPrefixedMessage(player); .sendPrefixedMessage(player);
else else
plugin.getLocale().getMessage("event.repair.notenough") plugin.getLocale().getMessage("event.repair.notenough")

2
src/main/java/com/craftaro/ultimaterepairing/repair/RepairType.java
View File

@ -24,7 +24,7 @@ public enum RepairType {
RepairType(XMaterial material, String permission, String titleLang) { RepairType(XMaterial material, String permission, String titleLang) {
this.material = material; this.material = material;
this.permission = permission; this.permission = permission;
this.title = UltimateRepairing.getInstance().getLocale().getMessage(titleLang).getMessage(); this.title = UltimateRepairing.getInstance().getLocale().getMessage(titleLang).toText();
} }
public String getTitle() { public String getTitle() {