Bugfix
This commit is contained in:
@@ -6,7 +6,7 @@ minecraft_version=1.21.1
|
|||||||
yarn_mappings=1.21.1+build.3
|
yarn_mappings=1.21.1+build.3
|
||||||
loader_version=0.16.2
|
loader_version=0.16.2
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=1.3
|
mod_version=1.3.1
|
||||||
maven_group=systems.brn
|
maven_group=systems.brn
|
||||||
archives_base_name=servershop
|
archives_base_name=servershop
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
@@ -6,8 +6,6 @@ import net.minecraft.item.ItemStack;
|
|||||||
import net.minecraft.server.command.ServerCommandSource;
|
import net.minecraft.server.command.ServerCommandSource;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import systems.brn.servershop.ServerShop;
|
|
||||||
import systems.brn.servershop.lib.storages.AuctionStorage;
|
|
||||||
import systems.brn.servershop.screens.AuctionBrowserScreen;
|
import systems.brn.servershop.screens.AuctionBrowserScreen;
|
||||||
import systems.brn.servershop.screens.AuctionCreateScreen;
|
import systems.brn.servershop.screens.AuctionCreateScreen;
|
||||||
|
|
||||||
|
@@ -7,7 +7,6 @@ import net.minecraft.server.command.ServerCommandSource;
|
|||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
import static systems.brn.servershop.ServerShop.auctionStorage;
|
|
||||||
import static systems.brn.servershop.ServerShop.balanceStorage;
|
import static systems.brn.servershop.ServerShop.balanceStorage;
|
||||||
|
|
||||||
public class BalanceCommand {
|
public class BalanceCommand {
|
||||||
|
@@ -10,16 +10,12 @@ import net.minecraft.server.world.ServerWorld;
|
|||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.WorldSavePath;
|
import net.minecraft.util.WorldSavePath;
|
||||||
import systems.brn.servershop.lib.records.AuctionRecord;
|
import systems.brn.servershop.lib.records.AuctionRecord;
|
||||||
import systems.brn.servershop.lib.records.ItemPriceRecord;
|
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
|
|
||||||
import static systems.brn.servershop.ServerShop.balanceStorage;
|
import static systems.brn.servershop.ServerShop.balanceStorage;
|
||||||
import static systems.brn.servershop.ServerShop.priceStorage;
|
|
||||||
import static systems.brn.servershop.lib.Util.*;
|
import static systems.brn.servershop.lib.Util.*;
|
||||||
|
|
||||||
public class AuctionStorage {
|
public class AuctionStorage {
|
||||||
|
@@ -7,7 +7,6 @@ import net.minecraft.text.Text;
|
|||||||
import net.minecraft.util.WorldSavePath;
|
import net.minecraft.util.WorldSavePath;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
@@ -100,7 +99,6 @@ public class BalanceStorage {
|
|||||||
NbtCompound root = NbtIo.read(balanceStorageFile.toPath());
|
NbtCompound root = NbtIo.read(balanceStorageFile.toPath());
|
||||||
if (root != null) {
|
if (root != null) {
|
||||||
NbtList nbtList = root.getList("Balances", 10);
|
NbtList nbtList = root.getList("Balances", 10);
|
||||||
|
|
||||||
for (NbtElement element : nbtList) {
|
for (NbtElement element : nbtList) {
|
||||||
if (element instanceof NbtCompound nbt) {
|
if (element instanceof NbtCompound nbt) {
|
||||||
UUID uuid = nbt.getUuid("UUID");
|
UUID uuid = nbt.getUuid("UUID");
|
||||||
@@ -110,17 +108,18 @@ public class BalanceStorage {
|
|||||||
}
|
}
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
return true;
|
return true;
|
||||||
|
} else {
|
||||||
|
lock.unlock();
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} catch (
|
} catch (
|
||||||
IOException ignored) {
|
IOException ignored) {
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
lock.unlock();
|
|
||||||
} else {
|
} else {
|
||||||
return loadLegacy();
|
return loadLegacy();
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean loadLegacy() {
|
public boolean loadLegacy() {
|
||||||
|
@@ -12,7 +12,6 @@ import net.minecraft.util.WorldSavePath;
|
|||||||
import systems.brn.servershop.lib.records.ItemPriceRecord;
|
import systems.brn.servershop.lib.records.ItemPriceRecord;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
@@ -130,12 +129,11 @@ public class PriceStorage {
|
|||||||
NbtIo.write(nbtCompound, dos);
|
NbtIo.write(nbtCompound, dos);
|
||||||
dos.close();
|
dos.close();
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
|
return true;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
lock.unlock();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -12,16 +12,10 @@ import net.minecraft.util.Formatting;
|
|||||||
import systems.brn.servershop.ServerShop;
|
import systems.brn.servershop.ServerShop;
|
||||||
import systems.brn.servershop.lib.PagedGui;
|
import systems.brn.servershop.lib.PagedGui;
|
||||||
import systems.brn.servershop.lib.records.AuctionRecord;
|
import systems.brn.servershop.lib.records.AuctionRecord;
|
||||||
import systems.brn.servershop.lib.records.ItemPriceRecord;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static systems.brn.servershop.lib.ShopFunctions.buy;
|
|
||||||
import static systems.brn.servershop.lib.ShopFunctions.sell;
|
|
||||||
import static systems.brn.servershop.lib.Util.addPrices;
|
import static systems.brn.servershop.lib.Util.addPrices;
|
||||||
import static systems.brn.servershop.lib.Util.removePrices;
|
|
||||||
|
|
||||||
public class AuctionBrowserScreen extends PagedGui {
|
public class AuctionBrowserScreen extends PagedGui {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user