Smithy/CelestianEconomy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yay

Browse Source
This commit is contained in:
Gæmer
2025-05-06 18:08:09 +02:00
parent 701912347f
commit 5d5856fbc4
31 changed files with 271 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -9,8 +9,8 @@ fabric_api_version=0.83.0+1.20
# Mod Properties
mod_version = 1.5.6
maven_group = com.gmail.sneakdevs.diamondeconomy
archives_base_name = diamondeconomy
maven_group = com.smithy.celestianeconomy
archives_base_name = celestianeconomy
# Dependencies
cloth_config_version=11.0.99

0
gradlew vendored Normal file → Executable file
View File

56
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/DiamondEconomyCommands.java
View File

@@ -1,56 +0,0 @@
package com.gmail.sneakdevs.diamondeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
public class DiamondEconomyCommands {
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
if (DiamondEconomyConfig.getInstance().commandName == null) {
if (DiamondEconomyConfig.getInstance().modifyCommandName != null) {
dispatcher.register(ModifyCommand.buildCommand());
}
if (DiamondEconomyConfig.getInstance().balanceCommandName != null) {
dispatcher.register(BalanceCommand.buildCommand());
}
if (DiamondEconomyConfig.getInstance().topCommandName != null) {
dispatcher.register(TopCommand.buildCommand());
}
if (DiamondEconomyConfig.getInstance().depositCommandName != null) {
dispatcher.register(DepositCommand.buildCommand());
}
if (DiamondEconomyConfig.getInstance().sendCommandName != null) {
dispatcher.register(SendCommand.buildCommand());
}
if (DiamondEconomyConfig.getInstance().setCommandName != null) {
dispatcher.register(SetCommand.buildCommand());
}
if (DiamondEconomyConfig.getInstance().withdrawCommandName != null) {
dispatcher.register(WithdrawCommand.buildCommand());
}
} else {
if (DiamondEconomyConfig.getInstance().modifyCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(ModifyCommand.buildCommand()));
}
if (DiamondEconomyConfig.getInstance().balanceCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(BalanceCommand.buildCommand()));
}
if (DiamondEconomyConfig.getInstance().topCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(TopCommand.buildCommand()));
}
if (DiamondEconomyConfig.getInstance().depositCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(DepositCommand.buildCommand()));
}
if (DiamondEconomyConfig.getInstance().sendCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(SendCommand.buildCommand()));
}
if (DiamondEconomyConfig.getInstance().setCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(SetCommand.buildCommand()));
}
if (DiamondEconomyConfig.getInstance().withdrawCommandName != null) {
dispatcher.register(Commands.literal(DiamondEconomyConfig.getInstance().commandName).then(WithdrawCommand.buildCommand()));
}
}
}
}

23
src/main/java/com/gmail/sneakdevs/diamondeconomy/mixin/ServerPlayerMixin.java
View File

@@ -1,23 +0,0 @@
package com.gmail.sneakdevs.diamondeconomy.mixin;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.stats.Stats;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ServerPlayer.class)
public class ServerPlayerMixin {
@Inject(method = "tick", at = @At("TAIL"))
private void diamondeconomy_tickMixin(CallbackInfo ci) {
if (DiamondEconomyConfig.getInstance().moneyAddAmount != 0 && DiamondEconomyConfig.getInstance().moneyAddTimer > 0) {
int playTime = ((ServerPlayer)(Object)this).getStats().getValue(Stats.CUSTOM.get(Stats.PLAY_TIME));
if (playTime > 0 && playTime % (DiamondEconomyConfig.getInstance().moneyAddTimer * 20) == 0) {
DiamondUtils.getDatabaseManager().changeBalance(((ServerPlayer)(Object)this).getStringUUID(), DiamondEconomyConfig.getInstance().moneyAddAmount);
}
}
}
}

51
src/main/java/com/gmail/sneakdevs/diamondeconomy/DiamondEconomy.java → src/main/java/com/smithy/celestianeconomy/CelestianEconomy.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy;
package com.smithy.celestianeconomy;
import com.gmail.sneakdevs.diamondeconomy.command.DiamondEconomyCommands;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.SQLiteDatabaseManager;
import com.smithy.celestianeconomy.command.CelestianEconomyCommands;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.SQLiteDatabaseManager;
import eu.pb4.placeholders.api.PlaceholderResult;
import eu.pb4.placeholders.api.Placeholders;
import me.shedaniel.autoconfig.AutoConfig;
@@ -10,73 +10,90 @@ import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.RotatedPillarBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.level.storage.LevelResource;
import java.io.File;
import java.util.ArrayList;
public class DiamondEconomy implements ModInitializer {
public static final String MODID = "diamondeconomy";
public class CelestianEconomy implements ModInitializer {
public static final String MODID = "celestianeconomy";
public static ArrayList<String> tableRegistry = new ArrayList<>();
public static void initServer(MinecraftServer server) {
DiamondUtils.registerTable("CREATE TABLE IF NOT EXISTS diamonds (uuid text PRIMARY KEY, name text NOT NULL, money integer DEFAULT 0);");
SQLiteDatabaseManager.createNewDatabase((DiamondEconomyConfig.getInstance().fileLocation != null) ? (new File(DiamondEconomyConfig.getInstance().fileLocation)) : server.getWorldPath(LevelResource.ROOT).resolve(DiamondEconomy.MODID + ".sqlite").toFile());
CelestianUtils.registerTable("CREATE TABLE IF NOT EXISTS currency (uuid text PRIMARY KEY, name text NOT NULL, money integer DEFAULT 0);");
SQLiteDatabaseManager.createNewDatabase((CelestianEconomyConfig.getInstance().fileLocation != null) ? (new File(CelestianEconomyConfig.getInstance().fileLocation)) : server.getWorldPath(LevelResource.ROOT).resolve(CelestianEconomy.MODID + ".sqlite").toFile());
}
public static void registerPlaceholders() {
Placeholders.register(new ResourceLocation(MODID, "rank_from_player"), (ctx, arg) -> {
if (ctx.hasPlayer()) {
return PlaceholderResult.value(Component.literal(DiamondUtils.getDatabaseManager().playerRank(ctx.player().getStringUUID()) + ""));
return PlaceholderResult.value(Component.literal(CelestianUtils.getDatabaseManager().playerRank(ctx.player().getStringUUID()) + ""));
} else {
return PlaceholderResult.invalid();
}
});
Placeholders.register(new ResourceLocation(MODID, "rank_from_string_uuid"), (ctx, arg) -> {
if (arg != null) {
return PlaceholderResult.value(Component.literal(DiamondUtils.getDatabaseManager().playerRank(arg) + ""));
return PlaceholderResult.value(Component.literal(CelestianUtils.getDatabaseManager().playerRank(arg) + ""));
} else {
return PlaceholderResult.invalid();
}
});
Placeholders.register(new ResourceLocation(MODID, "balance_from_player"), (ctx, arg) -> {
if (ctx.hasPlayer()) {
return PlaceholderResult.value(Component.literal(DiamondUtils.getDatabaseManager().getBalanceFromUUID(ctx.player().getStringUUID()) + ""));
return PlaceholderResult.value(Component.literal(CelestianUtils.getDatabaseManager().getBalanceFromUUID(ctx.player().getStringUUID()) + ""));
} else {
return PlaceholderResult.invalid();
}
});
Placeholders.register(new ResourceLocation(MODID, "balance_from_string_uuid"), (ctx, arg) -> {
if (arg != null) {
return PlaceholderResult.value(Component.literal(DiamondUtils.getDatabaseManager().getBalanceFromUUID(arg) + ""));
return PlaceholderResult.value(Component.literal(CelestianUtils.getDatabaseManager().getBalanceFromUUID(arg) + ""));
} else {
return PlaceholderResult.invalid();
}
});
Placeholders.register(new ResourceLocation(MODID, "balance_from_name"), (ctx, arg) -> {
if (arg != null) {
return PlaceholderResult.value(Component.literal(DiamondUtils.getDatabaseManager().getBalanceFromName(arg) + ""));
return PlaceholderResult.value(Component.literal(CelestianUtils.getDatabaseManager().getBalanceFromName(arg) + ""));
} else {
return PlaceholderResult.invalid();
}
});
Placeholders.register(new ResourceLocation(MODID, "player_from_rank"), (ctx, arg) -> {
if (arg != null) {
return PlaceholderResult.value(Component.literal(DiamondUtils.getDatabaseManager().rank(Integer.parseInt(arg))));
return PlaceholderResult.value(Component.literal(CelestianUtils.getDatabaseManager().rank(Integer.parseInt(arg))));
} else {
return PlaceholderResult.invalid();
}
});
}
public static final Item SMALL_NOTHING = new Item(new Item.Properties().fireResistant());
public static final Block BIG_NOTHING_BLOCK = new RotatedPillarBlock(FabricBlockSettings.copyOf(Blocks.HAY_BLOCK).sounds(SoundType.GRASS).mapColor(MapColor.COLOR_LIGHT_GREEN));
@Override
public void onInitialize() {
AutoConfig.register(DiamondEconomyConfig.class, JanksonConfigSerializer::new);
AutoConfig.register(CelestianEconomyConfig.class, JanksonConfigSerializer::new);
registerPlaceholders();
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> DiamondEconomyCommands.register(dispatcher));
ServerLifecycleEvents.SERVER_STARTING.register(DiamondEconomy::initServer);
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CelestianEconomyCommands.register(dispatcher));
ServerLifecycleEvents.SERVER_STARTING.register(CelestianEconomy::initServer);
Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(MODID, "small_nothing"), SMALL_NOTHING);
Registry.register(BuiltInRegistries.BLOCK, new ResourceLocation(MODID, "big_nothing"), BIG_NOTHING_BLOCK);
Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(MODID, "big_nothing"), new BlockItem(BIG_NOTHING_BLOCK, new FabricItemSettings().fireproof()));
}
}

28
src/main/java/com/gmail/sneakdevs/diamondeconomy/DiamondUtils.java → src/main/java/com/smithy/celestianeconomy/CelestianUtils.java
View File

@@ -1,16 +1,16 @@
package com.gmail.sneakdevs.diamondeconomy;
package com.smithy.celestianeconomy;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.gmail.sneakdevs.diamondeconomy.sql.SQLiteDatabaseManager;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.sql.SQLiteDatabaseManager;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
public class DiamondUtils {
public class CelestianUtils {
public static void registerTable(String query){
DiamondEconomy.tableRegistry.add(query);
CelestianEconomy.tableRegistry.add(query);
}
public static DatabaseManager getDatabaseManager() {
@@ -20,13 +20,13 @@ public class DiamondUtils {
public static int dropItem(int amount, ServerPlayer player) {
if (DiamondEconomyConfig.getInstance().greedyWithdraw) {
if (CelestianEconomyConfig.getInstance().greedyWithdraw) {
for (int i = DiamondEconomyConfig.getCurrencyValues().length - 1; i >= 0 && amount > 0; i--) {
for (int i = CelestianEconomyConfig.getCurrencyValues().length - 1; i >= 0 && amount > 0; i--) {
int val = DiamondEconomyConfig.getCurrencyValues()[i];
int currSize = DiamondEconomyConfig.getCurrency(i).getMaxStackSize();
Item curr = DiamondEconomyConfig.getCurrency(i);
int val = CelestianEconomyConfig.getCurrencyValues()[i];
int currSize = CelestianEconomyConfig.getCurrency(i).getMaxStackSize();
Item curr = CelestianEconomyConfig.getCurrency(i);
while (amount >= val * currSize) {
ItemEntity itemEntity = player.drop(new ItemStack(curr, currSize), true);
@@ -44,9 +44,9 @@ public class DiamondUtils {
} else {
int val = DiamondEconomyConfig.getCurrencyValues()[0];
int currSize = DiamondEconomyConfig.getCurrency(0).getMaxStackSize();
Item curr = DiamondEconomyConfig.getCurrency(0);
int val = CelestianEconomyConfig.getCurrencyValues()[0];
int currSize = CelestianEconomyConfig.getCurrency(0).getMaxStackSize();
Item curr = CelestianEconomyConfig.getCurrency(0);
while (amount >= val * currSize) {
ItemEntity itemEntity = player.drop(new ItemStack(curr, currSize), true);

12
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/BalanceCommand.java → src/main/java/com/smithy/celestianeconomy/command/BalanceCommand.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
@@ -13,7 +13,7 @@ import net.minecraft.network.chat.Component;
public class BalanceCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().balanceCommandName)
return Commands.literal(CelestianEconomyConfig.getInstance().balanceCommandName)
.then(
Commands.argument("playerName", StringArgumentType.string())
.executes(e -> {
@@ -32,7 +32,7 @@ public class BalanceCommand {
}
public static int balanceCommand(CommandContext<CommandSourceStack> ctx, String player) {
DatabaseManager dm = DiamondUtils.getDatabaseManager();
DatabaseManager dm = CelestianUtils.getDatabaseManager();
int bal = dm.getBalanceFromName(player);
ctx.getSource().sendSuccess(() -> Component.literal((bal > -1) ? (player + " has $" + bal) : ("No account was found for player with the name \"" + player + "\"")), false);
return 1;

56
src/main/java/com/smithy/celestianeconomy/command/CelestianEconomyCommands.java Normal file
View File

@@ -0,0 +1,56 @@
package com.smithy.celestianeconomy.command;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
public class CelestianEconomyCommands {
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
if (CelestianEconomyConfig.getInstance().commandName == null) {
if (CelestianEconomyConfig.getInstance().modifyCommandName != null) {
dispatcher.register(ModifyCommand.buildCommand());
}
if (CelestianEconomyConfig.getInstance().balanceCommandName != null) {
dispatcher.register(BalanceCommand.buildCommand());
}
if (CelestianEconomyConfig.getInstance().topCommandName != null) {
dispatcher.register(TopCommand.buildCommand());
}
if (CelestianEconomyConfig.getInstance().depositCommandName != null) {
dispatcher.register(DepositCommand.buildCommand());
}
if (CelestianEconomyConfig.getInstance().sendCommandName != null) {
dispatcher.register(SendCommand.buildCommand());
}
if (CelestianEconomyConfig.getInstance().setCommandName != null) {
dispatcher.register(SetCommand.buildCommand());
}
if (CelestianEconomyConfig.getInstance().withdrawCommandName != null) {
dispatcher.register(WithdrawCommand.buildCommand());
}
} else {
if (CelestianEconomyConfig.getInstance().modifyCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(ModifyCommand.buildCommand()));
}
if (CelestianEconomyConfig.getInstance().balanceCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(BalanceCommand.buildCommand()));
}
if (CelestianEconomyConfig.getInstance().topCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(TopCommand.buildCommand()));
}
if (CelestianEconomyConfig.getInstance().depositCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(DepositCommand.buildCommand()));
}
if (CelestianEconomyConfig.getInstance().sendCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(SendCommand.buildCommand()));
}
if (CelestianEconomyConfig.getInstance().setCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(SetCommand.buildCommand()));
}
if (CelestianEconomyConfig.getInstance().withdrawCommandName != null) {
dispatcher.register(Commands.literal(CelestianEconomyConfig.getInstance().commandName).then(WithdrawCommand.buildCommand()));
}
}
}
}

20
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/DepositCommand.java → src/main/java/com/smithy/celestianeconomy/command/DepositCommand.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -15,18 +15,18 @@ import net.minecraft.world.item.Items;
public class DepositCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().depositCommandName)
return Commands.literal(CelestianEconomyConfig.getInstance().depositCommandName)
.executes(DepositCommand::depositCommand);
}
public static int depositCommand(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
ServerPlayer player = ctx.getSource().getPlayerOrException();
DatabaseManager dm = DiamondUtils.getDatabaseManager();
DatabaseManager dm = CelestianUtils.getDatabaseManager();
int currencyCount = 0;
for (int i = DiamondEconomyConfig.getCurrencyValues().length - 1; i >= 0; i--) {
for (int i = CelestianEconomyConfig.getCurrencyValues().length - 1; i >= 0; i--) {
for (int j = 0; j < player.getInventory().getContainerSize(); j++) {
if (player.getInventory().getItem(j).getItem().equals(DiamondEconomyConfig.getCurrency(i))) {
currencyCount += player.getInventory().getItem(j).getCount() * DiamondEconomyConfig.getCurrencyValues()[i];
if (player.getInventory().getItem(j).getItem().equals(CelestianEconomyConfig.getCurrency(i))) {
currencyCount += player.getInventory().getItem(j).getCount() * CelestianEconomyConfig.getCurrencyValues()[i];
player.getInventory().setItem(j, new ItemStack(Items.AIR));
}
}
@@ -35,7 +35,7 @@ public class DepositCommand {
String output = "Added $" + currencyCount + " to your account";
ctx.getSource().sendSuccess(() -> Component.literal(output), false);
} else {
DiamondUtils.dropItem(currencyCount, player);
CelestianUtils.dropItem(currencyCount, player);
}
return 1;
}

16
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/ModifyCommand.java → src/main/java/com/smithy/celestianeconomy/command/ModifyCommand.java
View File

@@ -1,7 +1,7 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.mojang.brigadier.arguments.BoolArgumentType;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -17,8 +17,8 @@ import java.util.Collection;
public class ModifyCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().modifyCommandName)
.requires((permission) -> permission.hasPermission(DiamondEconomyConfig.getInstance().opCommandsPermissionLevel))
return Commands.literal(CelestianEconomyConfig.getInstance().modifyCommandName)
.requires((permission) -> permission.hasPermission(CelestianEconomyConfig.getInstance().opCommandsPermissionLevel))
.then(
Commands.argument("players", EntityArgument.players())
.then(
@@ -46,16 +46,16 @@ public class ModifyCommand {
}
public static int modifyCommand(CommandContext<CommandSourceStack> ctx, Collection<ServerPlayer> players, int amount) {
players.forEach(player -> ctx.getSource().sendSuccess(() -> Component.literal((DiamondUtils.getDatabaseManager().changeBalance(player.getStringUUID(), amount)) ? ("Modified " + players.size() + " players money by $" + amount) : ("That would go out of the valid money range for " + player.getName().getString())), true));
players.forEach(player -> ctx.getSource().sendSuccess(() -> Component.literal((CelestianUtils.getDatabaseManager().changeBalance(player.getStringUUID(), amount)) ? ("Modified " + players.size() + " players money by $" + amount) : ("That would go out of the valid money range for " + player.getName().getString())), true));
return players.size();
}
public static int modifyCommand(CommandContext<CommandSourceStack> ctx, int amount, boolean shouldModifyAll) throws CommandSyntaxException {
if (shouldModifyAll) {
DiamondUtils.getDatabaseManager().changeAllBalance(amount);
CelestianUtils.getDatabaseManager().changeAllBalance(amount);
ctx.getSource().sendSuccess(() -> Component.literal(("Modified everyones account by $" + amount)), true);
} else {
String output = (DiamondUtils.getDatabaseManager().changeBalance(ctx.getSource().getPlayerOrException().getStringUUID(), amount)) ? ("Modified your money by $" + amount) : ("That would go out of your valid money range");
String output = (CelestianUtils.getDatabaseManager().changeBalance(ctx.getSource().getPlayerOrException().getStringUUID(), amount)) ? ("Modified your money by $" + amount) : ("That would go out of your valid money range");
ctx.getSource().sendSuccess(() -> Component.literal(output), true);
}
return 1;

12
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/SendCommand.java → src/main/java/com/smithy/celestianeconomy/command/SendCommand.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
@@ -15,7 +15,7 @@ import net.minecraft.server.level.ServerPlayer;
public class SendCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().sendCommandName)
return Commands.literal(CelestianEconomyConfig.getInstance().sendCommandName)
.then(
Commands.argument("player", EntityArgument.player())
.then(
@@ -28,7 +28,7 @@ public class SendCommand {
}
public static int sendCommand(CommandContext<CommandSourceStack> ctx, ServerPlayer player, ServerPlayer player1, int amount) throws CommandSyntaxException {
DatabaseManager dm = DiamondUtils.getDatabaseManager();
DatabaseManager dm = CelestianUtils.getDatabaseManager();
long newValue = dm.getBalanceFromUUID(player.getStringUUID()) + amount;
if (newValue < Integer.MAX_VALUE && dm.changeBalance(player1.getStringUUID(), -amount)) {
dm.changeBalance(player.getStringUUID(), amount);

18
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/SetCommand.java → src/main/java/com/smithy/celestianeconomy/command/SetCommand.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.mojang.brigadier.arguments.BoolArgumentType;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -18,8 +18,8 @@ import java.util.Collection;
public class SetCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().setCommandName)
.requires((permission) -> permission.hasPermission(DiamondEconomyConfig.getInstance().opCommandsPermissionLevel))
return Commands.literal(CelestianEconomyConfig.getInstance().setCommandName)
.requires((permission) -> permission.hasPermission(CelestianEconomyConfig.getInstance().opCommandsPermissionLevel))
.then(
Commands.argument("players", EntityArgument.players())
.then(
@@ -47,7 +47,7 @@ public class SetCommand {
}
public static int setCommand(CommandContext<CommandSourceStack> ctx, Collection<ServerPlayer> players, int amount) {
DatabaseManager dm = DiamondUtils.getDatabaseManager();
DatabaseManager dm = CelestianUtils.getDatabaseManager();
players.forEach(player -> dm.setBalance(player.getStringUUID(), amount));
ctx.getSource().sendSuccess(() -> Component.literal("Updated balance of " + players.size() + " players to " + amount), true);
return players.size();
@@ -55,10 +55,10 @@ public class SetCommand {
public static int setCommand(CommandContext<CommandSourceStack> ctx, int amount, boolean shouldModifyAll) throws CommandSyntaxException {
if (shouldModifyAll) {
DiamondUtils.getDatabaseManager().setAllBalance(amount);
CelestianUtils.getDatabaseManager().setAllBalance(amount);
ctx.getSource().sendSuccess(() -> Component.literal("All accounts balance to " + amount), true);
} else {
DiamondUtils.getDatabaseManager().setBalance(ctx.getSource().getPlayerOrException().getStringUUID(), amount);
CelestianUtils.getDatabaseManager().setBalance(ctx.getSource().getPlayerOrException().getStringUUID(), amount);
ctx.getSource().sendSuccess(() -> Component.literal("Updated your balance to " + amount), true);
}
return 1;

12
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/TopCommand.java → src/main/java/com/smithy/celestianeconomy/command/TopCommand.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
@@ -13,7 +13,7 @@ import net.minecraft.network.chat.Component;
public class TopCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().topCommandName)
return Commands.literal(CelestianEconomyConfig.getInstance().topCommandName)
.then(
Commands.argument("page", IntegerArgumentType.integer(1))
.executes(e -> {
@@ -25,7 +25,7 @@ public class TopCommand {
}
public static int topCommand(CommandContext<CommandSourceStack> ctx, int page) throws CommandSyntaxException {
DatabaseManager dm = DiamondUtils.getDatabaseManager();
DatabaseManager dm = CelestianUtils.getDatabaseManager();
String output = dm.top(ctx.getSource().getPlayerOrException().getStringUUID(), page);
ctx.getSource().sendSuccess(() -> Component.literal(output), false);
return 1;

14
src/main/java/com/gmail/sneakdevs/diamondeconomy/command/WithdrawCommand.java → src/main/java/com/smithy/celestianeconomy/command/WithdrawCommand.java
View File

@@ -1,8 +1,8 @@
package com.gmail.sneakdevs.diamondeconomy.command;
package com.smithy.celestianeconomy.command;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
@@ -14,7 +14,7 @@ import net.minecraft.server.level.ServerPlayer;
public class WithdrawCommand {
public static LiteralArgumentBuilder<CommandSourceStack> buildCommand(){
return Commands.literal(DiamondEconomyConfig.getInstance().withdrawCommandName)
return Commands.literal(CelestianEconomyConfig.getInstance().withdrawCommandName)
.then(
Commands.argument("amount", IntegerArgumentType.integer(1))
.executes(e -> {
@@ -26,9 +26,9 @@ public class WithdrawCommand {
public static int withdrawCommand(CommandContext<CommandSourceStack> ctx, int amount) throws CommandSyntaxException {
ServerPlayer player = ctx.getSource().getPlayerOrException();
DatabaseManager dm = DiamondUtils.getDatabaseManager();
DatabaseManager dm = CelestianUtils.getDatabaseManager();
if (dm.changeBalance(player.getStringUUID(), -amount)) {
ctx.getSource().sendSuccess(() -> Component.literal("Withdrew $" + (amount - DiamondUtils.dropItem(amount, player))), false);
ctx.getSource().sendSuccess(() -> Component.literal("Withdrew $" + (amount - CelestianUtils.dropItem(amount, player))), false);
} else {
ctx.getSource().sendSuccess(() -> Component.literal("You have less than $" + amount), false);
}

28
src/main/java/com/gmail/sneakdevs/diamondeconomy/config/DiamondEconomyConfig.java → src/main/java/com/smithy/celestianeconomy/config/CelestianEconomyConfig.java
View File

@@ -1,6 +1,6 @@
package com.gmail.sneakdevs.diamondeconomy.config;
package com.smithy.celestianeconomy.config;
import com.gmail.sneakdevs.diamondeconomy.DiamondEconomy;
import com.smithy.celestianeconomy.CelestianEconomy;
import me.shedaniel.autoconfig.AutoConfig;
import me.shedaniel.autoconfig.ConfigData;
import me.shedaniel.autoconfig.annotation.Config;
@@ -12,20 +12,20 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
@Config(name = DiamondEconomy.MODID)
public class DiamondEconomyConfig implements ConfigData {
@Config(name = CelestianEconomy.MODID)
public class CelestianEconomyConfig implements ConfigData {
@Comment("List of items used as currency")
public String[] currencies = {"minecraft:diamond","minecraft:diamond_block"};
public String[] currencies = {"celestianeconomy:small_nothing","celestianeconomy:big_nothing"};
@Comment("Values of each currency in the same order, decimals not allowed (must be in ascending order unless greedyWithdraw is disabled)")
public int[] currencyValues = {1,9};
@Comment("Where the diamondeconomy.sqlite file is located (ex: \"C:/Users/example/Desktop/server/world/diamondeconomy.sqlite\")")
@Comment("Where the celestianeconomy.sqlite file is located (ex: \"C:/Users/example/Desktop/server/world/economy.sqlite\")")
public String fileLocation = null;
@Comment("Name of the base command (null to disable base command)")
public String commandName = "diamonds";
public String commandName = "celecon";
@Comment("Names of the subcommands (null to disable command)")
public String topCommandName = "top";
@@ -38,7 +38,7 @@ public class DiamondEconomyConfig implements ConfigData {
public String setCommandName = "set";
public String modifyCommandName = "modify";
@Comment("Try to withdraw items using the most high value items possible (ex. diamond blocks then diamonds) \n If disabled withdraw will give player the first item in the list")
@Comment("Try to withdraw items using the most high value items possible (ex. bigger notes then smaller) \n If disabled withdraw will give player the first item in the list")
public boolean greedyWithdraw = true;
@Comment("Money the player starts with when they first join the server")
@@ -50,22 +50,22 @@ public class DiamondEconomyConfig implements ConfigData {
@Comment("Amount of money to add each cycle")
public int moneyAddAmount = 0;
@Comment("Permission level (1-4) of the op commands in diamond economy. Set to 2 to allow command blocks to use these commands.")
@Comment("Permission level (1-4) of the op commands in celestian economy. Set to 2 to allow command blocks to use these commands.")
public int opCommandsPermissionLevel = 4;
public static Item getCurrency(int num) {
return BuiltInRegistries.ITEM.get(ResourceLocation.tryParse(DiamondEconomyConfig.getInstance().currencies[num]));
return BuiltInRegistries.ITEM.get(ResourceLocation.tryParse(CelestianEconomyConfig.getInstance().currencies[num]));
}
public static String getCurrencyName(int num) {
return BuiltInRegistries.ITEM.get(ResourceLocation.tryParse(DiamondEconomyConfig.getInstance().currencies[num])).getDescription().getString();
return BuiltInRegistries.ITEM.get(ResourceLocation.tryParse(CelestianEconomyConfig.getInstance().currencies[num])).getDescription().getString();
}
public static int[] getCurrencyValues() {
return DiamondEconomyConfig.getInstance().currencyValues;
return CelestianEconomyConfig.getInstance().currencyValues;
}
public static DiamondEconomyConfig getInstance() {
return AutoConfig.getConfigHolder(DiamondEconomyConfig.class).getConfig();
public static CelestianEconomyConfig getInstance() {
return AutoConfig.getConfigHolder(CelestianEconomyConfig.class).getConfig();
}
}

12
src/main/java/com/gmail/sneakdevs/diamondeconomy/mixin/PlayerListMixin_DiamondEconomy.java → src/main/java/com/smithy/celestianeconomy/mixin/PlayerListMixin_CelestianEconomy.java
View File

@@ -1,7 +1,7 @@
package com.gmail.sneakdevs.diamondeconomy.mixin;
package com.smithy.celestianeconomy.mixin;
import com.gmail.sneakdevs.diamondeconomy.DiamondUtils;
import com.gmail.sneakdevs.diamondeconomy.sql.DatabaseManager;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.sql.DatabaseManager;
import net.minecraft.network.Connection;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.players.PlayerList;
@@ -11,10 +11,10 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(PlayerList.class)
public class PlayerListMixin_DiamondEconomy {
public class PlayerListMixin_CelestianEconomy {
@Inject(method = "placeNewPlayer", at = @At("TAIL"))
private void diamondeconomy_onPlayerConnectMixin(Connection connection, ServerPlayer serverPlayer, CallbackInfo ci) {
DatabaseManager dm = DiamondUtils.getDatabaseManager();
private void celestianeconomy_onPlayerConnectMixin(Connection connection, ServerPlayer serverPlayer, CallbackInfo ci) {
DatabaseManager dm = CelestianUtils.getDatabaseManager();
String uuid = serverPlayer.getStringUUID();
String name = serverPlayer.getName().getString();
dm.addPlayer(uuid, name);

23
src/main/java/com/smithy/celestianeconomy/mixin/ServerPlayerMixin.java Normal file
View File

@@ -0,0 +1,23 @@
package com.smithy.celestianeconomy.mixin;
import com.smithy.celestianeconomy.CelestianUtils;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.stats.Stats;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ServerPlayer.class)
public class ServerPlayerMixin {
@Inject(method = "tick", at = @At("TAIL"))
private void celestianeconomy_tickMixin(CallbackInfo ci) {
if (CelestianEconomyConfig.getInstance().moneyAddAmount != 0 && CelestianEconomyConfig.getInstance().moneyAddTimer > 0) {
int playTime = ((ServerPlayer)(Object)this).getStats().getValue(Stats.CUSTOM.get(Stats.PLAY_TIME));
if (playTime > 0 && playTime % (CelestianEconomyConfig.getInstance().moneyAddTimer * 20) == 0) {
CelestianUtils.getDatabaseManager().changeBalance(((ServerPlayer)(Object)this).getStringUUID(), CelestianEconomyConfig.getInstance().moneyAddAmount);
}
}
}
}

2
src/main/java/com/gmail/sneakdevs/diamondeconomy/sql/DatabaseManager.java → src/main/java/com/smithy/celestianeconomy/sql/DatabaseManager.java
View File

@@ -1,4 +1,4 @@
package com.gmail.sneakdevs.diamondeconomy.sql;
package com.smithy.celestianeconomy.sql;
import java.io.File;

36
src/main/java/com/gmail/sneakdevs/diamondeconomy/sql/SQLiteDatabaseManager.java → src/main/java/com/smithy/celestianeconomy/sql/SQLiteDatabaseManager.java
View File

@@ -1,7 +1,7 @@
package com.gmail.sneakdevs.diamondeconomy.sql;
package com.smithy.celestianeconomy.sql;
import com.gmail.sneakdevs.diamondeconomy.DiamondEconomy;
import com.gmail.sneakdevs.diamondeconomy.config.DiamondEconomyConfig;
import com.smithy.celestianeconomy.CelestianEconomy;
import com.smithy.celestianeconomy.config.CelestianEconomyConfig;
import java.io.File;
import java.sql.*;
@@ -34,7 +34,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
private static void createNewTable() {
try (Connection conn = DriverManager.getConnection(url); Statement stmt = conn.createStatement()) {
for (String query : DiamondEconomy.tableRegistry) {
for (String query : CelestianEconomy.tableRegistry) {
stmt.execute(query);
}
} catch (SQLException e) {
@@ -43,12 +43,12 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public void addPlayer(String uuid, String name) {
String sql = "INSERT INTO diamonds(uuid,name,money) VALUES(?,?,?)";
String sql = "INSERT INTO currency(uuid,name,money) VALUES(?,?,?)";
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)){
pstmt.setString(1, uuid);
pstmt.setString(2, name);
pstmt.setInt(3, DiamondEconomyConfig.getInstance().startingMoney);
pstmt.setInt(3, CelestianEconomyConfig.getInstance().startingMoney);
pstmt.executeUpdate();
} catch (SQLException e) {
updateName(uuid, name);
@@ -56,7 +56,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public void updateName(String uuid, String name) {
String sql = "UPDATE diamonds SET name = ? WHERE uuid = ?";
String sql = "UPDATE currency SET name = ? WHERE uuid = ?";
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)) {
pstmt.setString(1, name);
@@ -68,7 +68,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public void setName(String uuid, String name) {
String sql = "UPDATE diamonds SET name = ? WHERE uuid != ? AND name = ?";
String sql = "UPDATE currency SET name = ? WHERE uuid != ? AND name = ?";
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)) {
pstmt.setString(1, "a");
@@ -81,7 +81,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public int getBalanceFromUUID(String uuid){
String sql = "SELECT uuid, money FROM diamonds WHERE uuid = '" + uuid + "'";
String sql = "SELECT uuid, money FROM currency WHERE uuid = '" + uuid + "'";
try (Connection conn = this.connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(sql)){
rs.next();
@@ -93,7 +93,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public String getNameFromUUID(String uuid){
String sql = "SELECT uuid, name FROM diamonds WHERE uuid = '" + uuid + "'";
String sql = "SELECT uuid, name FROM currency WHERE uuid = '" + uuid + "'";
try (Connection conn = this.connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(sql)){
rs.next();
@@ -105,7 +105,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public int getBalanceFromName(String name){
String sql = "SELECT name, money FROM diamonds WHERE name = '" + name + "'";
String sql = "SELECT name, money FROM currency WHERE name = '" + name + "'";
try (Connection conn = this.connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(sql)){
rs.next();
@@ -117,7 +117,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public boolean setBalance(String uuid, int money) {
String sql = "UPDATE diamonds SET money = ? WHERE uuid = ?";
String sql = "UPDATE currency SET money = ? WHERE uuid = ?";
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)) {
if (money >= 0 && money < Integer.MAX_VALUE) {
@@ -133,7 +133,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public void setAllBalance(int money) {
String sql = "UPDATE diamonds SET money = ?";
String sql = "UPDATE currency SET money = ?";
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)) {
if (money >= 0 && money < Integer.MAX_VALUE) {
@@ -146,7 +146,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public boolean changeBalance(String uuid, int money) {
String sql = "UPDATE diamonds SET money = ? WHERE uuid = ?";
String sql = "UPDATE currency SET money = ? WHERE uuid = ?";
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)) {
int bal = getBalanceFromUUID(uuid);
@@ -163,7 +163,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public void changeAllBalance(int money) {
String sql = "UPDATE diamonds SET money = money + " + money + " WHERE " + Integer.MAX_VALUE + " > money + " + money + " AND 0 <= money + " + money;
String sql = "UPDATE currency SET money = money + " + money + " WHERE " + Integer.MAX_VALUE + " > money + " + money + " AND 0 <= money + " + money;
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql)) {
pstmt.executeUpdate();
@@ -173,7 +173,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public String top(String uuid, int page){
String sql = "SELECT uuid, name, money FROM diamonds ORDER BY money DESC";
String sql = "SELECT uuid, name, money FROM curency ORDER BY money DESC";
String rankings = "";
int i = 0;
int playerRank = 0;
@@ -201,7 +201,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
public String rank(int rank){
int repeats = 0;
String sql = "SELECT name FROM diamonds ORDER BY money DESC";
String sql = "SELECT name FROM currency ORDER BY money DESC";
try (Connection conn = this.connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(sql)){
while (rs.next() ) {
repeats++;
@@ -216,7 +216,7 @@ public class SQLiteDatabaseManager implements DatabaseManager {
}
public int playerRank(String uuid){
String sql = "SELECT uuid FROM diamonds ORDER BY money DESC";
String sql = "SELECT uuid FROM currency ORDER BY money DESC";
int repeats = 1;
try (Connection conn = this.connect(); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(sql)){

16
src/main/resources/assets/celestianeconomy/blockstates/big_nothing.json Normal file
View File

@@ -0,0 +1,16 @@
{
"variants": {
"axis=y": {
"model": "celestianeconomy:block/big_nothing"
},
"axis=z": {
"model": "celestianeconomy:block/big_nothing",
"x": 90
},
"axis=x": {
"model": "celestianeconomy:block/big_nothing",
"x": 90,
"y": 90
}
}
}

0
src/main/resources/assets.diamondeconomy/icon.png → src/main/resources/assets/celestianeconomy/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

4
src/main/resources/assets/celestianeconomy/lang/en_us.json Normal file
View File

@@ -0,0 +1,4 @@
{
"item.celestianeconomy.small_nothing": "Nothing Note",
"block.celestianeconomy.big_nothing": "Block of Nothing Notes"
}

7
src/main/resources/assets/celestianeconomy/models/block/big_nothing.json Normal file
View File

@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "celestianeconomy:block/big_nothing_top",
"side": "celestianeconomy:block/big_nothing"
}
}

7
src/main/resources/assets/celestianeconomy/models/block/big_nothing_horizontal.json Normal file
View File

@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "celestianeconomy:block/big_nothing_top",
"side": "celestianeconomy:block/big_nothing"
}
}

3
src/main/resources/assets/celestianeconomy/models/item/big_nothing.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "celestianeconomy:block/big_nothing"
}

6
src/main/resources/assets/celestianeconomy/models/item/small_nothing.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "celestianeconomy:item/small_nothing"
}
}

BIN
src/main/resources/assets/celestianeconomy/textures/block/big_nothing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/main/resources/assets/celestianeconomy/textures/block/big_nothing_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 946 B

BIN
src/main/resources/assets/celestianeconomy/textures/item/small_nothing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

4
src/main/resources/diamondeconomy.mixins.json → src/main/resources/celestianeconomy.mixins.json
View File

@@ -1,10 +1,10 @@
{
"required": true,
"minVersion": "0.8",
"package": "com.gmail.sneakdevs.diamondeconomy.mixin",
"package": "com.smithy.celestianeconomy.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"PlayerListMixin_DiamondEconomy",
"PlayerListMixin_CelestianEconomy",
"ServerPlayerMixin"
],
"injectors": {

12
src/main/resources/fabric.mod.json
View File

@@ -1,12 +1,12 @@
{
"schemaVersion": 1,
"id": "diamondeconomy",
"id": "celestianeconomy",
"version": "${version}",
"name": "Diamond Economy",
"description": "Serverside economy mod with diamonds",
"name": "CelestianEconomy",
"description": "celestia economy mod",
"authors": [
"IAmSneak"
"Gæmer"
],
"contact": {
"homepage": "",
@@ -18,11 +18,11 @@
"environment": "*",
"entrypoints": {
"main": [
"com.gmail.sneakdevs.diamondeconomy.DiamondEconomy"
"com.smithy.celestianeconomy.CelestianEconomy"
]
},
"mixins": [
"diamondeconomy.mixins.json"
"celestianeconomy.mixins.json"
],
"depends": {
"fabricloader": ">=0.7.4",