Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #20

Merged
merged 5 commits into from
Jul 2, 2023
Merged

Dev #20

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -7,15 +7,15 @@
<artifactId>skulls</artifactId>

<name>Skulls</name>
<version>3.10.1</version>
<version>3.10.3</version>
<packaging>jar</packaging>

<properties>
<author>Kiran Hart</author>
<jarName>Skulls</jarName>
<main.class>${project.groupId}.${project.artifactId}.${project.name}</main.class>
<java.version>1.8</java.version>
<flight.version>3.14.0</flight.version>
<flight.version>3.14.2</flight.version>
<flight.path>ca.tweetzy</flight.path>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/ca/tweetzy/skulls/commands/GiveCommand.java
Expand Up @@ -63,7 +63,8 @@ protected ReturnType execute(CommandSender sender, String... args) {
return ReturnType.FAIL;
}

final int amount = args.length == 3 ? NumberHelper.tryInt(args[2], 1) : 1;
int amount = args.length == 3 ? NumberHelper.tryInt(args[2], 1) : 1;
if (amount > 36) amount = 36;

Skull skull = isRandomHead ? Skulls.getSkullManager().getRandomSkull() : Skulls.getSkullManager().getSkull(Integer.parseInt(args[1]));

Expand Down
59 changes: 59 additions & 0 deletions src/main/java/ca/tweetzy/skulls/commands/SetCommand.java
@@ -0,0 +1,59 @@
/*
* Skulls
* Copyright 2023 Kiran Hart
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package ca.tweetzy.skulls.commands;

import ca.tweetzy.flight.command.AllowedExecutor;
import ca.tweetzy.flight.command.Command;
import ca.tweetzy.flight.command.ReturnType;
import org.bukkit.command.CommandSender;

import java.util.List;

public final class SetCommand extends Command {

public SetCommand() {
super(AllowedExecutor.PLAYER, "set");
}

@Override
protected ReturnType execute(CommandSender sender, String... args) {

return ReturnType.SUCCESS;
}

@Override
protected List<String> tab(CommandSender sender, String... args) {
return null;
}

@Override
public String getPermissionNode() {
return null;
}

@Override
public String getSyntax() {
return null;
}

@Override
public String getDescription() {
return null;
}
}
1 change: 0 additions & 1 deletion src/main/java/ca/tweetzy/skulls/impl/TexturedSkull.java
Expand Up @@ -19,7 +19,6 @@
package ca.tweetzy.skulls.impl;

import ca.tweetzy.flight.settings.TranslationManager;
import ca.tweetzy.flight.utils.Common;
import ca.tweetzy.flight.utils.QuickItem;
import ca.tweetzy.skulls.Skulls;
import ca.tweetzy.skulls.api.interfaces.Skull;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ca/tweetzy/skulls/settings/Translations.java
Expand Up @@ -117,7 +117,7 @@ public Translations(@NonNull JavaPlugin plugin) {

public static final TranslationEntry GUI_EDIT_ITEMS_PRICE_NAME = create("gui.edit.items.price.name", "<GRADIENT:DD5E89>&lSkull Price</GRADIENT:fbc7d4>");

public static final TranslationEntry GUI_EDIT_ITEMS_PRICE_LORE = create("gui.edit.items.price.lore", "", "&e&lClick & 8» & 7To edit skull price");
public static final TranslationEntry GUI_EDIT_ITEMS_PRICE_LORE = create("gui.edit.items.price.lore", "", "&e&lClick &8» &7To edit skull price");

public static final TranslationEntry GUI_EDIT_ITEMS_ADD_CATEGORY_NAME = create("gui.edit.items.add category.name", "<GRADIENT:DD5E89>&lAdd To Category</GRADIENT:fbc7d4>");

Expand Down