Initial toggle state is on instead of off

ChaoticTrials · Dec 23, 2024 · 8eb0115 · 8eb0115
1 parent 4ea1f3c
commit 8eb0115
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 58 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -20,8 +20,8 @@ group=de.melanx
 base_version=6.0
 
 ## Upload Properties
-upload_versions=1.21, 1.21.1
-upload_release=beta
+upload_versions=1.21, 1.21.1, 1.21.2, 1.21.3, 1.21.4
+upload_release=release
 modrinth_project=L9JLNLqk
 curse_project=361977
 

diff --git a/src/main/java/de/melanx/toolswap/handler/ToggleState.java b/src/main/java/de/melanx/toolswap/handler/ToggleState.java
@@ -31,6 +31,12 @@ public static ToggleState initialize() {
 
     private void load() {
         try {
+            if (Files.notExists(SWAP_STATE_FILE)) {
+                Files.writeString(SWAP_STATE_FILE, "true");
+                this.shouldSwapTools = true;
+                return;
+            }
+
             String s = Files.readString(SWAP_STATE_FILE);
             this.shouldSwapTools = Boolean.parseBoolean(s);
         } catch (IOException e) {

diff --git a/src/main/java/de/melanx/toolswap/helper/ToolEntry.java b/src/main/java/de/melanx/toolswap/helper/ToolEntry.java
@@ -1,46 +1,14 @@
 package de.melanx.toolswap.helper;
 
-import de.melanx.toolswap.ToolSwap;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Tier;
-import net.minecraft.world.item.TieredItem;
 import net.minecraft.world.item.component.Tool;
-import net.minecraft.world.level.block.Block;
-
-import javax.annotation.Nullable;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 public record ToolEntry(Tool tool, ItemStack stack) {
 
-    private static final Set<TieredItem> LOGGED_ITEMS = new HashSet<>();
-    private static final Set<TagKey<Block>> LOGGED_TAGS = new HashSet<>();
-
-    private static final Map<TagKey<Block>, Integer> HARVEST_LEVELS = Map.of(
-            BlockTags.INCORRECT_FOR_WOODEN_TOOL, 0,
-            BlockTags.INCORRECT_FOR_STONE_TOOL, 1,
-            BlockTags.INCORRECT_FOR_IRON_TOOL, 2,
-            BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 3,
-            BlockTags.INCORRECT_FOR_GOLD_TOOL, 0,
-            BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 4
-    );
-
     public Tool getTool() {
         return this.tool;
     }
 
-    public ItemStack getStack() {
-        return this.stack;
-    }
-
-    @Nullable
-    public TieredItem tieredItem() {
-        return this.stack.getItem() instanceof TieredItem tieredItem ? tieredItem : null;
-    }
-
     public boolean isEnchanted() {
         return this.stack.isEnchanted();
     }
@@ -49,30 +17,6 @@ public int damagePerBlock() {
         return this.tool.damagePerBlock();
     }
 
-    public int getHarvestLevel() {
-        TieredItem item = this.tieredItem();
-        if (item == null) {
-            return 0;
-        }
-        Tier tier = item.getTier();
-        TagKey<Block> incorrectBlocksForDrops = tier.getIncorrectBlocksForDrops();
-        Integer harvestLevel = HARVEST_LEVELS.get(incorrectBlocksForDrops);
-        if (harvestLevel == null) {
-            if (LOGGED_ITEMS.add(item) || LOGGED_TAGS.add(incorrectBlocksForDrops)) {
-                ToolSwap.LOGGER.info("Please notify the author of this. Missing tag compat of item {}: {}", item, incorrectBlocksForDrops);
-            }
-
-            return 0;
-        }
-
-        return harvestLevel;
-    }
-
-    public float getEfficiency() {
-        TieredItem item = this.tieredItem();
-        return item != null ? item.getTier().getSpeed() : 0.0F;
-    }
-
     @Override
     public String toString() {
         return this.stack.toString();