aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker
diff options
context:
space:
mode:
authorFix3d <serhanduzce@gmail.com>2023-04-16 05:39:40 +0300
committerFix3d <serhanduzce@gmail.com>2023-04-16 05:39:40 +0300
commit21b64be8d85d37e107ffd628416031e0839c9990 (patch)
tree75095d0b149c0d821bc9b096a228f40f17b8e2ba /src/main/java/me/xmrvizzy/skyblocker
parentd7a62f213b0bddae9b1cc925b7626b8f4cb25823 (diff)
downloadSkyblocker-21b64be8d85d37e107ffd628416031e0839c9990.tar.gz
Skyblocker-21b64be8d85d37e107ffd628416031e0839c9990.tar.bz2
Skyblocker-21b64be8d85d37e107ffd628416031e0839c9990.zip
add update repository command
"/skyblocker updaterepository"
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java18
2 files changed, 9 insertions, 11 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
index 3d713727..f17ab1fb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
@@ -4,6 +4,7 @@ import me.xmrvizzy.skyblocker.chat.ChatMessageListener;
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
import me.xmrvizzy.skyblocker.discord.DiscordRPCManager;
import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock;
+import me.xmrvizzy.skyblocker.skyblock.api.RepositoryUpdate;
import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand;
import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
@@ -20,6 +21,7 @@ public class SkyblockerInitializer implements ClientModInitializer {
PriceInfoTooltip.init();
WikiLookup.init();
ItemRegistry.init();
+ RepositoryUpdate.init();
StatsCommand.init();
DwarvenHud.init();
ChatMessageListener.init();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java
index ea7184cc..91a59fcb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java
@@ -22,15 +22,15 @@ import java.util.concurrent.CompletableFuture;
public class ItemRegistry {
private static final Logger LOGGER = LoggerFactory.getLogger(ItemRegistry.class);
protected static final String REMOTE_ITEM_REPO = "https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO";
- protected static final Path LOCAL_ITEM_REPO_DIR = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/item-repo");
+ public static final Path LOCAL_ITEM_REPO_DIR = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/item-repo");
- private static final Path ITEM_LIST_DIR = LOCAL_ITEM_REPO_DIR.resolve("items");
+ protected static final Path ITEM_LIST_DIR = LOCAL_ITEM_REPO_DIR.resolve("items");
protected static final List<ItemStack> items = new ArrayList<>();
protected static final Map<String, ItemStack> itemsMap = new HashMap<>();
protected static final List<Recipe> recipes = new ArrayList<>();
- protected static final MinecraftClient client = MinecraftClient.getInstance();
- static boolean filesImported = false;
+ public static final MinecraftClient client = MinecraftClient.getInstance();
+ public static boolean filesImported = false;
public static void init() {
CompletableFuture.runAsync(ItemRegistry::updateItemRepo)
@@ -46,20 +46,16 @@ public class ItemRegistry {
}
private static void updateItemRepo() {
+ Git git;
if (!Files.isDirectory(LOCAL_ITEM_REPO_DIR)) {
try {
- Git.cloneRepository()
+ git = Git.cloneRepository()
.setURI(REMOTE_ITEM_REPO)
.setDirectory(LOCAL_ITEM_REPO_DIR.toFile())
.setBranchesToClone(List.of("refs/heads/master"))
.setBranch("refs/heads/master")
.call();
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else {
- try {
- Git.open(LOCAL_ITEM_REPO_DIR.toFile()).pull().call();
+ git.close();
} catch (Exception e) {
e.printStackTrace();
}