iris shaders compat

sync fixes

build.gradle

@@ -33,7 +33,9 @@ dependencies {
 
 	modImplementation "curse.maven:charm-318872:3393290"
 	modImplementation "curse.maven:simple-utilities-356722:3349846"
-	modImplementation "curse.maven:litematica-308892:3387062"
+	modApi "curse.maven:malilib-303119:3387061"
+	modImplementation "curse.maven:litematica-308892:3379278"
+	modImplementation "curse.maven:iris-455508:3404785"
 	implementation "com.moandjiezana.toml:toml4j:0.7.2"
 	implementation "com.electronwill.night-config:core:3.6.2"
 	implementation "com.electronwill.night-config:toml:3.6.2"

gradle.properties

@@ -8,7 +8,7 @@ yarn_mappings=1.17.1+build.46
 loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 1.4.2
+	mod_version = 1.4.2-v3
 	maven_group = net.fabricmc
 	archives_base_name = time-and-wind
 

src/main/java/ru/aiefu/timeandwind/NetworkPacketsID.java

@@ -0,0 +1,9 @@
+package ru.aiefu.timeandwind;
+
+import net.minecraft.util.Identifier;
+
+public class NetworkPacketsID {
+    public static final Identifier SYNC_CONFIG = new Identifier(TimeAndWind.MOD_ID, "sync_config");
+    public static final Identifier CFG_DEBUG_INFO = new Identifier(TimeAndWind.MOD_ID, "cfg_debug_info");
+    public static final Identifier WORLD_ID_CLIPBOARD = new Identifier(TimeAndWind.MOD_ID, "world_id_clipboard");
+}

src/main/java/ru/aiefu/timeandwind/TAWCommands.java

@@ -5,7 +5,6 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.network.PacketByteBuf;
@@ -14,7 +13,6 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.LiteralText;
-import net.minecraft.util.Identifier;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -62,7 +60,7 @@ public static int reloadCfg(ServerCommandSource source) throws CommandSyntaxExce
     public static int printCurrentWorldId(ServerCommandSource source) throws CommandSyntaxException {
         String id = source.getPlayer().world.getRegistryKey().getValue().toString();
         source.sendFeedback(new LiteralText(id), false);
-        ServerPlayNetworking.send(source.getPlayer(), new Identifier(TimeAndWind.MOD_ID, "world_id_clipboard"), new PacketByteBuf(Unpooled.buffer()).writeString(id));
+        ServerPlayNetworking.send(source.getPlayer(), NetworkPacketsID.WORLD_ID_CLIPBOARD, new PacketByteBuf(Unpooled.buffer()).writeString(id));
         return 0;
     }
     public static int printAmbientDarkness(ServerCommandSource source) throws CommandSyntaxException {
@@ -93,7 +91,7 @@ public static int getTimeConfig(ServerCommandSource source) throws CommandSyntax
         if(TimeAndWind.timeDataMap.containsKey(worldId)) {
             TimeDataStorage storage = TimeAndWind.timeDataMap.get(worldId);
             source.sendFeedback(new LiteralText("Server config for current world: Day Duration: " + storage.dayDuration + " Night Duration: " + storage.nightDuration), true);
-            ServerPlayNetworking.send(player, new Identifier(TimeAndWind.MOD_ID, "cfg_debug_info"), new PacketByteBuf(Unpooled.buffer()));
+            ServerPlayNetworking.send(player, NetworkPacketsID.CFG_DEBUG_INFO, new PacketByteBuf(Unpooled.buffer()));
         } else source.sendError(new LiteralText("No Data found for current world on server side"));
         return 0;
     }

src/main/java/ru/aiefu/timeandwind/TimeAndWind.java

@@ -8,6 +8,7 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
@@ -53,6 +54,10 @@ public void craftPaths(){
 		}
 	}
 
+	public static void checkConfig(MinecraftServer server){
+
+	}
+
 	public static void sendConfigSyncPacket(ServerPlayerEntity player){
 		if(!player.getServer().isHost(player.getGameProfile())) {
 			NbtList listTag = new NbtList();
@@ -68,7 +73,7 @@ public static void sendConfigSyncPacket(ServerPlayerEntity player){
 			}
 			NbtCompound tag = new NbtCompound();
 			tag.put("tawConfig", listTag);
-			ServerPlayNetworking.send(player, new Identifier(MOD_ID, "sync_config"), new PacketByteBuf(Unpooled.buffer()).writeNbt(tag));
+			ServerPlayNetworking.send(player, NetworkPacketsID.SYNC_CONFIG, new PacketByteBuf(Unpooled.buffer()).writeNbt(tag));
 			LOGGER.info("[Time & Wind] Sending config to player");
 		}
 	}

src/main/java/ru/aiefu/timeandwind/TimeAndWindClient.java

@@ -1,13 +1,11 @@
 package ru.aiefu.timeandwind;
 
-import io.netty.buffer.Unpooled;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
-import net.minecraft.network.PacketByteBuf;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -29,7 +27,7 @@ public void onInitializeClient() {
                 dim.setCycleDuration(tag.getLong("dayD"), tag.getLong("nightD"));
             }
         });
-        ClientPlayNetworking.registerGlobalReceiver(new Identifier(TimeAndWind.MOD_ID, "sync_config"), (client, handler, buf, responseSender) -> {
+        ClientPlayNetworking.registerGlobalReceiver(NetworkPacketsID.SYNC_CONFIG, (client, handler, buf, responseSender) -> {
             if(buf.readableBytes() > 0 ){
                 NbtCompound nbtCMP = buf.readNbt();
                 if(nbtCMP != null) {
@@ -50,13 +48,10 @@ public void onInitializeClient() {
                         dim.setCycleDuration(storage.dayDuration, storage.nightDuration);
                     }
                     TimeAndWind.LOGGER.info("[Time & Wind] Configuration synchronized");
-                    return;
                 }
             }
-            TimeAndWind.LOGGER.warn("[Time & Wind] Sync failed, requesting resync");
-            ClientPlayNetworking.send(new Identifier(TimeAndWind.MOD_ID, "request_resync"), new PacketByteBuf(Unpooled.buffer()));
         });
-        ClientPlayNetworking.registerGlobalReceiver(new Identifier(TimeAndWind.MOD_ID, "cfg_debug_info"), (client, handler, buf, responseSender) -> {
+        ClientPlayNetworking.registerGlobalReceiver(NetworkPacketsID.CFG_DEBUG_INFO, (client, handler, buf, responseSender) -> {
             try {
                 String worldId = client.world.getRegistryKey().getValue().toString();
                 if (TimeAndWind.timeDataMap.containsKey(worldId)) {
@@ -68,7 +63,7 @@ public void onInitializeClient() {
                 e.printStackTrace();
             }
         });
-        ClientPlayNetworking.registerGlobalReceiver(new Identifier(TimeAndWind.MOD_ID, "world_id_clipboard"), (client, handler, buf, responseSender) -> {
+        ClientPlayNetworking.registerGlobalReceiver(NetworkPacketsID.WORLD_ID_CLIPBOARD, (client, handler, buf, responseSender) -> {
             try{
                 if(buf.readableBytes() > 0) {
                     String string = buf.readString();

src/main/java/ru/aiefu/timeandwind/mixin/HardcodedCustomUniformsMixins.java

@@ -0,0 +1,22 @@
+package ru.aiefu.timeandwind.mixin;
+
+import net.coderbot.iris.uniforms.HardcodedCustomUniforms;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import ru.aiefu.timeandwind.IDimType;
+
+@Pseudo
+@Mixin(HardcodedCustomUniforms.class)
+public class HardcodedCustomUniformsMixins {
+    @ModifyConstant(method = "getTimeAngle()F", constant = @Constant(floatValue = 24000.0F), remap = false)
+    private static float patchTAWTA(float f){
+        return (float) ((IDimType) MinecraftClient.getInstance().world.getDimension()).getCycleDuration();
+    }
+    @ModifyConstant(method = "getWorldDayTime()I", constant = @Constant(longValue = 24000L), remap = false)
+    private static long patchTAWWDT(long l){
+        return ((IDimType) MinecraftClient.getInstance().world.getDimension()).getCycleDuration();
+    }
+}

src/main/java/ru/aiefu/timeandwind/mixin/PlayerManagerMixins.java

@@ -12,7 +12,7 @@
 
 @Mixin(PlayerManager.class)
 public class PlayerManagerMixins {
-    @Inject(method = "onPlayerConnect", at = @At(value = "INVOKE", target = "net/minecraft/server/network/ServerPlayNetworkHandler.sendPacket(Lnet/minecraft/network/Packet;)V", shift = At.Shift.BEFORE, ordinal = 0))
+    @Inject(method = "onPlayerConnect", at = @At("HEAD"))
     private void syncTimeDurationOnJoin(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci){
         TimeAndWind.sendConfigSyncPacket(player);
     }

src/main/java/ru/aiefu/timeandwind/mixin/WorldTimeUniformMixins.java

@@ -0,0 +1,22 @@
+package ru.aiefu.timeandwind.mixin;
+
+import net.coderbot.iris.uniforms.WorldTimeUniforms;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import ru.aiefu.timeandwind.IDimType;
+
+@Pseudo
+@Mixin(WorldTimeUniforms.class)
+public class WorldTimeUniformMixins {
+    @ModifyConstant(method = "getWorldDayTime()I", constant = @Constant(longValue = 24000L), remap = false)
+    private static long patchTAWWDT(long f){
+        return ((IDimType) MinecraftClient.getInstance().world.getDimension()).getCycleDuration();
+    }
+    @ModifyConstant(method = "getWorldDay()I", constant = @Constant(longValue = 24000L), remap = false)
+    private static long patchTAWWD(long l){
+        return ((IDimType) MinecraftClient.getInstance().world.getDimension()).getCycleDuration();
+    }
+}

src/main/resources/taw.mixins.json

@@ -16,7 +16,9 @@
   "client": [
     "DebugHudMixins",
     "SimpleUtilsMixins",
-    "WorldRendererMixins"
+    "WorldRendererMixins",
+    "WorldTimeUniformMixins",
+    "HardcodedCustomUniformsMixins"
   ],
   "injectors": {
     "defaultRequire": 1