-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Anvil-Dev:releases/1.20.1' into releases/1.20.1
- Loading branch information
Showing
41 changed files
with
752 additions
and
284 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 7 additions & 1 deletion
8
common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/OtherLang.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
common/src/main/java/dev/dubhe/anvilcraft/item/AmethystAxeItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package dev.dubhe.anvilcraft.item; | ||
|
|
||
| import dev.dubhe.anvilcraft.init.ModEnchantments; | ||
| import net.minecraft.world.item.AxeItem; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class AmethystAxeItem extends AxeItem { | ||
| public AmethystAxeItem(Properties properties) { | ||
| super(ModTiers.AMETHYST, 7, -3.2f, properties); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ItemStack getDefaultInstance() { | ||
| ItemStack stack = super.getDefaultInstance(); | ||
| stack.enchant(ModEnchantments.FELLING.get(), 1); | ||
| return stack; | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
common/src/main/java/dev/dubhe/anvilcraft/item/AmethystHoeItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package dev.dubhe.anvilcraft.item; | ||
|
|
||
| import dev.dubhe.anvilcraft.init.ModEnchantments; | ||
| import net.minecraft.world.item.HoeItem; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class AmethystHoeItem extends HoeItem { | ||
| public AmethystHoeItem(Properties properties) { | ||
| super(ModTiers.AMETHYST, -1, -2.0f, properties); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ItemStack getDefaultInstance() { | ||
| ItemStack stack = super.getDefaultInstance(); | ||
| stack.enchant(ModEnchantments.HARVEST.get(), 1); | ||
| return stack; | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
common/src/main/java/dev/dubhe/anvilcraft/item/AmethystPickaxeItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package dev.dubhe.anvilcraft.item; | ||
|
|
||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.PickaxeItem; | ||
| import net.minecraft.world.item.enchantment.Enchantments; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class AmethystPickaxeItem extends PickaxeItem { | ||
| public AmethystPickaxeItem(Properties properties) { | ||
| super(ModTiers.AMETHYST, 1, -2.8f, properties); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ItemStack getDefaultInstance() { | ||
| ItemStack stack = super.getDefaultInstance(); | ||
| stack.enchant(Enchantments.BLOCK_FORTUNE, 3); | ||
| return stack; | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
common/src/main/java/dev/dubhe/anvilcraft/item/AmethystShovelItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package dev.dubhe.anvilcraft.item; | ||
|
|
||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.ShovelItem; | ||
| import net.minecraft.world.item.enchantment.Enchantments; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class AmethystShovelItem extends ShovelItem { | ||
| public AmethystShovelItem(Properties properties) { | ||
| super(ModTiers.AMETHYST, 1.5f, -3.0f, properties); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ItemStack getDefaultInstance() { | ||
| ItemStack stack = super.getDefaultInstance(); | ||
| stack.enchant(Enchantments.BLOCK_EFFICIENCY, 3); | ||
| return stack; | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
common/src/main/java/dev/dubhe/anvilcraft/item/AmethystSwordItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package dev.dubhe.anvilcraft.item; | ||
|
|
||
| import dev.dubhe.anvilcraft.init.ModEnchantments; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.SwordItem; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class AmethystSwordItem extends SwordItem { | ||
| public AmethystSwordItem(Properties properties) { | ||
| super(ModTiers.AMETHYST, 3, -2.4f, properties); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ItemStack getDefaultInstance() { | ||
| ItemStack stack = super.getDefaultInstance(); | ||
| stack.enchant(ModEnchantments.BEHEADING.get(), 1); | ||
| return stack; | ||
| } | ||
| } |
Oops, something went wrong.