Просмотр исходного кода

重命名为 Blacksmith: Rebirth

LTCatt 6 лет назад
Родитель
Сommit
e970868ea0
62 измененных файлов с 149 добавлено и 139 удалено
  1. 8 0
      .idea/modules.xml
  2. 6 6
      build.gradle
  3. 4 4
      src/main/java/com/hexdragon/blacksmithre/BlacksmithRe.java
  4. 2 2
      src/main/java/com/hexdragon/blacksmithre/Main.java
  5. 2 2
      src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilContainerRe.java
  6. 1 1
      src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilRenderer.java
  7. 2 2
      src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilScreenRe.java
  8. 3 3
      src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilTileEntity.java
  9. 2 2
      src/main/java/com/hexdragon/blacksmithre/block/anvil/NetheriteAnvil.java
  10. 2 2
      src/main/java/com/hexdragon/blacksmithre/block/grindstone/GrindstoneContainerRe.java
  11. 2 2
      src/main/java/com/hexdragon/blacksmithre/block/grindstone/GrindstoneScreenRe.java
  12. 2 1
      src/main/java/com/hexdragon/blacksmithre/enchantment/DecayCurseEnchantment.java
  13. 2 2
      src/main/java/com/hexdragon/blacksmithre/item/name_tag/NameTagPacket.java
  14. 2 2
      src/main/java/com/hexdragon/blacksmithre/item/name_tag/NameTagRenameRecipe.java
  15. 2 2
      src/main/java/com/hexdragon/blacksmithre/item/name_tag/NameTagScreen.java
  16. 1 1
      src/main/java/com/hexdragon/blacksmithre/mixin/RepairItemRecipeMixin.java
  17. 5 4
      src/main/java/com/hexdragon/blacksmithre/mixin/block/AnvilBlockMixin.java
  18. 2 2
      src/main/java/com/hexdragon/blacksmithre/mixin/block/GrindstoneBlockMixin.java
  19. 2 2
      src/main/java/com/hexdragon/blacksmithre/mixin/item/NameTagItemMixin.java
  20. 6 6
      src/main/java/com/hexdragon/blacksmithre/registry/RegClient.java
  21. 8 8
      src/main/java/com/hexdragon/blacksmithre/registry/RegMain.java
  22. 1 1
      src/main/java/com/hexdragon/corere/network/PacketRe.java
  23. 1 1
      src/main/resources/META-INF/MANIFEST.MF
  24. 4 4
      src/main/resources/META-INF/mods.toml
  25. 4 4
      src/main/resources/assets/blacksmithre/blockstates/chipped_netherite_anvil.json
  26. 4 4
      src/main/resources/assets/blacksmithre/blockstates/damaged_netherite_anvil.json
  27. 4 4
      src/main/resources/assets/blacksmithre/blockstates/netherite_anvil.json
  28. 10 0
      src/main/resources/assets/blacksmithre/lang/zh_CN.json
  29. 6 0
      src/main/resources/assets/blacksmithre/models/block/chipped_netherite_anvil.json
  30. 6 0
      src/main/resources/assets/blacksmithre/models/block/damaged_netherite_anvil.json
  31. 6 0
      src/main/resources/assets/blacksmithre/models/block/netherite_anvil.json
  32. 2 2
      src/main/resources/assets/blacksmithre/models/block/template_netherite_anvil.json
  33. 3 0
      src/main/resources/assets/blacksmithre/models/item/chipped_netherite_anvil.json
  34. 3 0
      src/main/resources/assets/blacksmithre/models/item/damaged_netherite_anvil.json
  35. 3 0
      src/main/resources/assets/blacksmithre/models/item/netherite_anvil.json
  36. 0 0
      src/main/resources/assets/blacksmithre/textures/block/chipped_netherite_anvil_top.png
  37. 0 0
      src/main/resources/assets/blacksmithre/textures/block/damaged_netherite_anvil_top.png
  38. 0 0
      src/main/resources/assets/blacksmithre/textures/block/netherite_anvil.png
  39. 0 0
      src/main/resources/assets/blacksmithre/textures/block/netherite_anvil_top.png
  40. 0 0
      src/main/resources/assets/blacksmithre/textures/gui/container/anvil.png
  41. 0 0
      src/main/resources/assets/blacksmithre/textures/gui/container/grindstone.png
  42. 0 0
      src/main/resources/assets/blacksmithre/textures/gui/name_tag.png
  43. 0 10
      src/main/resources/assets/enchrebirth/lang/zh_CN.json
  44. 0 6
      src/main/resources/assets/enchrebirth/models/block/chipped_netherite_anvil.json
  45. 0 6
      src/main/resources/assets/enchrebirth/models/block/damaged_netherite_anvil.json
  46. 0 6
      src/main/resources/assets/enchrebirth/models/block/netherite_anvil.json
  47. 0 3
      src/main/resources/assets/enchrebirth/models/item/chipped_netherite_anvil.json
  48. 0 3
      src/main/resources/assets/enchrebirth/models/item/damaged_netherite_anvil.json
  49. 0 3
      src/main/resources/assets/enchrebirth/models/item/netherite_anvil.json
  50. 4 4
      src/main/resources/assets/minecraft/blockstates/anvil.json
  51. 4 4
      src/main/resources/assets/minecraft/blockstates/chipped_anvil.json
  52. 4 4
      src/main/resources/assets/minecraft/blockstates/damaged_anvil.json
  53. 1 1
      src/main/resources/data/blacksmithre/loot_tables/blocks/chipped_netherite_anvil.txt
  54. 1 1
      src/main/resources/data/blacksmithre/loot_tables/blocks/damaged_netherite_anvil.txt
  55. 1 1
      src/main/resources/data/blacksmithre/loot_tables/blocks/netherite_anvil.txt
  56. 0 0
      src/main/resources/data/blacksmithre/recipes/name_tag.json
  57. 3 0
      src/main/resources/data/blacksmithre/recipes/name_tag_rename.json
  58. 1 1
      src/main/resources/data/blacksmithre/recipes/netherite_anvil.json
  59. 0 3
      src/main/resources/data/enchrebirth/recipes/name_tag_rename.json
  60. 3 3
      src/main/resources/data/minecraft/tags/blocks/anvil.json
  61. 3 3
      src/main/resources/data/minecraft/tags/items/anvil.json
  62. 1 1
      src/main/resources/mixins.blacksmithre.json

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Blacksmith Rebirth.iml" filepath="$PROJECT_DIR$/.idea/Blacksmith Rebirth.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 6
build.gradle

@@ -14,8 +14,8 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
 version = '1.0'
-group = 'com.hexdragon.ench' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'enchrebirth'
+group = 'com.hexdragon.blacksmithre' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = 'blacksmithre'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
@@ -76,7 +76,7 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'enchrebirth', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--mod', 'blacksmithre', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
                 examplemod {
@@ -120,12 +120,12 @@ dependencies {
 jar {
     manifest {
         attributes([
-            "Specification-Title": "enchrebirth",
-            "Specification-Vendor": "enchrebirthv",
+            "Specification-Title": "blacksmithre",
+            "Specification-Vendor": "blacksmithrev",
             "Specification-Version": "1", // We are version 1 of ourselves
             "Implementation-Title": project.name,
             "Implementation-Version": "${version}",
-            "Implementation-Vendor" :"enchrebirthv",
+            "Implementation-Vendor" :"blacksmithrev",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }

+ 4 - 4
src/main/java/com/hexdragon/enchrebirth/EnchRebirth.java → src/main/java/com/hexdragon/blacksmithre/BlacksmithRe.java

@@ -1,13 +1,13 @@
-package com.hexdragon.enchrebirth;
+package com.hexdragon.blacksmithre;
 
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 @Mod(Main.MODID)
-public class EnchRebirth {
-    public EnchRebirth() {
+public class BlacksmithRe {
+    public BlacksmithRe() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
         RegMain.RECIPES.register(modEventBus);
         RegMain.BLOCKS.register(modEventBus);

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/Main.java → src/main/java/com/hexdragon/blacksmithre/Main.java

@@ -1,11 +1,11 @@
-package com.hexdragon.enchrebirth;
+package com.hexdragon.blacksmithre;
 
 import net.minecraft.tileentity.TileEntity;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class Main {
-    public static final String MODID = "enchrebirth";
+    public static final String MODID = "blacksmithre";
     public static final Logger LOGGER = LogManager.getLogger();
     public static TileEntity LastTileEntity = null;
 }

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/block/anvil/AnvilContainerRe.java → src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilContainerRe.java

@@ -1,8 +1,8 @@
-package com.hexdragon.enchrebirth.block.anvil;
+package com.hexdragon.blacksmithre.block.anvil;
 
 import com.hexdragon.corere.item.EnchantmentHelperRe;
 import com.hexdragon.corere.item.ItemHelperRe;
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraft.block.AnvilBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.enchantment.Enchantment;

+ 1 - 1
src/main/java/com/hexdragon/enchrebirth/block/anvil/AnvilRenderer.java → src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilRenderer.java

@@ -1,4 +1,4 @@
-package com.hexdragon.enchrebirth.block.anvil;
+package com.hexdragon.blacksmithre.block.anvil;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.block.AnvilBlock;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/block/anvil/AnvilScreenRe.java → src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilScreenRe.java

@@ -1,7 +1,7 @@
-package com.hexdragon.enchrebirth.block.anvil;
+package com.hexdragon.blacksmithre.block.anvil;
 
 import com.hexdragon.corere.renderer.ItemRendererRe;
-import com.hexdragon.enchrebirth.Main;
+import com.hexdragon.blacksmithre.Main;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;

+ 3 - 3
src/main/java/com/hexdragon/enchrebirth/block/anvil/AnvilTileEntity.java → src/main/java/com/hexdragon/blacksmithre/block/anvil/AnvilTileEntity.java

@@ -1,7 +1,7 @@
-package com.hexdragon.enchrebirth.block.anvil;
+package com.hexdragon.blacksmithre.block.anvil;
 
-import com.hexdragon.enchrebirth.Main;
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.Main;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraft.block.AnvilBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerInventory;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/block/anvil/NetheriteAnvil.java → src/main/java/com/hexdragon/blacksmithre/block/anvil/NetheriteAnvil.java

@@ -1,6 +1,6 @@
-package com.hexdragon.enchrebirth.block.anvil;
+package com.hexdragon.blacksmithre.block.anvil;
 
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.AnvilBlock;
 import net.minecraft.block.Block;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/block/grindstone/GrindstoneContainerRe.java → src/main/java/com/hexdragon/blacksmithre/block/grindstone/GrindstoneContainerRe.java

@@ -1,9 +1,9 @@
-package com.hexdragon.enchrebirth.block.grindstone;
+package com.hexdragon.blacksmithre.block.grindstone;
 
 import com.hexdragon.corere.item.CraftResultInventoryRe;
 import com.hexdragon.corere.item.EnchantmentHelperRe;
 import com.hexdragon.corere.item.ItemHelperRe;
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraft.block.Blocks;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/block/grindstone/GrindstoneScreenRe.java → src/main/java/com/hexdragon/blacksmithre/block/grindstone/GrindstoneScreenRe.java

@@ -1,7 +1,7 @@
-package com.hexdragon.enchrebirth.block.grindstone;
+package com.hexdragon.blacksmithre.block.grindstone;
 
 import com.hexdragon.corere.renderer.ItemRendererRe;
-import com.hexdragon.enchrebirth.Main;
+import com.hexdragon.blacksmithre.Main;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.entity.player.PlayerInventory;

+ 2 - 1
src/main/java/com/hexdragon/enchrebirth/enchantment/DecayCurseEnchantment.java → src/main/java/com/hexdragon/blacksmithre/enchantment/DecayCurseEnchantment.java

@@ -1,4 +1,4 @@
-package com.hexdragon.enchrebirth.enchantment;
+package com.hexdragon.blacksmithre.enchantment;
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentType;
@@ -8,6 +8,7 @@ import net.minecraft.inventory.EquipmentSlotType;
 // TODO : 让腐朽诅咒可以作用于经验修补附魔,和物品合并的合成配方(Mixin 大概不够用了,这可能需要写一个新的 RepairItemRecipe;代码可以直接抄铁砧的)
 // TODO : 削弱经验修补附魔:每点经验值恢复 1 点耐久而不是 2 点
 // TODO : 修改耐久附魔:每次使用时消耗耐久度的概率降至 100%/(1+0.5*等级) ,这让盔甲上的耐久附魔变得更强,但让普通物品上的耐久附魔变得更弱了
+// TODO : <验证> 腐朽诅咒是否确实会在游戏中自然出现?
 public class DecayCurseEnchantment extends Enchantment {
     public DecayCurseEnchantment() {super(Rarity.VERY_RARE, EnchantmentType.BREAKABLE, new EquipmentSlotType[]{EquipmentSlotType.MAINHAND});}
 

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/item/name_tag/NameTagPacket.java → src/main/java/com/hexdragon/blacksmithre/item/name_tag/NameTagPacket.java

@@ -1,7 +1,7 @@
-package com.hexdragon.enchrebirth.item.name_tag;
+package com.hexdragon.blacksmithre.item.name_tag;
 
 import com.hexdragon.corere.network.PacketRe;
-import com.hexdragon.enchrebirth.Main;
+import com.hexdragon.blacksmithre.Main;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/item/name_tag/NameTagRenameRecipe.java → src/main/java/com/hexdragon/blacksmithre/item/name_tag/NameTagRenameRecipe.java

@@ -1,6 +1,6 @@
-package com.hexdragon.enchrebirth.item.name_tag;
+package com.hexdragon.blacksmithre.item.name_tag;
 
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/item/name_tag/NameTagScreen.java → src/main/java/com/hexdragon/blacksmithre/item/name_tag/NameTagScreen.java

@@ -1,7 +1,7 @@
-package com.hexdragon.enchrebirth.item.name_tag;
+package com.hexdragon.blacksmithre.item.name_tag;
 
 import com.hexdragon.corere.renderer.ItemRendererRe;
-import com.hexdragon.enchrebirth.Main;
+import com.hexdragon.blacksmithre.Main;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.TextFieldWidget;

+ 1 - 1
src/main/java/com/hexdragon/enchrebirth/mixin/RepairItemRecipeMixin.java → src/main/java/com/hexdragon/blacksmithre/mixin/RepairItemRecipeMixin.java

@@ -1,4 +1,4 @@
-package com.hexdragon.enchrebirth.mixin;
+package com.hexdragon.blacksmithre.mixin;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.RepairItemRecipe;

+ 5 - 4
src/main/java/com/hexdragon/enchrebirth/mixin/block/AnvilBlockMixin.java → src/main/java/com/hexdragon/blacksmithre/mixin/block/AnvilBlockMixin.java

@@ -1,7 +1,7 @@
-package com.hexdragon.enchrebirth.mixin.block;
+package com.hexdragon.blacksmithre.mixin.block;
 
-import com.hexdragon.enchrebirth.block.anvil.AnvilTileEntity;
-import com.hexdragon.enchrebirth.registry.RegMain;
+import com.hexdragon.blacksmithre.block.anvil.AnvilTileEntity;
+import com.hexdragon.blacksmithre.registry.RegMain;
 import net.minecraft.block.*;
 import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.inventory.container.INamedContainerProvider;
@@ -97,7 +97,8 @@ public abstract class AnvilBlockMixin extends FallingBlock implements IForgeBloc
         }
     }
 
-    // TODO : <重要> 破坏下界合金砧没有掉落物(加了 LootTable 也没啥用)
+    // TODO : <验证> 多个玩家同时打开物品栏是否有刷物品 Bug 的可能?
+    // TODO : 破坏下界合金砧没有掉落物(加了 LootTable 也没啥用)
     // TODO : [010] 绘制下界合金砧的材质(也可以修改原版铁砧的材质以让它有更大的区分度?)
 
 }

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/mixin/block/GrindstoneBlockMixin.java → src/main/java/com/hexdragon/blacksmithre/mixin/block/GrindstoneBlockMixin.java

@@ -1,6 +1,6 @@
-package com.hexdragon.enchrebirth.mixin.block;
+package com.hexdragon.blacksmithre.mixin.block;
 
-import com.hexdragon.enchrebirth.block.grindstone.GrindstoneContainerRe;
+import com.hexdragon.blacksmithre.block.grindstone.GrindstoneContainerRe;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.GrindstoneBlock;
 import net.minecraft.block.HorizontalFaceBlock;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/mixin/item/NameTagItemMixin.java → src/main/java/com/hexdragon/blacksmithre/mixin/item/NameTagItemMixin.java

@@ -1,6 +1,6 @@
-package com.hexdragon.enchrebirth.mixin.item;
+package com.hexdragon.blacksmithre.mixin.item;
 
-import com.hexdragon.enchrebirth.item.name_tag.NameTagScreen;
+import com.hexdragon.blacksmithre.item.name_tag.NameTagScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;

+ 6 - 6
src/main/java/com/hexdragon/enchrebirth/registry/RegClient.java → src/main/java/com/hexdragon/blacksmithre/registry/RegClient.java

@@ -1,11 +1,11 @@
-package com.hexdragon.enchrebirth.registry;
+package com.hexdragon.blacksmithre.registry;
 
 import com.hexdragon.corere.network.PacketManagerRe;
-import com.hexdragon.enchrebirth.Main;
-import com.hexdragon.enchrebirth.block.anvil.AnvilRenderer;
-import com.hexdragon.enchrebirth.block.anvil.AnvilScreenRe;
-import com.hexdragon.enchrebirth.block.grindstone.GrindstoneScreenRe;
-import com.hexdragon.enchrebirth.item.name_tag.NameTagPacket;
+import com.hexdragon.blacksmithre.Main;
+import com.hexdragon.blacksmithre.block.anvil.AnvilRenderer;
+import com.hexdragon.blacksmithre.block.anvil.AnvilScreenRe;
+import com.hexdragon.blacksmithre.block.grindstone.GrindstoneScreenRe;
+import com.hexdragon.blacksmithre.item.name_tag.NameTagPacket;
 import net.minecraft.client.gui.ScreenManager;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

+ 8 - 8
src/main/java/com/hexdragon/enchrebirth/registry/RegMain.java → src/main/java/com/hexdragon/blacksmithre/registry/RegMain.java

@@ -1,12 +1,12 @@
-package com.hexdragon.enchrebirth.registry;
+package com.hexdragon.blacksmithre.registry;
 
-import com.hexdragon.enchrebirth.Main;
-import com.hexdragon.enchrebirth.block.anvil.AnvilContainerRe;
-import com.hexdragon.enchrebirth.block.anvil.AnvilTileEntity;
-import com.hexdragon.enchrebirth.block.anvil.NetheriteAnvil;
-import com.hexdragon.enchrebirth.block.grindstone.GrindstoneContainerRe;
-import com.hexdragon.enchrebirth.enchantment.DecayCurseEnchantment;
-import com.hexdragon.enchrebirth.item.name_tag.NameTagRenameRecipe;
+import com.hexdragon.blacksmithre.Main;
+import com.hexdragon.blacksmithre.block.anvil.AnvilContainerRe;
+import com.hexdragon.blacksmithre.block.anvil.AnvilTileEntity;
+import com.hexdragon.blacksmithre.block.anvil.NetheriteAnvil;
+import com.hexdragon.blacksmithre.block.grindstone.GrindstoneContainerRe;
+import com.hexdragon.blacksmithre.enchantment.DecayCurseEnchantment;
+import com.hexdragon.blacksmithre.item.name_tag.NameTagRenameRecipe;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.enchantment.Enchantment;

+ 1 - 1
src/main/java/com/hexdragon/corere/network/PacketRe.java

@@ -1,6 +1,6 @@
 package com.hexdragon.corere.network;
 
-import com.hexdragon.enchrebirth.Main;
+import com.hexdragon.blacksmithre.Main;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fml.network.NetworkDirection;

+ 1 - 1
src/main/resources/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 TweakClass: org.spongepowered.asm.launch.MixinTweaker
 TweakOrder: 0
-MixinConfigs: mixins.enchrebirth.json
+MixinConfigs: mixins.blacksmithre.json

+ 4 - 4
src/main/resources/META-INF/mods.toml

@@ -15,11 +15,11 @@ license = "All rights reserved" #mandatory
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
-modId = "enchrebirth" #mandatory
+modId = "blacksmithre" #mandatory
 # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
 version = "0.0.2.0" #mandatory
 # A display name for the mod
-displayName = "Enchanting Rebirth" #mandatory
+displayName = "Blacksmith: Rebirth" #mandatory
 # A URL to query for updates for this mod. See the JSON update specification <here>
 #updateJSONURL="http://myurl.me/" #optional
 # A URL for the "homepage" for this mod, displayed in the mod UI
@@ -35,7 +35,7 @@ description = '''
 by LTCat, 00ll00 and HerobrineXia
 '''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.enchrebirth]] #optional
+[[dependencies.blacksmithre]] #optional
 # the modid of the dependency
 modId = "forge" #mandatory
 # Does this dependency have to exist - if not, ordering below must be specified
@@ -47,7 +47,7 @@ ordering = "NONE"
 # Side this dependency is applied on - BOTH, CLIENT or SERVER
 side = "BOTH"
 # Here's another dependency
-[[dependencies.enchrebirth]]
+[[dependencies.blacksmithre]]
 modId = "minecraft"
 mandatory = true
 versionRange = "[1.16.3]"

+ 4 - 4
src/main/resources/assets/enchrebirth/blockstates/chipped_netherite_anvil.json → src/main/resources/assets/blacksmithre/blockstates/chipped_netherite_anvil.json

@@ -16,18 +16,18 @@
       "y": 90
     },
     "facing=east,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil",
+      "model": "blacksmithre:block/chipped_netherite_anvil",
       "y": 270
     },
     "facing=north,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil",
+      "model": "blacksmithre:block/chipped_netherite_anvil",
       "y": 180
     },
     "facing=south,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil"
+      "model": "blacksmithre:block/chipped_netherite_anvil"
     },
     "facing=west,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil",
+      "model": "blacksmithre:block/chipped_netherite_anvil",
       "y": 90
     }
   }

+ 4 - 4
src/main/resources/assets/enchrebirth/blockstates/damaged_netherite_anvil.json → src/main/resources/assets/blacksmithre/blockstates/damaged_netherite_anvil.json

@@ -16,18 +16,18 @@
       "y": 90
     },
     "facing=east,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil",
+      "model": "blacksmithre:block/damaged_netherite_anvil",
       "y": 270
     },
     "facing=north,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil",
+      "model": "blacksmithre:block/damaged_netherite_anvil",
       "y": 180
     },
     "facing=south,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil"
+      "model": "blacksmithre:block/damaged_netherite_anvil"
     },
     "facing=west,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil",
+      "model": "blacksmithre:block/damaged_netherite_anvil",
       "y": 90
     }
   }

+ 4 - 4
src/main/resources/assets/enchrebirth/blockstates/netherite_anvil.json → src/main/resources/assets/blacksmithre/blockstates/netherite_anvil.json

@@ -16,18 +16,18 @@
       "y": 90
     },
     "facing=east,material=1": {
-      "model": "enchrebirth:block/netherite_anvil",
+      "model": "blacksmithre:block/netherite_anvil",
       "y": 270
     },
     "facing=north,material=1": {
-      "model": "enchrebirth:block/netherite_anvil",
+      "model": "blacksmithre:block/netherite_anvil",
       "y": 180
     },
     "facing=south,material=1": {
-      "model": "enchrebirth:block/netherite_anvil"
+      "model": "blacksmithre:block/netherite_anvil"
     },
     "facing=west,material=1": {
-      "model": "enchrebirth:block/netherite_anvil",
+      "model": "blacksmithre:block/netherite_anvil",
       "y": 90
     }
   }

+ 10 - 0
src/main/resources/assets/blacksmithre/lang/zh_CN.json

@@ -0,0 +1,10 @@
+{
+  "gui.grindstone.title": "去除附魔",
+  "gui.anvil.title": "修复物品",
+  "gui.name_tag.title": "重命名",
+  "block.blacksmithre.netherite_anvil": "下界合金砧",
+  "block.blacksmithre.chipped_netherite_anvil": "开裂的下界合金砧",
+  "block.blacksmithre.damaged_netherite_anvil": "损坏的下界合金砧",
+  "enchantment.blacksmithre.decay_curse": "腐朽诅咒",
+  "enchantment.blacksmithre.decay_curse.desc": "让物品更难以被修复"
+}

+ 6 - 0
src/main/resources/assets/blacksmithre/models/block/chipped_netherite_anvil.json

@@ -0,0 +1,6 @@
+{
+  "parent": "blacksmithre:block/template_netherite_anvil",
+  "textures": {
+    "top": "blacksmithre:block/chipped_netherite_anvil_top"
+  }
+}

+ 6 - 0
src/main/resources/assets/blacksmithre/models/block/damaged_netherite_anvil.json

@@ -0,0 +1,6 @@
+{
+  "parent": "blacksmithre:block/template_netherite_anvil",
+  "textures": {
+    "top": "blacksmithre:block/damaged_netherite_anvil_top"
+  }
+}

+ 6 - 0
src/main/resources/assets/blacksmithre/models/block/netherite_anvil.json

@@ -0,0 +1,6 @@
+{
+  "parent": "blacksmithre:block/template_netherite_anvil",
+  "textures": {
+    "top": "blacksmithre:block/netherite_anvil_top"
+  }
+}

+ 2 - 2
src/main/resources/assets/enchrebirth/models/block/template_netherite_anvil.json → src/main/resources/assets/blacksmithre/models/block/template_netherite_anvil.json

@@ -1,8 +1,8 @@
 {
   "parent": "block/block",
   "textures": {
-    "particle": "enchrebirth:block/netherite_anvil",
-    "body": "enchrebirth:block/netherite_anvil"
+    "particle": "blacksmithre:block/netherite_anvil",
+    "body": "blacksmithre:block/netherite_anvil"
   },
   "display": {
     "fixed": {

+ 3 - 0
src/main/resources/assets/blacksmithre/models/item/chipped_netherite_anvil.json

@@ -0,0 +1,3 @@
+{
+  "parent": "blacksmithre:block/chipped_netherite_anvil"
+}

+ 3 - 0
src/main/resources/assets/blacksmithre/models/item/damaged_netherite_anvil.json

@@ -0,0 +1,3 @@
+{
+  "parent": "blacksmithre:block/damaged_netherite_anvil"
+}

+ 3 - 0
src/main/resources/assets/blacksmithre/models/item/netherite_anvil.json

@@ -0,0 +1,3 @@
+{
+  "parent": "blacksmithre:block/netherite_anvil"
+}

+ 0 - 0
src/main/resources/assets/enchrebirth/textures/block/chipped_netherite_anvil_top.png → src/main/resources/assets/blacksmithre/textures/block/chipped_netherite_anvil_top.png


+ 0 - 0
src/main/resources/assets/enchrebirth/textures/block/damaged_netherite_anvil_top.png → src/main/resources/assets/blacksmithre/textures/block/damaged_netherite_anvil_top.png


+ 0 - 0
src/main/resources/assets/enchrebirth/textures/block/netherite_anvil.png → src/main/resources/assets/blacksmithre/textures/block/netherite_anvil.png


+ 0 - 0
src/main/resources/assets/enchrebirth/textures/block/netherite_anvil_top.png → src/main/resources/assets/blacksmithre/textures/block/netherite_anvil_top.png


+ 0 - 0
src/main/resources/assets/enchrebirth/textures/gui/container/anvil.png → src/main/resources/assets/blacksmithre/textures/gui/container/anvil.png


+ 0 - 0
src/main/resources/assets/enchrebirth/textures/gui/container/grindstone.png → src/main/resources/assets/blacksmithre/textures/gui/container/grindstone.png


+ 0 - 0
src/main/resources/assets/enchrebirth/textures/gui/name_tag.png → src/main/resources/assets/blacksmithre/textures/gui/name_tag.png


+ 0 - 10
src/main/resources/assets/enchrebirth/lang/zh_CN.json

@@ -1,10 +0,0 @@
-{
-  "gui.grindstone.title": "去除附魔",
-  "gui.anvil.title": "修复物品",
-  "gui.name_tag.title": "重命名",
-  "block.enchrebirth.netherite_anvil": "下界合金砧",
-  "block.enchrebirth.chipped_netherite_anvil": "开裂的下界合金砧",
-  "block.enchrebirth.damaged_netherite_anvil": "损坏的下界合金砧",
-  "enchantment.enchrebirth.decay_curse": "腐朽诅咒",
-  "enchantment.enchrebirth.decay_curse.desc": "让物品更难以被修复"
-}

+ 0 - 6
src/main/resources/assets/enchrebirth/models/block/chipped_netherite_anvil.json

@@ -1,6 +0,0 @@
-{
-  "parent": "enchrebirth:block/template_netherite_anvil",
-  "textures": {
-    "top": "enchrebirth:block/chipped_netherite_anvil_top"
-  }
-}

+ 0 - 6
src/main/resources/assets/enchrebirth/models/block/damaged_netherite_anvil.json

@@ -1,6 +0,0 @@
-{
-  "parent": "enchrebirth:block/template_netherite_anvil",
-  "textures": {
-    "top": "enchrebirth:block/damaged_netherite_anvil_top"
-  }
-}

+ 0 - 6
src/main/resources/assets/enchrebirth/models/block/netherite_anvil.json

@@ -1,6 +0,0 @@
-{
-  "parent": "enchrebirth:block/template_netherite_anvil",
-  "textures": {
-    "top": "enchrebirth:block/netherite_anvil_top"
-  }
-}

+ 0 - 3
src/main/resources/assets/enchrebirth/models/item/chipped_netherite_anvil.json

@@ -1,3 +0,0 @@
-{
-  "parent": "enchrebirth:block/chipped_netherite_anvil"
-}

+ 0 - 3
src/main/resources/assets/enchrebirth/models/item/damaged_netherite_anvil.json

@@ -1,3 +0,0 @@
-{
-  "parent": "enchrebirth:block/damaged_netherite_anvil"
-}

+ 0 - 3
src/main/resources/assets/enchrebirth/models/item/netherite_anvil.json

@@ -1,3 +0,0 @@
-{
-  "parent": "enchrebirth:block/netherite_anvil"
-}

+ 4 - 4
src/main/resources/assets/minecraft/blockstates/anvil.json

@@ -16,18 +16,18 @@
       "y": 90
     },
     "facing=east,material=1": {
-      "model": "enchrebirth:block/netherite_anvil",
+      "model": "blacksmithre:block/netherite_anvil",
       "y": 270
     },
     "facing=north,material=1": {
-      "model": "enchrebirth:block/netherite_anvil",
+      "model": "blacksmithre:block/netherite_anvil",
       "y": 180
     },
     "facing=south,material=1": {
-      "model": "enchrebirth:block/netherite_anvil"
+      "model": "blacksmithre:block/netherite_anvil"
     },
     "facing=west,material=1": {
-      "model": "enchrebirth:block/netherite_anvil",
+      "model": "blacksmithre:block/netherite_anvil",
       "y": 90
     }
   }

+ 4 - 4
src/main/resources/assets/minecraft/blockstates/chipped_anvil.json

@@ -16,18 +16,18 @@
       "y": 90
     },
     "facing=east,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil",
+      "model": "blacksmithre:block/chipped_netherite_anvil",
       "y": 270
     },
     "facing=north,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil",
+      "model": "blacksmithre:block/chipped_netherite_anvil",
       "y": 180
     },
     "facing=south,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil"
+      "model": "blacksmithre:block/chipped_netherite_anvil"
     },
     "facing=west,material=1": {
-      "model": "enchrebirth:block/chipped_netherite_anvil",
+      "model": "blacksmithre:block/chipped_netherite_anvil",
       "y": 90
     }
   }

+ 4 - 4
src/main/resources/assets/minecraft/blockstates/damaged_anvil.json

@@ -16,18 +16,18 @@
       "y": 90
     },
     "facing=east,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil",
+      "model": "blacksmithre:block/damaged_netherite_anvil",
       "y": 270
     },
     "facing=north,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil",
+      "model": "blacksmithre:block/damaged_netherite_anvil",
       "y": 180
     },
     "facing=south,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil"
+      "model": "blacksmithre:block/damaged_netherite_anvil"
     },
     "facing=west,material=1": {
-      "model": "enchrebirth:block/damaged_netherite_anvil",
+      "model": "blacksmithre:block/damaged_netherite_anvil",
       "y": 90
     }
   }

+ 1 - 1
src/main/resources/data/enchrebirth/loot_tables/blocks/chipped_netherite_anvil.txt → src/main/resources/data/blacksmithre/loot_tables/blocks/chipped_netherite_anvil.txt

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "enchrebirth:chipped_netherite_anvil"
+          "name": "blacksmithre:chipped_netherite_anvil"
         }
       ],
       "conditions": [

+ 1 - 1
src/main/resources/data/enchrebirth/loot_tables/blocks/damaged_netherite_anvil.txt → src/main/resources/data/blacksmithre/loot_tables/blocks/damaged_netherite_anvil.txt

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "enchrebirth:damaged_netherite_anvil"
+          "name": "blacksmithre:damaged_netherite_anvil"
         }
       ],
       "conditions": [

+ 1 - 1
src/main/resources/data/enchrebirth/loot_tables/blocks/netherite_anvil.txt → src/main/resources/data/blacksmithre/loot_tables/blocks/netherite_anvil.txt

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "enchrebirth:netherite_anvil"
+          "name": "blacksmithre:netherite_anvil"
         }
       ],
       "conditions": [

+ 0 - 0
src/main/resources/data/enchrebirth/recipes/name_tag.json → src/main/resources/data/blacksmithre/recipes/name_tag.json


+ 3 - 0
src/main/resources/data/blacksmithre/recipes/name_tag_rename.json

@@ -0,0 +1,3 @@
+{
+  "type": "blacksmithre:name_tag_rename"
+}

+ 1 - 1
src/main/resources/data/enchrebirth/recipes/netherite_anvil.json → src/main/resources/data/blacksmithre/recipes/netherite_anvil.json

@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "enchrebirth:netherite_anvil",
+    "item": "blacksmithre:netherite_anvil",
     "count": 1
   }
 }

+ 0 - 3
src/main/resources/data/enchrebirth/recipes/name_tag_rename.json

@@ -1,3 +0,0 @@
-{
-  "type": "enchrebirth:name_tag_rename"
-}

+ 3 - 3
src/main/resources/data/minecraft/tags/blocks/anvil.json

@@ -1,8 +1,8 @@
 {
   "replace": false,
   "values": [
-    "enchrebirth:netherite_anvil",
-    "enchrebirth:chipped_netherite_anvil",
-    "enchrebirth:damaged_netherite_anvil"
+    "blacksmithre:netherite_anvil",
+    "blacksmithre:chipped_netherite_anvil",
+    "blacksmithre:damaged_netherite_anvil"
   ]
 }

+ 3 - 3
src/main/resources/data/minecraft/tags/items/anvil.json

@@ -1,8 +1,8 @@
 {
   "replace": false,
   "values": [
-    "enchrebirth:netherite_anvil",
-    "enchrebirth:chipped_netherite_anvil",
-    "enchrebirth:damaged_netherite_anvil"
+    "blacksmithre:netherite_anvil",
+    "blacksmithre:chipped_netherite_anvil",
+    "blacksmithre:damaged_netherite_anvil"
   ]
 }

+ 1 - 1
src/main/resources/mixins.enchrebirth.json → src/main/resources/mixins.blacksmithre.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "com.hexdragon.enchrebirth.mixin",
+  "package": "com.hexdragon.blacksmithre.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "RepairItemRecipeMixin",