Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.20.1/dev' into 1.20.1/authorized_cards
Browse files Browse the repository at this point in the history
# Conflicts:
#	common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828
#	common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677
#	common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865
#	common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6
#	common/src/generated/resources/assets/numismatics/lang/en_ud.json
#	common/src/generated/resources/assets/numismatics/lang/en_us.json
#	common/src/main/java/dev/ithundxr/createnumismatics/content/backend/Coin.java
#	common/src/main/resources/assets/numismatics/lang/default/interface.json
  • Loading branch information
techno-sam committed Jul 21, 2024
2 parents d30357a + d92a4d2 commit 9b44815
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,12 @@ public String getTranslatedName() {
return Components.translatable(getTranslationKey()).getString().toLowerCase(Locale.ROOT);
}

public String getTranslatedNamePlural() {
return Components.translatable(getTranslationKey()+".plural").getString().toLowerCase(Locale.ROOT);
}

public String getName(int amount) {
return Components.translatable(getTranslationKey() + (amount != 1 ? ".plural" : ""))
.getString()
.toLowerCase(Locale.ROOT);
return (amount != 1 ? getTranslatedNamePlural() : getTranslatedName());
}

public String getDefaultLangName() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import com.mojang.brigadier.tree.CommandNode;
import com.mojang.brigadier.tree.LiteralCommandNode;
import com.simibubi.create.infrastructure.command.AllCommands;
import dev.ithundxr.createnumismatics.registry.commands.DeductCommand;
import dev.ithundxr.createnumismatics.registry.commands.PayCommand;
import dev.ithundxr.createnumismatics.registry.commands.ReloadCommandsCommand;
import dev.ithundxr.createnumismatics.registry.commands.ViewCommand;
import dev.ithundxr.createnumismatics.registry.commands.*;
import dev.ithundxr.createnumismatics.util.Utils;
import net.minecraft.commands.CommandSourceStack;

Expand All @@ -40,6 +37,7 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher, bo
.then(PayCommand.register())
.then(DeductCommand.register())
.then(ViewCommand.register())
.then(PayAllCommand.register())
//.then(ClearCasingCacheCommand.register())
//.then(SplitTrainCommand.register())
//.then(TrainInfoCommand.register());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,22 @@ public static ItemEntry<CoinItem> getCoin(Coin coin) {

public static final DyedItemList<CardItem> CARDS = new DyedItemList<>(color -> {
String colorName = color.getSerializedName();
return REGISTRATE.item(colorName+"_card", p -> new CardItem(p, color))
return REGISTRATE.item(colorName + "_card", p -> new CardItem(p, color))
.properties(p -> p.stacksTo(1))
.tag(NumismaticsTags.AllItemTags.CARDS.tag)
.lang(TextUtils.titleCaseConversion(color.getName()) + " Card")
.model((c, p) -> p.generated(c, Numismatics.asResource("item/card/"+colorName+"_card")))
.lang(TextUtils.titleCaseConversion(color.getName()) + " Bank Card")
.model((c, p) -> p.generated(c, Numismatics.asResource("item/card/" + colorName + "_card")))
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.numismatics.bank_card"))
.register();
});

public static final DyedItemList<IDCardItem> ID_CARDS = new DyedItemList<>(color -> {
String colorName = color.getSerializedName();
return REGISTRATE.item(colorName+"_id_card", p -> new IDCardItem(p, color))
return REGISTRATE.item(colorName + "_id_card", p -> new IDCardItem(p, color))
.properties(p -> p.stacksTo(16))
.tag(NumismaticsTags.AllItemTags.ID_CARDS.tag)
.lang(TextUtils.titleCaseConversion(color.getName()) + " ID Card")
.model((c, p) -> p.generated(c, Numismatics.asResource("item/id_card/"+colorName+"_id_card")))
.model((c, p) -> p.generated(c, Numismatics.asResource("item/id_card/" + colorName + "_id_card")))
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.numismatics.id_card"))
.register();
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* Numismatics
* Copyright (c) 2023-2024 The Railways Team
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package dev.ithundxr.createnumismatics.registry.commands;

import com.mojang.brigadier.builder.ArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import com.simibubi.create.foundation.utility.Components;
import dev.ithundxr.createnumismatics.Numismatics;
import dev.ithundxr.createnumismatics.content.backend.BankAccount;
import dev.ithundxr.createnumismatics.content.backend.BankAccount.Type;
import dev.ithundxr.createnumismatics.content.backend.Coin;
import dev.ithundxr.createnumismatics.registry.commands.arguments.EnumArgument;
import net.minecraft.commands.CommandSourceStack;

import java.util.Set;
import java.util.UUID;

import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger;
import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
import static net.minecraft.commands.Commands.argument;
import static net.minecraft.commands.Commands.literal;

public class PayAllCommand {
public static ArgumentBuilder<CommandSourceStack, ?> register() {
return literal("payall")
.requires(cs -> cs.hasPermission(2))
.then(argument("amount", integer(0))
.executes(ctx -> execute(ctx, getInteger(ctx, "amount")))
.then(argument("coin", EnumArgument.enumArgument(Coin.class))
.executes(ctx -> execute(ctx, getInteger(ctx, "amount"), ctx.getArgument("coin", Coin.class)))
)
);
}

private static int execute(CommandContext<CommandSourceStack> ctx, int amount) {
return execute(ctx, amount, Coin.SPUR);
}

private static int execute(CommandContext<CommandSourceStack> ctx, int amount, Coin coin) {
int spurValue = coin.toSpurs(amount);
int sum = 0;

Set<UUID> uuids = Numismatics.BANK.accounts.keySet();

for (UUID uuid: uuids) {
BankAccount account = Numismatics.BANK.getAccount(uuid);

if (account != null && account.type == Type.PLAYER) {
account.deposit(spurValue);

sum ++;
}
}

int finalSum = sum;
ctx.getSource().sendSuccess(() -> Components.literal("Paid "+amount+" "+coin.getName(amount)+" to "+ finalSum +" account(s)."), true);

return sum;
}
}
29 changes: 0 additions & 29 deletions common/src/main/resources/assets/numismatics/lang/lol_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,11 @@
"item.numismatics.coin.tooltip.value": "Valuz: %s %s (%s¤)",
"item.numismatics.coin.tooltip.value.basic": "Valuz: %s¤",
"item.numismatics.crown": "Crown",
"item.numismatics.cyan_card": "Cyan Kard",
"item.numismatics.cyan_id_card": "Cyan IDz Kard",
"item.numismatics.gray_card": "Gray Kard",
"item.numismatics.gray_id_card": "Gray IDz Kard",
"item.numismatics.green_card": "Green Kard",
"item.numismatics.green_id_card": "Green IDz Kard",
"item.numismatics.id_card.tooltip": "IDz Kard",
"item.numismatics.id_card.tooltip.already_bound": "Dis already bound, Sneak like cat + Use to do da Unbind",
"item.numismatics.id_card.tooltip.bound": "Bound to me",
"item.numismatics.id_card.tooltip.cleared": "Cleared",
"item.numismatics.id_card.tooltip.summary": "_Right Click_ to bind to youz, _shift click_ to clearz. Can be placed in the _Trusted Kitties Menu_ of many Numismatics blockies to gibe the bound kitties accesz to that blockz.",
"item.numismatics.light_blue_card": "Light Blue Kard",
"item.numismatics.light_blue_id_card": "Light Blue IDz Kard",
"item.numismatics.light_gray_card": "Light Gray Kard",
"item.numismatics.light_gray_id_card": "Light Gray IDz Kard",
"item.numismatics.lime_card": "Lime Kard",
"item.numismatics.lime_id_card": "Lime IDz Kard",
"item.numismatics.magenta_card": "Magenta Kard",
"item.numismatics.magenta_id_card": "Magenta IDz Kard",
"item.numismatics.orange_card": "Orange Kard",
"item.numismatics.orange_id_card": "Orange IDz Kard",
"item.numismatics.pink_card": "Pink Kard",
"item.numismatics.pink_id_card": "Pink IDz Kard",
"item.numismatics.purple_card": "Purple Kard",
"item.numismatics.purple_id_card": "Purple IDz Kard",
"item.numismatics.red_card": "Red Kard",
"item.numismatics.red_id_card": "Red IDz Kard",
"item.numismatics.sprocket": "Sprocket",
"item.numismatics.spur": "Spur",
"item.numismatics.sun": "Sun",
"item.numismatics.white_card": "White Kard",
"item.numismatics.white_id_card": "White IDz Kard",
"item.numismatics.yellow_card": "Yellow Kard",
"item.numismatics.yellow_id_card": "Yellow IDz Kard",
"itemGroup.numismatics": "Create: Numismatics",
"numismatics.andesite_depositor.price": "Price",
"numismatics.trust_list.configure": "Configure list of trusted kitties"
Expand Down
6 changes: 6 additions & 0 deletions common/src/main/resources/assets/numismatics/lang/ru_ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"item.numismatics.banking_guide.tooltip": "ИНСТРУКЦИЯ БАНКИРА",
"item.numismatics.banking_guide.tooltip.summary": "Используйте на _горелке всполоха_, чтобы превратить его во _всполоха-банкира_.",
"item.numismatics.bevel": "Фаска",
"item.numismatics.bevel.plural": "фасок",
"item.numismatics.black_card": "Чёрная банковская карта",
"item.numismatics.black_id_card": "Чёрная идентификационная карта",
"item.numismatics.blue_card": "Синяя банковская карта",
Expand All @@ -66,10 +67,12 @@
"item.numismatics.card.tooltip.bound": "Привязана",
"item.numismatics.card.tooltip.bound.to": "Привязана к: %s",
"item.numismatics.cog": "Шестерёнка",
"item.numismatics.cog.plural": "шестерёнок",
"item.numismatics.coin.tooltip.count": "Кол-во: %s %s",
"item.numismatics.coin.tooltip.value": "Номинал: %s %s (%s¤)",
"item.numismatics.coin.tooltip.value.basic": "Номинал: %s¤",
"item.numismatics.crown": "Коронка",
"item.numismatics.crown.plural": "коронок",
"item.numismatics.cyan_card": "Бирюзовая банковская карта",
"item.numismatics.cyan_id_card": "Бирюзовая идентификационная карта",
"item.numismatics.gray_card": "Серая банковская карта",
Expand Down Expand Up @@ -98,8 +101,11 @@
"item.numismatics.red_card": "Красная банковская карта",
"item.numismatics.red_id_card": "Красная идентификационная карта",
"item.numismatics.sprocket": "Звёздочка",
"item.numismatics.sprocket.plural": "звёздочек",
"item.numismatics.spur": "Шпора",
"item.numismatics.spur.plural": "шпор",
"item.numismatics.sun": "Солнышко",
"item.numismatics.sun.plural": "солнышек",
"item.numismatics.white_card": "Белая банковская карта",
"item.numismatics.white_id_card": "Белая идентификационная карта",
"item.numismatics.yellow_card": "Жёлтая банковская карта",
Expand Down

0 comments on commit 9b44815

Please sign in to comment.