Merge 1.21.7-8 into 1.21.10: Resolve conflicts and update to MC 1.21.10

Author: ijustseen

CHANGELOG.md

@@ -0,0 +1,41 @@
+# Changelog
+
+## [1.2.0] - 2024-11-12
+
+### Added
+
+- Click-to-remove message functionality with particle effects
+- Configuration option to enable/disable click-to-remove feature
+- World event handling system for message parsing pause/resume
+- Automatic message parsing pause when leaving worlds
+- Automatic message parsing resume when joining worlds
+
+### Changed
+
+- Updated Minecraft version from 1.21.7 to 1.21.10
+- Updated Fabric API to 0.129.0+1.21.7
+- Fixed WorldRenderEvents imports (moved to v1.world package)
+- Updated rendering API calls (matrixStack() → matrices())
+- Fixed MinecraftClient.disconnect() mixin signature for new boolean parameter
+
+### Technical
+
+- MouseHandlerMixin for click detection on messages
+- MessageClickHandler for click processing and particle spawning
+- WorldEventHandler for managing message parsing state
+- ClientPlayNetworkHandlerMixin for world join detection
+- MinecraftClientMixin for world leave detection
+
+## [1.1.0] - 2024-11-11
+
+### Added
+
+- Custom render pipeline system (CustomRenderPipeline.java, WaypointRenderer.java)
+- GPU resource cleanup (GameRendererMixin.java)
+- Rendering guide (RENDERING_GUIDE.md)
+
+### Technical
+
+- Support for extraction/drawing phase rendering
+- Example waypoint renderer with through-wall rendering
+- Proper GPU memory management

RENDERING_GUIDE.md

@@ -0,0 +1,155 @@
+# Custom Rendering Guide for Minecraft 1.21.7
+
+## Quick Start
+
+### Test the example waypoint
+
+```bash
+./gradlew runClient
+# In game: /tp 0 100 0
+```
+
+You should see a green cube that renders through walls.
+
+## What was added
+
+### New files
+
+1. **CustomRenderPipeline.java** - Basic example from Fabric docs
+
+   - Renders a green cube at (0, 100, 0)
+   - Renders through walls (NO_DEPTH_TEST)
+   - Demonstrates extraction/drawing phases
+
+2. **WaypointRenderer.java** - Full-featured renderer
+
+   - Support for multiple waypoints
+   - Different colors and sizes
+   - Ready to use in your project
+
+3. **GameRendererMixin.java** - Resource cleanup
+   - Prevents GPU memory leaks
+   - Called when GameRenderer closes
+
+## Usage Examples
+
+### Basic - Single waypoint
+
+```java
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+import takeyourminestream.modid.rendering.WaypointRenderer;
+import takeyourminestream.modid.rendering.WaypointRenderer.Waypoint;
+
+WaypointRenderer renderer = new WaypointRenderer();
+
+// Add a green waypoint
+renderer.addWaypoint(Waypoint.green(new Vec3d(0, 100, 0)));
+
+// Register rendering
+WorldRenderEvents.AFTER_ENTITIES.register(context -> {
+    renderer.render(context);
+});
+```
+
+### Multiple waypoints
+
+```java
+renderer.addWaypoint(Waypoint.green(new Vec3d(0, 100, 0)));
+renderer.addWaypoint(Waypoint.red(new Vec3d(10, 100, 10)));
+renderer.addWaypoint(Waypoint.blue(new Vec3d(-10, 100, -10)));
+
+// Custom waypoint
+renderer.addWaypoint(new Waypoint(
+    new Vec3d(20, 100, 20),  // position
+    1f, 1f, 0f,              // yellow (RGB)
+    0.7f,                    // alpha
+    2f                       // size in blocks
+));
+```
+
+### Dynamic waypoints
+
+```java
+WorldRenderEvents.AFTER_ENTITIES.register(context -> {
+    renderer.clearWaypoints();
+
+    // Add waypoints for active messages
+    for (Message msg : activeMessages) {
+        renderer.addWaypoint(Waypoint.green(msg.getPosition()));
+    }
+
+    renderer.render(context);
+});
+```
+
+## Disable test waypoint
+
+If you don't want the test waypoint, edit `fabric.mod.json`:
+
+```json
+"client": [
+  "takeyourminestream.modid.TakeYourMineStreamClient"
+  // "takeyourminestream.modid.rendering.CustomRenderPipeline"
+]
+```
+
+## How it works
+
+### Two-phase rendering
+
+1. **Extraction** - Collect data for rendering
+   - Call `VertexRendering.drawFilledBox()`
+   - Write vertices to BufferBuilder
+2. **Drawing** - Render to screen
+   - Build the buffer
+   - Upload to GPU
+   - Execute draw call
+
+This allows rendering the previous frame in parallel with extracting the next frame.
+
+### Custom pipeline
+
+```java
+private static final RenderPipeline MY_PIPELINE = RenderPipelines.register(
+    RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
+        .withLocation(Identifier.of("mod-id", "pipeline/my_pipeline"))
+        .withVertexFormat(VertexFormats.POSITION_COLOR, DrawMode.TRIANGLE_STRIP)
+        .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
+        .build()
+);
+```
+
+### Resource cleanup
+
+**IMPORTANT:** Always clean up resources!
+
+```java
+public void close() {
+    allocator.close();
+    if (vertexBuffer != null) {
+        vertexBuffer.close();
+        vertexBuffer = null;
+    }
+}
+```
+
+The GameRendererMixin calls this automatically.
+
+## Performance tips
+
+1. Reuse BufferBuilder (don't create new each frame)
+2. Use MappableRingBuffer for automatic buffer management
+3. Group objects by pipeline
+4. Clear unused waypoints
+
+## Compatibility
+
+- ✅ Minecraft 1.21.7
+- ✅ Fabric Loader 0.16.14+
+- ✅ Fabric API 0.129.0+
+- ✅ Java 21
+
+## Links
+
+- [Fabric Rendering Documentation](https://docs.fabricmc.net/develop/rendering/world)
+- [Rendering Concepts](https://docs.fabricmc.net/develop/rendering/basic-concepts)

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.17.3
 loom_version=1.11-SNAPSHOT
 
 # Mod Properties
-mod_version=1.1.0
+mod_version=1.2.0
 maven_group=takeyourminestream.modid
 archives_base_name=tyms
 

src/client/java/takeyourminestream/modid/ConfigManager.java

@@ -116,6 +116,9 @@ public void setConfigValue(String key, Object value) {
             case "followPlayer":
                 configData.setFollowPlayer((Boolean) value);
                 break;
+            case "enableClickToRemove":
+                configData.setEnableClickToRemove((Boolean) value);
+                break;
             default:
                 LOGGER.warning("Неизвестный ключ конфигурации: " + key);
                 return;
@@ -143,6 +146,7 @@ private void updateConfigCache() {
         configCache.put("messageScale", configData.getMessageScale());
         configCache.put("showMessageBackground", configData.isShowMessageBackground());
         configCache.put("followPlayer", configData.isFollowPlayer());
+        configCache.put("enableClickToRemove", configData.isEnableClickToRemove());
     }
 
     public ModConfigData getConfigData() {

src/client/java/takeyourminestream/modid/ModConfig.java

@@ -113,4 +113,13 @@ public static boolean isFOLLOW_PLAYER() {
     public static void setFOLLOW_PLAYER(boolean value) {
         ConfigManager.getInstance().setConfigValue("followPlayer", value);
     }
+
+    public static boolean isENABLE_CLICK_TO_REMOVE() {
+        Object value = ConfigManager.getInstance().getConfigValue("enableClickToRemove");
+        return value != null ? (Boolean) value : true; // По умолчанию true
+    }
+
+    public static void setENABLE_CLICK_TO_REMOVE(boolean value) {
+        ConfigManager.getInstance().setConfigValue("enableClickToRemove", value);
+    }
 } 

src/client/java/takeyourminestream/modid/ModConfigScreen.java

@@ -232,6 +232,16 @@ private void createConfigEntries() {
         this.addDrawableChild(followPlayerButton);
         configEntries.add(new ConfigEntry("takeyourminestream.config.follow_player", "takeyourminestream.config.follow_player.desc", ConfigEntryType.TOGGLE, followPlayerButton, ConfigCategory.BEHAVIOR));
 
+        ButtonWidget clickToRemoveButton = ButtonWidget.builder(
+            Text.translatable(ModConfig.isENABLE_CLICK_TO_REMOVE() ? "takeyourminestream.config.on" : "takeyourminestream.config.off"),
+            btn -> {
+                ModConfig.setENABLE_CLICK_TO_REMOVE(!ModConfig.isENABLE_CLICK_TO_REMOVE());
+                btn.setMessage(Text.translatable(ModConfig.isENABLE_CLICK_TO_REMOVE() ? "takeyourminestream.config.on" : "takeyourminestream.config.off"));
+            }
+        ).dimensions(0, 0, CONTROL_WIDTH, 20).build();
+        this.addDrawableChild(clickToRemoveButton);
+        configEntries.add(new ConfigEntry("takeyourminestream.config.click_to_remove", "takeyourminestream.config.click_to_remove.desc", ConfigEntryType.TOGGLE, clickToRemoveButton, ConfigCategory.BEHAVIOR));
+
         TextFieldWidget maxFreezeDistanceField = new TextFieldWidget(textRenderer, 0, 0, CONTROL_WIDTH, 20, Text.translatable("takeyourminestream.config.max_freeze_distance"));
         maxFreezeDistanceField.setText(String.valueOf(ModConfig.getMAX_FREEZE_DISTANCE()));
         maxFreezeDistanceField.setChangedListener(s -> {

src/client/java/takeyourminestream/modid/TakeYourMineStreamClient.java

@@ -50,6 +50,9 @@ private void initializeMod() {
         commandManager.registerCommands();
         keyBindingManager.registerKeyBindings();
 
+        // Регистрация обработчиков событий мира
+        WorldEventHandler.register(messageSpawner);
+        
         Logger.info("Все компоненты мода инициализированы");
     }
 

src/client/java/takeyourminestream/modid/WorldEventHandler.java

@@ -0,0 +1,49 @@
+package takeyourminestream.modid;
+
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import takeyourminestream.modid.messages.MessageSpawner;
+import takeyourminestream.modid.utils.Logger;
+
+/**
+ * Обработчик событий мира для управления паузой системы сообщений
+ */
+public class WorldEventHandler {
+    
+    /**
+     * Регистрирует обработчики событий входа/выхода из мира
+     * @param messageSpawner система спавна сообщений
+     */
+    public static void register(MessageSpawner messageSpawner) {
+        // При выходе из мира - ставим на паузу
+        ClientLifecycleEvents.CLIENT_STOPPING.register(client -> {
+            if (messageSpawner != null) {
+                messageSpawner.pause();
+                Logger.info("Система сообщений поставлена на паузу (выход из игры)");
+            }
+        });
+    }
+    
+    /**
+     * Обработчик входа в мир - снимает с паузы
+     * Вызывается вручную при входе в мир
+     * @param messageSpawner система спавна сообщений
+     */
+    public static void onWorldJoin(MessageSpawner messageSpawner) {
+        if (messageSpawner != null && messageSpawner.isPaused()) {
+            messageSpawner.resume();
+            Logger.info("Система сообщений снята с паузы (вход в мир)");
+        }
+    }
+    
+    /**
+     * Обработчик выхода из мира - ставит на паузу
+     * Вызывается вручную при выходе из мира
+     * @param messageSpawner система спавна сообщений
+     */
+    public static void onWorldLeave(MessageSpawner messageSpawner) {
+        if (messageSpawner != null && !messageSpawner.isPaused()) {
+            messageSpawner.pause();
+            Logger.info("Система сообщений поставлена на паузу (выход из мира)");
+        }
+    }
+}

src/client/java/takeyourminestream/modid/config/ModConfigData.java

@@ -4,7 +4,7 @@
  * Модель данных конфигурации мода
  */
 public class ModConfigData {
-    private String twitchChannelName = "ijustseen_you";
+    private String twitchChannelName = "ijustseen";
     // Старые поля для обратной совместимости (тики)
     private int messageLifetimeTicks = 80;
     private int messageFallTicks = 20;
@@ -22,6 +22,7 @@ public class ModConfigData {
     private MessageScale messageScale = MessageScale.NORMAL;
     private boolean showMessageBackground = true;
     private boolean followPlayer = false;
+    private boolean enableClickToRemove = true;
 
     // Геттеры
     public String getTwitchChannelName() { return twitchChannelName; }
@@ -40,6 +41,7 @@ public class ModConfigData {
     public MessageScale getMessageScale() { return messageScale; }
     public boolean isShowMessageBackground() { return showMessageBackground; }
     public boolean isFollowPlayer() { return followPlayer; }
+    public boolean isEnableClickToRemove() { return enableClickToRemove; }
 
     // Сеттеры
     public void setTwitchChannelName(String twitchChannelName) { this.twitchChannelName = twitchChannelName; }
@@ -58,6 +60,7 @@ public class ModConfigData {
     public void setMessageScale(MessageScale messageScale) { this.messageScale = messageScale; }
     public void setShowMessageBackground(boolean showMessageBackground) { this.showMessageBackground = showMessageBackground; }
     public void setFollowPlayer(boolean followPlayer) { this.followPlayer = followPlayer; }
+    public void setEnableClickToRemove(boolean enableClickToRemove) { this.enableClickToRemove = enableClickToRemove; }
 
     // Методы для обратной совместимости
     public boolean isMessagesInFrontOfPlayerOnly() {