diff --git a/README.md b/README.md index 212b8df..d88cfbc 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Syncmatica is a mod which aims to mod into litematica so that schematics and the ## Setup -[Syncmatica](https://github.com/End-Tech/syncmatica/releases/tag/v0.1.1) is a mod for both Minecraft client and server. -It's made for [Minecraft Fabric 1.16.3](https://fabricmc.net/). +[Syncmatica](https://github.com/End-Tech/syncmatica/releases/tag/v0.1.2) is a mod for both Minecraft client and server. +It's made for [Minecraft Fabric 1.16.x](https://fabricmc.net/). It relies on [litematica and malilib](https://masa.dy.fi/mcmods/client_mods/?mcver=1.16.3) to provide all client features. ### Client @@ -29,9 +29,8 @@ Another is in your schematic placement overview and allows you to share your own ## Project Status & Road Map -This will be the first full release. -Many features are not implemented yet that I want to have implemented. -Most of the last update focused on updating the mod to a state that makes it very useable. +The current update focused on interactions with litematica and restoring ease of use. +I pushed out these changes before finally starting on a longer update with regards to modifying the placement on the server and making some backend changes. As of now there is no way to modify placements on the server. That feature is planned in the next release. diff --git a/gradle.properties b/gradle.properties index 1c85cef..9c53636 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.10.3+build.211 # Mod Properties - mod_version=0.1.1 + mod_version=0.1.2 maven_group=io.github.samipourquoi archives_base_name=syncmatica diff --git a/src/main/java/io/github/samipourquoi/syncmatica/Syncmatica.java b/src/main/java/io/github/samipourquoi/syncmatica/Syncmatica.java index 1d99c09..f7b4b85 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/Syncmatica.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/Syncmatica.java @@ -24,7 +24,7 @@ public class Syncmatica { public static final String VERSION = "0.1.1"; public static final String MOD_ID = "syncmatica"; public static final String SERVER_PATH = "."+File.separator+"syncmatics"; - public static final String CLIENT_PATH = "."+File.separator+"schematics"+File.separator+".sync"; + public static final String CLIENT_PATH = "."+File.separator+"schematics"+File.separator+"sync"; private static CommunicationManager comms; private static IFileStorage data; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/ClientCommunicationManager.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/ClientCommunicationManager.java index 5192b31..2de73b4 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/ClientCommunicationManager.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/ClientCommunicationManager.java @@ -7,11 +7,11 @@ import io.github.samipourquoi.syncmatica.IFileStorage; import io.github.samipourquoi.syncmatica.SyncmaticManager; +import io.github.samipourquoi.syncmatica.communication.exchange.DownloadExchange; +import io.github.samipourquoi.syncmatica.communication.exchange.Exchange; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; +import io.github.samipourquoi.syncmatica.communication.exchange.VersionHandshakeClient; import io.github.samipourquoi.syncmatica.ServerPlacement; -import io.github.samipourquoi.syncmatica.communication.Exchange.DownloadExchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.Exchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; -import io.github.samipourquoi.syncmatica.communication.Exchange.VersionHandshakeClient; import io.github.samipourquoi.syncmatica.litematica.LitematicManager; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/CommunicationManager.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/CommunicationManager.java index 196e32a..c7c8355 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/CommunicationManager.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/CommunicationManager.java @@ -12,10 +12,10 @@ import io.github.samipourquoi.syncmatica.IFileStorage; import io.github.samipourquoi.syncmatica.SyncmaticManager; +import io.github.samipourquoi.syncmatica.communication.exchange.DownloadExchange; +import io.github.samipourquoi.syncmatica.communication.exchange.Exchange; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; import io.github.samipourquoi.syncmatica.ServerPlacement; -import io.github.samipourquoi.syncmatica.communication.Exchange.DownloadExchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.Exchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; import io.netty.buffer.Unpooled; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.BlockMirror; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/ServerCommunicationManager.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/ServerCommunicationManager.java index 510fb94..30cf2ac 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/ServerCommunicationManager.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/ServerCommunicationManager.java @@ -15,12 +15,12 @@ import io.github.samipourquoi.syncmatica.LocalLitematicState; import io.github.samipourquoi.syncmatica.SyncmaticManager; import io.github.samipourquoi.syncmatica.Syncmatica; +import io.github.samipourquoi.syncmatica.communication.exchange.DownloadExchange; +import io.github.samipourquoi.syncmatica.communication.exchange.Exchange; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; +import io.github.samipourquoi.syncmatica.communication.exchange.UploadExchange; +import io.github.samipourquoi.syncmatica.communication.exchange.VersionHandshakeServer; import io.github.samipourquoi.syncmatica.ServerPlacement; -import io.github.samipourquoi.syncmatica.communication.Exchange.DownloadExchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.Exchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; -import io.github.samipourquoi.syncmatica.communication.Exchange.UploadExchange; -import io.github.samipourquoi.syncmatica.communication.Exchange.VersionHandshakeServer; import io.netty.buffer.Unpooled; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/AbstractExchange.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/AbstractExchange.java similarity index 95% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/AbstractExchange.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/AbstractExchange.java index 299b0e6..27ad7a7 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/AbstractExchange.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/AbstractExchange.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import java.util.UUID; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/DownloadExchange.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/DownloadExchange.java similarity index 98% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/DownloadExchange.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/DownloadExchange.java index 15f04c7..2775ce7 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/DownloadExchange.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/DownloadExchange.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/Exchange.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/Exchange.java similarity index 96% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/Exchange.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/Exchange.java index d506c1e..44b3d54 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/Exchange.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/Exchange.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import io.github.samipourquoi.syncmatica.communication.CommunicationManager; import net.minecraft.network.PacketByteBuf; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/ExchangeTarget.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/ExchangeTarget.java similarity index 95% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/ExchangeTarget.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/ExchangeTarget.java index 65e19cd..018654c 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/ExchangeTarget.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/ExchangeTarget.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/ShareLitematicExchange.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/ShareLitematicExchange.java similarity index 97% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/ShareLitematicExchange.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/ShareLitematicExchange.java index a517c93..3719b0e 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/ShareLitematicExchange.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/ShareLitematicExchange.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/UploadExchange.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/UploadExchange.java similarity index 97% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/UploadExchange.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/UploadExchange.java index 312155f..43b5c07 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/UploadExchange.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/UploadExchange.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/VersionHandshakeClient.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/VersionHandshakeClient.java similarity index 97% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/VersionHandshakeClient.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/VersionHandshakeClient.java index 0a25426..7176cf1 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/VersionHandshakeClient.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/VersionHandshakeClient.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/VersionHandshakeServer.java b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/VersionHandshakeServer.java similarity index 96% rename from src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/VersionHandshakeServer.java rename to src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/VersionHandshakeServer.java index 3bf63d7..2cdbb73 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/communication/Exchange/VersionHandshakeServer.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/communication/exchange/VersionHandshakeServer.java @@ -1,4 +1,4 @@ -package io.github.samipourquoi.syncmatica.communication.Exchange; +package io.github.samipourquoi.syncmatica.communication.exchange; import java.util.Collection; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/litematica/LitematicManager.java b/src/main/java/io/github/samipourquoi/syncmatica/litematica/LitematicManager.java index 564c856..d59758e 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/litematica/LitematicManager.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/litematica/LitematicManager.java @@ -9,6 +9,7 @@ import fi.dy.masa.litematica.data.DataManager; +import fi.dy.masa.litematica.data.SchematicHolder; import fi.dy.masa.litematica.schematic.LitematicaSchematic; import fi.dy.masa.litematica.schematic.placement.SchematicPlacement; import io.github.samipourquoi.syncmatica.RedirectFileStorage; @@ -55,7 +56,7 @@ public void renderSyncmatic(ServerPlacement placement) { } File file = Syncmatica.getFileStorage().getLocalLitematic(placement); - LitematicaSchematic schematic = LitematicaSchematic.createFromFile(file.getParentFile(), file.getName()); + LitematicaSchematic schematic = (LitematicaSchematic) SchematicHolder.getInstance().getOrLoad(file); if (schematic == null) { throw new RuntimeException("Could not create schematic from file"); @@ -173,4 +174,23 @@ public void commitLoad() { } preLoadList = null; } + + public void unrenderSchematic(LitematicaSchematic l) { + rendering.entrySet().removeIf(e ->{ + if (e.getValue().getSchematic() == l) { + Syncmatica.getSyncmaticManager().updateServerPlacement(e.getKey()); + return true; + } + return false; + }); + } + + public void unrenderSchematicPlacement(SchematicPlacement placement) { + UUID id = ((IIDContainer)placement).getServerId(); + ServerPlacement p = Syncmatica.getSyncmaticManager().getPlacement(id); + if (p != null) { + unrenderSyncmatic(p); + } + + } } diff --git a/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/ButtonListenerShare.java b/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/ButtonListenerShare.java index 35ecc1a..34153c7 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/ButtonListenerShare.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/ButtonListenerShare.java @@ -7,8 +7,8 @@ import fi.dy.masa.malilib.gui.button.IButtonActionListener; import io.github.samipourquoi.syncmatica.Syncmatica; import io.github.samipourquoi.syncmatica.communication.ClientCommunicationManager; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; -import io.github.samipourquoi.syncmatica.communication.Exchange.ShareLitematicExchange; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; +import io.github.samipourquoi.syncmatica.communication.exchange.ShareLitematicExchange; import io.github.samipourquoi.syncmatica.litematica.LitematicManager; import net.minecraft.client.network.ClientPlayNetworkHandler; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/WidgetSyncmaticaServerPlacementEntry.java b/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/WidgetSyncmaticaServerPlacementEntry.java index 21df1e0..57a57b4 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/WidgetSyncmaticaServerPlacementEntry.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/litematica/gui/WidgetSyncmaticaServerPlacementEntry.java @@ -14,7 +14,7 @@ import io.github.samipourquoi.syncmatica.Syncmatica; import io.github.samipourquoi.syncmatica.communication.ClientCommunicationManager; import io.github.samipourquoi.syncmatica.communication.PacketType; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; import io.github.samipourquoi.syncmatica.litematica.LitematicManager; import io.netty.buffer.Unpooled; import io.github.samipourquoi.syncmatica.ServerPlacement; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinButtonBase.java b/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinButtonBase.java new file mode 100644 index 0000000..e2b970c --- /dev/null +++ b/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinButtonBase.java @@ -0,0 +1,14 @@ +package io.github.samipourquoi.syncmatica.litematica_mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import fi.dy.masa.malilib.gui.button.ButtonBase; +import fi.dy.masa.malilib.gui.button.IButtonActionListener; + +@Mixin(ButtonBase.class) +public interface MixinButtonBase { + + @Accessor("actionListener") + IButtonActionListener getActionListener(); +} diff --git a/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinSchematicHolder.java b/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinSchematicHolder.java new file mode 100644 index 0000000..8f5d364 --- /dev/null +++ b/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinSchematicHolder.java @@ -0,0 +1,22 @@ +package io.github.samipourquoi.syncmatica.litematica_mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import fi.dy.masa.litematica.data.SchematicHolder; +import fi.dy.masa.litematica.schematic.LitematicaSchematic; +import io.github.samipourquoi.syncmatica.litematica.LitematicManager; + +@Mixin(SchematicHolder.class) +public abstract class MixinSchematicHolder { + + public MixinSchematicHolder() {} + + @Inject(method="removeSchematic", at = @At("RETURN"), remap = false) + public void unloadSyncmatic(LitematicaSchematic schematic, CallbackInfoReturnable ci) { + LitematicManager.getInstance().unrenderSchematic(schematic); + } + +} diff --git a/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinWidgetSchematicPlacement.java b/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinWidgetSchematicPlacement.java index e80c866..ae4563b 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinWidgetSchematicPlacement.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/litematica_mixin/MixinWidgetSchematicPlacement.java @@ -9,8 +9,10 @@ import fi.dy.masa.litematica.gui.widgets.WidgetListSchematicPlacements; import fi.dy.masa.litematica.gui.widgets.WidgetSchematicPlacement; import fi.dy.masa.litematica.schematic.placement.SchematicPlacement; +import fi.dy.masa.malilib.gui.GuiBase; import fi.dy.masa.malilib.gui.button.ButtonBase; import fi.dy.masa.malilib.gui.button.ButtonGeneric; +import fi.dy.masa.malilib.gui.button.IButtonActionListener; import fi.dy.masa.malilib.gui.widgets.WidgetBase; import fi.dy.masa.malilib.gui.widgets.WidgetListEntryBase; import io.github.samipourquoi.syncmatica.Syncmatica; @@ -33,10 +35,24 @@ public MixinWidgetSchematicPlacement(int x, int y, int width, int height, Schema @Inject(method = "", at = @At("TAIL"), remap = false) public void addUploadButton(int x, int y, int width, int height, boolean isOdd, SchematicPlacement placement, int listIndex, WidgetListSchematicPlacements parent, CallbackInfo ci) { + int i = 0; if (LitematicManager.getInstance().isSyncmatic(placement)) { for (WidgetBase base: this.subWidgets) { if (base instanceof ButtonBase) { - ((ButtonBase) base).setEnabled(false); + ButtonBase button = (ButtonBase)base; + if (++i == 1) { + IButtonActionListener oldAction = ((MixinButtonBase)button).getActionListener(); + button.setActionListener((b,k)-> { + if (GuiBase.isShiftDown()) { + LitematicManager.getInstance().unrenderSchematicPlacement(placement); + return; + } + oldAction.actionPerformedWithButton(b, k); + }); + + } else if (i == 3) { + ((ButtonBase) base).setEnabled(false); + } } } } diff --git a/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinClientPlayNetworkHandler.java index c558570..cb347d9 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinClientPlayNetworkHandler.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinClientPlayNetworkHandler.java @@ -6,7 +6,7 @@ import io.github.samipourquoi.syncmatica.Syncmatica; import io.github.samipourquoi.syncmatica.communication.ClientCommunicationManager; import io.github.samipourquoi.syncmatica.communication.CommunicationManager; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; import io.github.samipourquoi.syncmatica.litematica.ScreenUpdater; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinServerPlayNetworkHandler.java b/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinServerPlayNetworkHandler.java index 7746b25..2b8c629 100644 --- a/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinServerPlayNetworkHandler.java +++ b/src/main/java/io/github/samipourquoi/syncmatica/mixin/MixinServerPlayNetworkHandler.java @@ -9,7 +9,7 @@ import io.github.samipourquoi.syncmatica.Syncmatica; import io.github.samipourquoi.syncmatica.communication.ServerCommunicationManager; -import io.github.samipourquoi.syncmatica.communication.Exchange.ExchangeTarget; +import io.github.samipourquoi.syncmatica.communication.exchange.ExchangeTarget; import net.minecraft.network.ClientConnection; import net.minecraft.network.NetworkThreadUtils; import net.minecraft.network.PacketByteBuf; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1312c45..2e36dcd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,10 +5,11 @@ "name": "Syncmatica", "description": "Server-wide shared litematics.", "authors": [ + "nnnik", "samipourquoi" ], "contact": { - "sources": "https://github.com/samipourquoi/syncmatica" + "sources": "https://github.com/endtech/syncmatica" }, "license": "CC0-1.0", "environment": "*", diff --git a/src/main/resources/syncmatica.litematica_mixin.json b/src/main/resources/syncmatica.litematica_mixin.json index 6f94dd9..43b5781 100644 --- a/src/main/resources/syncmatica.litematica_mixin.json +++ b/src/main/resources/syncmatica.litematica_mixin.json @@ -10,7 +10,9 @@ "MixinWidgetListSchematicPlacement", "MixinSchematicPlacement", "MixinWidgetSchematicPlacement", - "MixinGuiBase" + "MixinGuiBase", + "MixinSchematicHolder", + "MixinButtonBase" ], "server": [],