add rusting logic

Author: adccadc

src/main/java/com/adccadc/rust/Rust.java

@@ -122,6 +122,7 @@ public void onInitialize() {
 
         // 氧化过程
         ServerTickEvents.END_WORLD_TICK.register(world -> {
+            RustTick.Judge_Rusty(world);
             if(RustConfig.useLegacyOxidizeLogic()) {
                 if (world.getTime() % 6000 == 0) { // 5min一次
                     if (world instanceof ServerWorld serverWorld) {
@@ -151,7 +152,8 @@ public void onInitialize() {
                 }
             } else {
                 // 新版氧化过程
-                if (RustTick.tick(world)) {
+                if (RustTick.CanRusty("item")) {
+                    RustTick.Item_Can_Rusty = false;
                     // 新版物品氧化机制
                     for (PlayerEntity player : world.getPlayers()) {
                         ItemReplace.OxidizationItemWithAttribute(player, 3);
@@ -220,26 +222,5 @@ public void onInitialize() {
             }
             return ActionResult.PASS;
         });
-        /*
-        UseEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> {
-            Rust.LOGGER.info(world.toString());
-            if (world.isClient) return ActionResult.PASS;
-            if (entity.getType() == EntityType.IRON_GOLEM) {
-                if (player.getStackInHand(hand).getItem() == Items.GUNPOWDER) {
-                    //Rust.LOGGER.info("1");
-                    return ActionResult.SUCCESS;
-                }
-            }
-
-                StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-                String caller = "";
-                for (int i = 1; i < Math.min(5, stackTrace.length); i++) {
-                    caller += stackTrace[i].getMethodName() + " <-";
-                }
-                Rust.LOGGER.info("调用链:{}",caller);
-
-            return ActionResult.PASS;
-        });
-        */
 	}
 }

src/main/java/com/adccadc/rust/RustTick.java

@@ -10,6 +10,10 @@ public class RustTick {
     private static long lastTrueTime = System.nanoTime();
     private static double nextInterval = generateNextInterval();
 
+    public static boolean Item_Can_Rusty = false;
+    public static boolean Server_Entity_Can_Rusty = false;
+    public static boolean Client_Entity_Can_Rusty = false;
+
     // 生成下一个间隔时间（秒）
     private static double generateNextInterval() {
         if (random.nextDouble() < 0.0138) {
@@ -38,4 +42,22 @@ public static boolean tick(ServerWorld serverWorld) {
         }
         return false;
     }
+
+    public static void Judge_Rusty(ServerWorld serverWorld) {
+        if (tick(serverWorld)) {
+            // item
+            if (random.nextDouble() < 0.5) {Item_Can_Rusty = true;}
+            // entity
+            if (random.nextDouble() < 0.6) {Server_Entity_Can_Rusty = true; Client_Entity_Can_Rusty = true;}
+        }
+    }
+
+    public static boolean CanRusty(String type) {
+        switch (type) {
+            case "item" -> {;return Item_Can_Rusty;}
+            case "server_entity" -> {return Server_Entity_Can_Rusty;}
+            case "client_entity" -> {return Client_Entity_Can_Rusty;}
+            default -> throw new RuntimeException("RustTick.CanRusty Type Error");
+        }
+    }
 }

src/main/java/com/adccadc/rust/mixin/entity/iromGolem/IronGolemEntityMixin.java

@@ -2,10 +2,12 @@
 
 import com.adccadc.rust.Rust;
 import com.adccadc.rust.RustConfig;
+import com.adccadc.rust.RustTick;
 import com.adccadc.rust.effect.ModEffects;
 import com.adccadc.rust.item.Moditems;
 import com.adccadc.rust.manager.RustManager;
 import com.adccadc.rust.proxy.IronGolemEntityProxy;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
@@ -138,7 +140,7 @@ protected void interactMobWithRustActions(PlayerEntity player, Hand hand, Callba
                     // 生成掉落物
                     ItemEntity drop = this.dropStack(serverWorld, dropStack, 1.5F);
                     // 播放音效
-                    this.playSound(SoundEvents.ITEM_AXE_WAX_OFF, 1.0F, 1.0F);
+                    this.playSound(SoundEvents.ITEM_AXE_SCRAPE, 1.0F, 1.0F);
                     // 播放粒子
                     serverWorld.spawnParticles(
                             ParticleTypes.WAX_OFF,
@@ -252,5 +254,11 @@ public void tick() {
         if (!this.getWorld().isClient && this.age % 5 == 0) {
             this.updateGoalControls();
         }
+        if (this.getWorld().isClient) {
+            if (RustTick.CanRusty("client_entity")) {RustTick.Client_Entity_Can_Rusty = false ;this.rust.tryRusted();}
+        }
+        if (!this.getWorld().isClient) {
+            if (RustTick.CanRusty("server_entity")) {RustTick.Server_Entity_Can_Rusty = false ;this.rust.tryRusted();}
+        }
     }
 }