Bug fix and better zh_cn translation

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
     branches: [ '1.12' ]
   pull_request:
     branches: [ '1.12' ]
+  workflow_dispatch:
 
 jobs:
   build:
@@ -20,10 +21,15 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
     - name: Build with Gradle
-      run: ./gradlew build
+      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
+      with:
+        arguments: build
+
     - name: Upload build
       uses: actions/upload-artifact@v3
       with:

build.gradle

@@ -24,6 +24,10 @@ repositories {
         name = "JEI"
         url = "https://dvs1.progwml6.com/files/maven/"
     }
+    maven {
+        name = 'Modrinth'
+        url = "https://api.modrinth.com/maven"
+    }
 }
 
 minecraft {
@@ -39,7 +43,7 @@ dependencies {
     deobfProvided "mezz.jei:jei_${mc_version}:${jei_version}:api"
     runtime "mezz.jei:jei_${mc_version}:${jei_version}"
 
-    compile fileTree(dir:"libs",includes:['*jar'])
+    compile 'maven.modrinth:kekkai:1.2.1'
 }
 
 processResources {

gradle.properties

@@ -1,5 +1,5 @@
-goa_version=3.0.0
+goa_version=3.0.1
 mc_version=1.12.2
 forge_version=14.23.5.2768
 jei_version=4.11.0.206
-dancore_version=0.8.0
+dancore_version=0.8.0

src/main/java/arekkuusu/grimoireofalice/common/item/ItemMiracleMallet.java

@@ -26,6 +26,7 @@ public class ItemMiracleMallet extends ItemBase  {
 	public ItemMiracleMallet() {
 		super(LibName.MIRACLE_MALLET);
 		setNoRepair();
+		setMaxStackSize(1);
 	}
 
 	@Override

src/main/java/arekkuusu/grimoireofalice/common/item/ItemMomijisScimitarSword.java

@@ -17,21 +17,21 @@
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 
-public class ItemMomijisScimitarSword extends ItemBaseSword  {
+public class ItemMomijisScimitarSword extends ItemBaseSword {
 
-	public ItemMomijisScimitarSword(ToolMaterial material) {
-		super(material, LibName.MOMIJI_SCIMITAR_SWORD);
-	}
+    public ItemMomijisScimitarSword(ToolMaterial material) {
+        super(material, LibName.MOMIJI_SCIMITAR_SWORD);
+    }
 
-	@Override
-	public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
-		Multimap<String, AttributeModifier> modifiers = super.getAttributeModifiers(slot, stack);
-		MiscHelper.multiplyItemModifier(modifiers, SharedMonsterAttributes.ATTACK_SPEED, ATTACK_SPEED_MODIFIER, 4);
-		return modifiers;
-	}
+    @Override
+    public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
+        Multimap<String, AttributeModifier> modifiers = super.getAttributeModifiers(slot, stack);
+        MiscHelper.multiplyItemModifier(modifiers, SharedMonsterAttributes.ATTACK_SPEED, ATTACK_SPEED_MODIFIER, -0.7);
+        return modifiers;
+    }
 
-	@Override
-	public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
-		return repair.getItem() == Items.IRON_INGOT;
-	}
+    @Override
+    public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) {
+        return repair.getItem() == Items.IRON_INGOT;
+    }
 }

src/main/java/arekkuusu/grimoireofalice/compat/danmakucore/subentity/SubEntitySunBullet.java

@@ -35,10 +35,20 @@ public static class Sun extends SubEntityDefault {
 
 		@Override
 		public DanmakuUpdate subEntityTick(DanmakuState danmaku) {
-			return super.subEntityTick(danmaku).addCallbackIf(!danmaku.world().isRemote, () -> {
-				AxisAlignedBB bb = new AxisAlignedBB(danmaku.pos().toBlockPos()).grow(danmaku.shot().sizeX(), danmaku.shot().sizeY(), danmaku.shot().sizeZ());
-				danmaku.world().getEntitiesWithinAABB(EntityLivingBase.class, bb).forEach(e -> e.setFire(5));
-			});
+		        return super.subEntityTick(danmaku)
+		                .addCallbackIf(!danmaku.world().isRemote, () -> {
+		                    AxisAlignedBB bb = new AxisAlignedBB(danmaku.pos().toBlockPos()).grow(danmaku.shot().sizeX(),
+		                            danmaku.shot().sizeY(), danmaku.shot().sizeZ());
+		                    danmaku.world().getEntitiesWithinAABB(EntityLivingBase.class, bb).forEach(e -> {
+		                        if (!danmaku.user().isEmpty()) {
+		                            if (e != danmaku.user().get()) {
+		                                e.setFire(5);
+		                            }
+		                        } else {
+		                            e.setFire(5);
+		                        }
+		                    });
+		                });
 		}
 
 		@Override