Port to 1.21 (#699)

* Fabric port + datapack

* Forge & NeoForge

README.md

@@ -27,5 +27,6 @@ Check out the [wiki](https://github.com/Rakambda/FallingTree/wiki) for some more
 
 * For Fabric users, **Fabric API** is required.
 * For Neoforge/Forge users, **Cloth Config API** is optional on the client and allows you to have a config GUI in game.
+  Starting Minecraft 1.21, enchantments needs to be added separately through a datapack [available here](https://modrinth.com/datapack/fallingtree-enchantments).
 
 NOTE: On servers this mod can be server-side only, client isn't required (except if you use the change speed feature and/or enchants configurations).

common/src/main/java/fr/rakambda/fallingtree/common/FallingTreeCommon.java

@@ -1,35 +1,32 @@
 package fr.rakambda.fallingtree.common;
 
 import fr.rakambda.fallingtree.common.command.ToggleCommand;
-import fr.rakambda.fallingtree.common.leaf.LeafBreakingHandler;
-import fr.rakambda.fallingtree.common.tree.TreeHandler;
-import fr.rakambda.fallingtree.common.tree.TreePartType;
-import fr.rakambda.fallingtree.common.tree.builder.TreeBuilder;
-import fr.rakambda.fallingtree.common.wrapper.IBlock;
-import fr.rakambda.fallingtree.common.wrapper.IBlockState;
-import fr.rakambda.fallingtree.common.wrapper.IComponent;
-import fr.rakambda.fallingtree.common.wrapper.IItem;
-import fr.rakambda.fallingtree.common.wrapper.ILevel;
 import fr.rakambda.fallingtree.common.config.IConfiguration;
 import fr.rakambda.fallingtree.common.config.IToolConfiguration;
 import fr.rakambda.fallingtree.common.config.proxy.ProxyConfiguration;
 import fr.rakambda.fallingtree.common.config.real.Configuration;
+import fr.rakambda.fallingtree.common.leaf.LeafBreakingHandler;
 import fr.rakambda.fallingtree.common.network.PacketUtils;
 import fr.rakambda.fallingtree.common.network.ServerPacketHandler;
+import fr.rakambda.fallingtree.common.tree.TreeHandler;
+import fr.rakambda.fallingtree.common.tree.TreePartType;
+import fr.rakambda.fallingtree.common.tree.builder.TreeBuilder;
 import fr.rakambda.fallingtree.common.wrapper.DirectionCompat;
+import fr.rakambda.fallingtree.common.wrapper.IBlock;
 import fr.rakambda.fallingtree.common.wrapper.IBlockPos;
-import fr.rakambda.fallingtree.common.wrapper.IEnchantment;
+import fr.rakambda.fallingtree.common.wrapper.IBlockState;
+import fr.rakambda.fallingtree.common.wrapper.IComponent;
+import fr.rakambda.fallingtree.common.wrapper.IItem;
 import fr.rakambda.fallingtree.common.wrapper.IItemStack;
+import fr.rakambda.fallingtree.common.wrapper.ILevel;
 import fr.rakambda.fallingtree.common.wrapper.IPlayer;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
-
 import static java.util.stream.Collectors.toSet;
 
 @RequiredArgsConstructor
@@ -121,7 +118,7 @@ public boolean canPlayerBreakTree(@NotNull IPlayer player) {
         }
 
         if (getConfiguration().getEnchantment().isRequireEnchantment()
-                && !heldItemStack.hasOneOfEnchantAtLeast(getChopperEnchantments(), 1)) {
+                && !heldItemStack.hasChopperEnchant()) {
             return false;
         }
 
@@ -234,25 +231,6 @@ public TreePartType getTreePart(@NotNull IBlock checkBlock) {
 
     public abstract boolean checkCanBreakBlock(@NotNull ILevel level, @NotNull IBlockPos blockPos, @NotNull IBlockState blockState, @NotNull IPlayer player);
 
-    public void registerEnchant() {
-        if (getConfiguration().getEnchantment().isRegisterEnchant()) {
-            performDefaultEnchantRegister();
-        }
-        if (getConfiguration().getEnchantment().isRegisterSpecificEnchant()) {
-            performSpecificEnchantRegister();
-        }
-        performCommitEnchantRegister();
-    }
-
-    protected abstract void performDefaultEnchantRegister();
-
-    protected abstract void performSpecificEnchantRegister();
-
-    protected abstract void performCommitEnchantRegister();
-
-    @NotNull
-    public abstract Collection<IEnchantment> getChopperEnchantments();
-
     @NotNull
     public abstract IItemStack getEmptyItemStack();
 }

common/src/main/java/fr/rakambda/fallingtree/common/config/IEnchantmentConfiguration.java

@@ -1,11 +1,5 @@
 package fr.rakambda.fallingtree.common.config;
 
 public interface IEnchantmentConfiguration{
-	boolean isRegisterEnchant();
-
-	boolean isRegisterSpecificEnchant();
-
 	boolean isRequireEnchantment();
-
-	boolean isHideEnchant();
 }

common/src/main/java/fr/rakambda/fallingtree/common/config/real/EnchantmentConfiguration.java

@@ -6,12 +6,6 @@
 
 @Data
 public class EnchantmentConfiguration implements IEnchantmentConfiguration{
-	@Expose
-	private boolean registerEnchant = false;
-	@Expose
-	private boolean registerSpecificEnchant = false;
-	@Expose
-	private boolean hideEnchant = false;
 	@Expose
 	private boolean requireEnchantment = false;
 }

common/src/main/java/fr/rakambda/fallingtree/common/tree/TreeHandler.java

@@ -1,12 +1,15 @@
 package fr.rakambda.fallingtree.common.tree;
 
-import fr.rakambda.fallingtree.common.tree.breaking.*;
-import fr.rakambda.fallingtree.common.tree.builder.TreeTooBigException;
 import fr.rakambda.fallingtree.common.FallingTreeCommon;
 import fr.rakambda.fallingtree.common.config.enums.BreakMode;
+import fr.rakambda.fallingtree.common.tree.breaking.BreakTreeTooBigException;
+import fr.rakambda.fallingtree.common.tree.breaking.FallingAnimationTreeBreakingHandler;
+import fr.rakambda.fallingtree.common.tree.breaking.ITreeBreakingHandler;
+import fr.rakambda.fallingtree.common.tree.breaking.InstantaneousTreeBreakingHandler;
+import fr.rakambda.fallingtree.common.tree.breaking.ShiftDownTreeBreakingHandler;
+import fr.rakambda.fallingtree.common.tree.builder.TreeTooBigException;
 import fr.rakambda.fallingtree.common.utils.CacheSpeed;
 import fr.rakambda.fallingtree.common.wrapper.IBlockPos;
-import fr.rakambda.fallingtree.common.wrapper.IEnchantment;
 import fr.rakambda.fallingtree.common.wrapper.IItemStack;
 import fr.rakambda.fallingtree.common.wrapper.ILevel;
 import fr.rakambda.fallingtree.common.wrapper.IPlayer;
@@ -68,8 +71,7 @@ public IBreakAttemptResult breakTree(@NotNull ILevel level, @NotNull IPlayer pla
 
 	@NotNull
 	private BreakMode getBreakMode(@NotNull IItemStack itemStack){
-		return itemStack.getAnyEnchant(mod.getChopperEnchantments())
-				.flatMap(IEnchantment::getBreakMode)
+		return itemStack.getBreakModeFromEnchant()
 				.orElseGet(() -> mod.getConfiguration().getTrees().getBreakMode());
 	}
 

common/src/main/java/fr/rakambda/fallingtree/common/wrapper/IItemStack.java

@@ -1,8 +1,7 @@
 package fr.rakambda.fallingtree.common.wrapper;
 
+import fr.rakambda.fallingtree.common.config.enums.BreakMode;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import java.util.Collection;
 import java.util.Optional;
 
 public interface IItemStack extends IWrapper{
@@ -19,12 +18,10 @@ public interface IItemStack extends IWrapper{
 	@NotNull
 	IItem getItem();
 
-	int getEnchantLevel(@Nullable IEnchantment enchantment);
-
-	boolean hasOneOfEnchantAtLeast(@NotNull Collection<IEnchantment> enchantments, int minLevel);
+	boolean hasChopperEnchant();
 
 	@NotNull
-	Optional<IEnchantment> getAnyEnchant(@NotNull Collection<IEnchantment> enchantments);
+	Optional<BreakMode> getBreakModeFromEnchant();
 
 	boolean canPerformAxeAction();
 }

datapack/data/fallingtree/enchantment/tools/chopper.json

@@ -0,0 +1,32 @@
+{
+  "anvil_cost": 6,
+  "description": {
+    "translate": "enchantment.fallingtree.chopper",
+    "fallback": "Chopper"
+  },
+  "effects": {
+    "minecraft:block_experience": [
+      {
+        "effect": {
+          "type": "minecraft:set",
+          "value": 0
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 65,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 15,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "exclusive_set": "#fallingtree:exclusive_set/chopper",
+  "supported_items": "#minecraft:enchantable/mining_loot",
+  "weight": 1
+}

datapack/data/fallingtree/enchantment/tools/chopper_fall_all_block.json

@@ -0,0 +1,32 @@
+{
+  "anvil_cost": 6,
+  "description": {
+    "translate": "enchantment.fallingtree.chopper_fall_all_block",
+    "fallback": "Chopper (fall all block)"
+  },
+  "effects": {
+    "minecraft:block_experience": [
+      {
+        "effect": {
+          "type": "minecraft:set",
+          "value": 0
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 65,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 15,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "exclusive_set": "#fallingtree:exclusive_set/chopper",
+  "supported_items": "#minecraft:enchantable/mining_loot",
+  "weight": 1
+}

datapack/data/fallingtree/enchantment/tools/chopper_fall_block.json

@@ -0,0 +1,32 @@
+{
+  "anvil_cost": 6,
+  "description": {
+    "translate": "enchantment.fallingtree.chopper_fall_block",
+    "fallback": "Chopper (fall block)"
+  },
+  "effects": {
+    "minecraft:block_experience": [
+      {
+        "effect": {
+          "type": "minecraft:set",
+          "value": 0
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 65,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 15,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "exclusive_set": "#fallingtree:exclusive_set/chopper",
+  "supported_items": "#minecraft:enchantable/mining_loot",
+  "weight": 1
+}

datapack/data/fallingtree/enchantment/tools/chopper_fall_item.json

@@ -0,0 +1,32 @@
+{
+  "anvil_cost": 6,
+  "description": {
+    "translate": "enchantment.fallingtree.chopper_fall_item",
+    "fallback": "Chopper (fall item)"
+  },
+  "effects": {
+    "minecraft:block_experience": [
+      {
+        "effect": {
+          "type": "minecraft:set",
+          "value": 0
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 65,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 15,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "exclusive_set": "#fallingtree:exclusive_set/chopper",
+  "supported_items": "#minecraft:enchantable/mining_loot",
+  "weight": 1
+}

datapack/data/fallingtree/enchantment/tools/chopper_instantaneous.json

@@ -0,0 +1,32 @@
+{
+  "anvil_cost": 6,
+  "description": {
+    "translate": "enchantment.fallingtree.chopper_instantaneous",
+    "fallback": "Chopper (instantaneous)"
+  },
+  "effects": {
+    "minecraft:block_experience": [
+      {
+        "effect": {
+          "type": "minecraft:set",
+          "value": 0
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 65,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 15,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "exclusive_set": "#fallingtree:exclusive_set/chopper",
+  "supported_items": "#minecraft:enchantable/mining_loot",
+  "weight": 1
+}

datapack/data/fallingtree/enchantment/tools/chopper_shift_down.json

@@ -0,0 +1,32 @@
+{
+  "anvil_cost": 6,
+  "description": {
+    "translate": "enchantment.fallingtree.chopper_shift_down",
+    "fallback": "Chopper (shift down)"
+  },
+  "effects": {
+    "minecraft:block_experience": [
+      {
+        "effect": {
+          "type": "minecraft:set",
+          "value": 0
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 65,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 15,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "exclusive_set": "#fallingtree:exclusive_set/chopper",
+  "supported_items": "#minecraft:enchantable/mining_loot",
+  "weight": 1
+}

datapack/data/fallingtree/tags/enchantment/chopper_all.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "fallingtree:tools/chopper",
+    "fallingtree:tools/chopper_fall_all_block",
+    "fallingtree:tools/chopper_fall_block",
+    "fallingtree:tools/chopper_fall_item",
+    "fallingtree:tools/chopper_instantaneous",
+    "fallingtree:tools/chopper_shift_down"
+  ]
+}

datapack/data/fallingtree/tags/enchantment/chopper_fall_all_block.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "fallingtree:tools/chopper_fall_all_block"
+  ]
+}

datapack/data/fallingtree/tags/enchantment/chopper_fall_block.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "fallingtree:tools/chopper_fall_block"
+  ]
+}