Merge pull request #13 from Snownee/master

misc
TeamCovertDragon · Feb 15, 2018 · 36d4346 · 36d4346
2 parents c8814d2 + 00c1a4e
commit 36d4346
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/team/covertdragon/springfestival/module/material/ModuleMaterial.java b/src/main/java/team/covertdragon/springfestival/module/material/ModuleMaterial.java
@@ -43,7 +43,7 @@ public void onItemRegister(RegistryEvent.Register<Item> event) {
         event.getRegistry().registerAll(
                 new ItemSeeds(MaterialRegistry.GLUTINOUS_RICE_CROP, Blocks.DIRT)
                         .setCreativeTab(SpringFestivalConstants.CREATIVE_TAB)
-                        .setUnlocalizedName(SpringFestivalConstants.MOD_ID + ".glutinous_rice")
+                        .setUnlocalizedName(SpringFestivalConstants.MOD_ID + ".glutinous_rice_seed")
                         .setRegistryName(SpringFestivalConstants.MOD_ID, "glutinous_rice_seed"),
                 new Item()
                         .setCreativeTab(SpringFestivalConstants.CREATIVE_TAB)
@@ -59,6 +59,6 @@ public void onItemRegister(RegistryEvent.Register<Item> event) {
 
     @SubscribeEvent
     public void onBlockRegister(RegistryEvent.Register<Block> event) {
-        event.getRegistry().register(new BlockGlutinousRice().setRegistryName("springfestival:glutinous_rice_crop"));
+        event.getRegistry().register(new BlockGlutinousRice().setRegistryName(SpringFestivalConstants.MOD_ID, "glutinous_rice_crop"));
     }
 }
diff --git a/src/main/resources/assets/springfestival/lang/zh_cn.lang b/src/main/resources/assets/springfestival/lang/zh_cn.lang
@@ -20,6 +20,11 @@ tile.springfestival.firework_box.name=礼炮
 tile.springfestival.large_red_pillar.name=大红柱
 tile.springfestival.large_red_pillar_alt.name=大红柱
 
+entity.springfestival.firecracker.name=爆竹
+
+subtitle.springfestival.firecracker.throw=爆竹：投掷
+subtitle.springfestival.firecracker.explode=爆竹：爆炸
+
 redpacket.owner=红包主人：%s
 redpacket.receiver=%s将会收到这个红包
 redpacket.receiver.any=所有人都