From da59206d4fad9b70fbc2d91ebf7f577270d1f0c1 Mon Sep 17 00:00:00 2001 From: tyra314 Date: Sun, 11 Sep 2022 17:11:05 +0200 Subject: [PATCH] Use architectury to implement both fabric and forge --- build.gradle | 122 ++--- .../main/java/hunternif/mc/api/AtlasAPI.java | 0 .../main/java/hunternif/mc/api/MarkerAPI.java | 0 .../main/java/hunternif/mc/api/TileAPI.java | 0 .../mc/api/client/AtlasClientAPI.java | 0 .../mc/api/client/ClientTileAPI.java | 0 .../java/hunternif/mc/api/package-info.java | 0 .../mc/impl/atlas/AntiqueAtlasConfig.java | 0 .../mc/impl/atlas/AntiqueAtlasMod.java | 12 +- .../mc/impl/atlas/AntiqueAtlasModClient.java | 6 +- .../hunternif/mc/impl/atlas/ClientProxy.java | 46 +- .../api/client/impl/MarkerApiImplClient.java | 0 .../api/client/impl/TileApiImplClient.java | 0 .../mc/impl/atlas/api/impl/MarkerApiImpl.java | 2 +- .../mc/impl/atlas/api/impl/TileApiImpl.java | 0 .../atlas/client/IResourceReloadListener.java | 34 ++ .../mc/impl/atlas/client/KeyHandler.java | 22 +- .../mc/impl/atlas/client/OverlayRenderer.java | 2 +- .../mc/impl/atlas/client/SetTileRenderer.java | 0 .../mc/impl/atlas/client/SubTile.java | 0 .../mc/impl/atlas/client/SubTileQuartet.java | 0 .../mc/impl/atlas/client/TextureConfig.java | 7 +- .../mc/impl/atlas/client/TextureSet.java | 0 .../impl/atlas/client/TextureSetConfig.java | 16 +- .../mc/impl/atlas/client/TextureSetMap.java | 0 .../mc/impl/atlas/client/Textures.java | 0 .../impl/atlas/client/TileRenderIterator.java | 0 .../impl/atlas/client/TileTextureConfig.java | 18 +- .../mc/impl/atlas/client/TileTextureMap.java | 0 .../client/gui/ExportProgressOverlay.java | 0 .../client/gui/ExportUpdateListener.java | 0 .../impl/atlas/client/gui/GuiArrowButton.java | 0 .../mc/impl/atlas/client/gui/GuiAtlas.java | 0 .../atlas/client/gui/GuiBlinkingMarker.java | 0 .../atlas/client/gui/GuiBookmarkButton.java | 0 .../atlas/client/gui/GuiMarkerBookmark.java | 0 .../atlas/client/gui/GuiMarkerFinalizer.java | 0 .../atlas/client/gui/GuiMarkerInList.java | 0 .../atlas/client/gui/GuiPositionButton.java | 0 .../mc/impl/atlas/client/gui/GuiScaleBar.java | 0 .../atlas/client/gui/ProgressBarOverlay.java | 0 .../atlas/client/gui/core/AGuiScrollbar.java | 0 .../client/gui/core/GuiBlinkingImage.java | 0 .../atlas/client/gui/core/GuiComponent.java | 0 .../client/gui/core/GuiComponentButton.java | 0 .../impl/atlas/client/gui/core/GuiCursor.java | 0 .../atlas/client/gui/core/GuiHScrollbar.java | 0 .../gui/core/GuiScrollingContainer.java | 0 .../impl/atlas/client/gui/core/GuiStates.java | 0 .../client/gui/core/GuiToggleButton.java | 0 .../atlas/client/gui/core/GuiVScrollbar.java | 0 .../atlas/client/gui/core/GuiViewport.java | 0 .../client/gui/core/IButtonListener.java | 0 .../client/gui/core/ISelectListener.java | 0 .../atlas/client/gui/core/ToggleGroup.java | 0 .../impl/atlas/client/texture/ATexture.java | 0 .../impl/atlas/client/texture/ITexture.java | 0 .../atlas/client/texture/IconTexture.java | 0 .../mc/impl/atlas/client/texture/Texture.java | 0 .../atlas/client/texture/TileTexture.java | 0 .../mc/impl/atlas/core/AtlasData.java | 15 +- .../mc/impl/atlas/core/AtlasIdData.java | 4 +- .../atlas/core/GlobalTileDataHandler.java | 2 +- .../mc/impl/atlas/core/ITileStorage.java | 0 .../impl/atlas/core/PlayerEventHandler.java | 0 .../mc/impl/atlas/core/TileDataHandler.java | 0 .../mc/impl/atlas/core/TileDataStorage.java | 4 +- .../mc/impl/atlas/core/TileGroup.java | 0 .../mc/impl/atlas/core/TileIdMap.java | 0 .../mc/impl/atlas/core/TileInfo.java | 0 .../mc/impl/atlas/core/WorldData.java | 0 .../atlas/core/scaning/ITileDetector.java | 0 .../atlas/core/scaning/TileDetectorBase.java | 0 .../atlas/core/scaning/TileDetectorEnd.java | 0 .../core/scaning/TileDetectorNether.java | 0 .../atlas/core/scaning/TileHeightType.java | 0 .../impl/atlas/core/scaning/WorldScanner.java | 0 .../impl/atlas/core/watcher/DeathWatcher.java | 0 .../atlas/event/MarkerClickedCallback.java | 13 + .../atlas/event/MarkerHoveredCallback.java | 13 + .../atlas/event/RecipeCraftedCallback.java | 17 +- .../atlas/event/RecipeCraftedHandler.java | 0 .../mc/impl/atlas/item/AntiqueAtlasItems.java | 40 ++ .../mc/impl/atlas/item/AtlasItem.java | 3 +- .../mc/impl/atlas/item/EmptyAtlasItem.java | 0 .../impl/atlas/item/RecipeAtlasCloning.java | 10 +- .../impl/atlas/item/RecipeAtlasCombining.java | 4 +- .../atlas/marker/DimensionMarkersData.java | 0 .../impl/atlas/marker/GlobalMarkersData.java | 0 .../marker/GlobalMarkersDataHandler.java | 2 +- .../mc/impl/atlas/marker/Marker.java | 0 .../atlas/marker/MarkerTextureConfig.java | 8 +- .../mc/impl/atlas/marker/MarkersData.java | 474 +++++++++--------- .../impl/atlas/marker/MarkersDataHandler.java | 0 .../atlas/marker/NetherPortalWatcher.java | 0 .../atlas/mixin/HeldItemRendererMixin.java | 2 +- .../MixinCartographyTableScreenHandler.java | 0 .../mixin/MixinClientPlayNetworkHandler.java | 0 .../atlas/mixin/MixinCraftingResultSlot.java | 0 .../mc/impl/atlas/mixin/MixinEntity.java | 0 .../mc/impl/atlas/mixin/MixinInGameHud.java | 0 .../atlas/mixin/MixinMinecraftClient.java | 0 .../impl/atlas/mixin/MixinPlayerEntity.java | 0 .../atlas/mixin/MixinPlayerEntityDeath.java | 0 .../impl/atlas/mixin/MixinPlayerManager.java | 0 .../impl/atlas/mixin/VolatileMixinPlugin.java | 12 +- .../dev/MixinCartographyTableHandlerSlot.java | 0 .../MixinCartographyTableHandlerSlot.java | 0 .../mixin/structure/StructureStartMixin.java | 0 .../mixinhooks/CartographyTableHooks.java | 0 .../impl/atlas/mixinhooks/EntityHooksAA.java | 0 .../NewPlayerConnectionCallback.java | 12 + .../NewServerConnectionCallback.java | 11 + .../atlas/network/AntiqueAtlasNetworking.java | 28 ++ .../network/packet/AntiqueAtlasPacket.java | 0 .../atlas/network/packet/c2s/C2SPacket.java | 4 +- .../c2s/play/DeleteMarkerC2SPacket.java | 15 +- .../play/PutBrowsingPositionC2SPacket.java | 15 +- .../packet/c2s/play/PutMarkerC2SPacket.java | 15 +- .../packet/c2s/play/PutTileC2SPacket.java | 15 +- .../atlas/network/packet/s2c/S2CPacket.java | 12 +- .../s2c/play/DeleteGlobalTileS2CPacket.java | 8 +- .../s2c/play/DeleteMarkerS2CPacket.java | 10 +- .../s2c/play/DimensionUpdateS2CPacket.java | 12 +- .../packet/s2c/play/MapDataS2CPacket.java | 11 +- .../s2c/play/PutGlobalTileS2CPacket.java | 6 +- .../packet/s2c/play/PutMarkersS2CPacket.java | 10 +- .../packet/s2c/play/PutTileS2CPacket.java | 10 +- .../packet/s2c/play/TileGroupsS2CPacket.java | 12 +- .../impl/atlas/registry/MarkerRenderInfo.java | 0 .../mc/impl/atlas/registry/MarkerType.java | 0 .../mc/impl/atlas/structure/EndCity.java | 0 .../impl/atlas/structure/NetherFortress.java | 0 .../mc/impl/atlas/structure/Overworld.java | 0 .../structure/StructureAddedCallback.java | 12 + .../atlas/structure/StructureHandler.java | 0 .../StructurePieceAddedCallback.java | 12 + .../mc/impl/atlas/structure/Village.java | 0 .../mc/impl/atlas/util/ArrayIterator.java | 0 .../mc/impl/atlas/util/BitMatrix.java | 0 .../mc/impl/atlas/util/ExportImageUtil.java | 0 .../mc/impl/atlas/util/FileUtil.java | 0 .../impl/atlas/util/ListMapValueIterator.java | 0 .../hunternif/mc/impl/atlas/util/Log.java | 0 .../mc/impl/atlas/util/MathUtil.java | 0 .../hunternif/mc/impl/atlas/util/Rect.java | 0 .../impl/atlas/util/RenderedImageScanned.java | 0 .../hunternif/mc/impl/atlas/util/Streams.java | 0 .../resources/antiqueatlas-common.mixins.json | 2 +- .../main/resources/antiqueatlas.accesswidener | 0 .../src}/main/resources/antiqueatlas_icon.png | Bin .../src}/main/resources/antiqueatlas_logo.png | Bin .../main/resources/architectury.common.json | 3 + .../antiqueatlas/atlas/markers/bastion.json | 0 .../antiqueatlas/atlas/markers/bed.json | 0 .../antiqueatlas/atlas/markers/diamond.json | 0 .../antiqueatlas/atlas/markers/end_city.json | 0 .../atlas/markers/end_city_far.json | 0 .../antiqueatlas/atlas/markers/google.json | 0 .../antiqueatlas/atlas/markers/mansion.json | 0 .../atlas/markers/marker.json.example | 0 .../antiqueatlas/atlas/markers/monument.json | 0 .../atlas/markers/nether_portal.json | 0 .../antiqueatlas/atlas/markers/pickaxe.json | 0 .../atlas/markers/red_x_large.json | 0 .../atlas/markers/red_x_small.json | 0 .../antiqueatlas/atlas/markers/scroll.json | 0 .../antiqueatlas/atlas/markers/skull.json | 0 .../antiqueatlas/atlas/markers/sword.json | 0 .../antiqueatlas/atlas/markers/tomb.json | 0 .../antiqueatlas/atlas/markers/tower.json | 0 .../antiqueatlas/atlas/markers/village.json | 0 .../atlas/texture_sets/basalt_deltas.json | 0 .../atlas/texture_sets/birch.json | 0 .../atlas/texture_sets/birch_hills.json | 0 .../atlas/texture_sets/bryce.json | 0 .../atlas/texture_sets/butchers_shop.json | 0 .../atlas/texture_sets/cave_walls.json | 0 .../atlas/texture_sets/church.json | 0 .../atlas/texture_sets/dense_birch.json | 0 .../atlas/texture_sets/dense_forest.json | 0 .../texture_sets/dense_forest_hills.json | 0 .../atlas/texture_sets/desert.json | 0 .../atlas/texture_sets/desert_hills.json | 0 .../atlas/texture_sets/end_island.json | 0 .../atlas/texture_sets/end_island_plants.json | 0 .../atlas/texture_sets/end_void.json | 0 .../atlas/texture_sets/farmland_large.json | 0 .../atlas/texture_sets/farmland_small.json | 0 .../atlas/texture_sets/fence.json | 0 .../atlas/texture_sets/forest.json | 0 .../atlas/texture_sets/forest_flowers.json | 0 .../atlas/texture_sets/forest_hills.json | 0 .../atlas/texture_sets/hills.json | 0 .../atlas/texture_sets/house.json | 0 .../atlas/texture_sets/house_small.json | 0 .../antiqueatlas/atlas/texture_sets/hut.json | 0 .../antiqueatlas/atlas/texture_sets/ice.json | 0 .../atlas/texture_sets/ice_spikes.json | 0 .../atlas/texture_sets/jungle.json | 0 .../atlas/texture_sets/jungle_cliffs.json | 0 .../atlas/texture_sets/jungle_edge.json | 0 .../atlas/texture_sets/jungle_edge_hills.json | 0 .../atlas/texture_sets/jungle_hills.json | 0 .../atlas/texture_sets/l_house.json | 0 .../antiqueatlas/atlas/texture_sets/lava.json | 0 .../atlas/texture_sets/lava_shore.json | 0 .../atlas/texture_sets/library.json | 0 .../atlas/texture_sets/mega_spruce.json | 0 .../atlas/texture_sets/mega_spruce_hills.json | 0 .../atlas/texture_sets/mega_taiga.json | 0 .../atlas/texture_sets/mega_taiga_hills.json | 0 .../antiqueatlas/atlas/texture_sets/mesa.json | 0 .../atlas/texture_sets/mountains.json | 0 .../atlas/texture_sets/mountains_all.json | 0 .../atlas/texture_sets/mountains_naked.json | 0 .../texture_sets/mountains_snow_caps.json | 0 .../atlas/texture_sets/mushroom.json | 0 .../atlas/texture_sets/nether_bridge.json | 0 .../texture_sets/nether_bridge_end_x.json | 0 .../texture_sets/nether_bridge_end_z.json | 0 .../texture_sets/nether_bridge_gate.json | 0 .../atlas/texture_sets/nether_bridge_x.json | 0 .../atlas/texture_sets/nether_bridge_z.json | 0 .../texture_sets/nether_fort_stairs.json | 0 .../atlas/texture_sets/nether_hall.json | 0 .../atlas/texture_sets/nether_throne.json | 0 .../atlas/texture_sets/nether_tower.json | 0 .../atlas/texture_sets/nether_wall.json | 0 .../atlas/texture_sets/pines.json | 0 .../atlas/texture_sets/pines_hills.json | 0 .../atlas/texture_sets/plains.json | 0 .../atlas/texture_sets/plateau_mesa.json | 0 .../atlas/texture_sets/plateau_mesa_low.json | 0 .../texture_sets/plateau_mesa_trees.json | 0 .../texture_sets/plateau_mesa_trees_low.json | 0 .../atlas/texture_sets/plateau_savanna.json | 0 .../atlas/texture_sets/plateau_savanna_m.json | 0 .../atlas/texture_sets/ravine.json | 0 .../atlas/texture_sets/rock_shore.json | 0 .../atlas/texture_sets/ruined_portal.json | 0 .../atlas/texture_sets/savanna.json | 0 .../atlas/texture_sets/savanna_cliffs.json | 0 .../atlas/texture_sets/shore.json | 0 .../atlas/texture_sets/smithy.json | 0 .../antiqueatlas/atlas/texture_sets/snow.json | 0 .../atlas/texture_sets/snow_hills.json | 0 .../atlas/texture_sets/snow_pines.json | 0 .../atlas/texture_sets/snow_pines_hills.json | 0 .../atlas/texture_sets/soul_sand_valley.json | 0 .../atlas/texture_sets/sparse_forest.json | 0 .../texture_sets/sparse_forest_hills.json | 0 .../atlas/texture_sets/sunflowers.json | 0 .../atlas/texture_sets/swamp.json | 0 .../atlas/texture_sets/swamp_hills.json | 0 .../atlas/texture_sets/swamp_water.json | 0 .../atlas/texture_sets/tall_birch.json | 0 .../atlas/texture_sets/tall_birch_hills.json | 0 .../antiqueatlas/atlas/texture_sets/test.json | 0 .../atlas/texture_sets/village_path_x.json | 0 .../atlas/texture_sets/village_path_z.json | 0 .../atlas/texture_sets/village_torch.json | 0 .../atlas/texture_sets/water.json | 0 .../antiqueatlas/atlas/texture_sets/well.json | 0 .../antiqueatlas/atlas/tiles/end_island.json | 0 .../atlas/tiles/end_island_plants.json | 0 .../antiqueatlas/atlas/tiles/end_void.json | 0 .../assets/antiqueatlas/atlas/tiles/lava.json | 0 .../antiqueatlas/atlas/tiles/lava_shore.json | 0 .../atlas/tiles/nether_bridge.json | 0 .../atlas/tiles/nether_bridge_end_x.json | 0 .../atlas/tiles/nether_bridge_end_z.json | 0 .../atlas/tiles/nether_bridge_gate.json | 0 .../atlas/tiles/nether_bridge_x.json | 0 .../atlas/tiles/nether_bridge_z.json | 0 .../atlas/tiles/nether_fort_stairs.json | 0 .../antiqueatlas/atlas/tiles/nether_hall.json | 0 .../atlas/tiles/nether_throne.json | 0 .../atlas/tiles/nether_tower.json | 0 .../antiqueatlas/atlas/tiles/nether_wall.json | 0 .../tiles/npc_village_butchers_shop.json | 0 .../atlas/tiles/npc_village_church.json | 0 .../tiles/npc_village_farmland_large.json | 0 .../tiles/npc_village_farmland_small.json | 0 .../atlas/tiles/npc_village_hut.json | 0 .../atlas/tiles/npc_village_l_house.json | 0 .../atlas/tiles/npc_village_library.json | 0 .../atlas/tiles/npc_village_path_x.json | 0 .../atlas/tiles/npc_village_path_z.json | 0 .../atlas/tiles/npc_village_small_house.json | 0 .../atlas/tiles/npc_village_smithy.json | 0 .../atlas/tiles/npc_village_torch.json | 0 .../atlas/tiles/npc_village_well.json | 0 .../antiqueatlas/atlas/tiles/ravine.json | 0 .../atlas/tiles/ruined_portal.json | 0 .../antiqueatlas/atlas/tiles/swamp_water.json | 0 .../assets/antiqueatlas/lang/da_dk.json | 0 .../assets/antiqueatlas/lang/de_de.json | 0 .../assets/antiqueatlas/lang/en_us.json | 0 .../assets/antiqueatlas/lang/es_ar.json | 0 .../assets/antiqueatlas/lang/es_es.json | 0 .../assets/antiqueatlas/lang/fr_fr.json | 0 .../assets/antiqueatlas/lang/it_it.json | 0 .../assets/antiqueatlas/lang/ja_jp.json | 0 .../assets/antiqueatlas/lang/pt_br.json | 0 .../assets/antiqueatlas/lang/ru_ru.json | 0 .../assets/antiqueatlas/lang/zh_cn.json | 0 .../assets/antiqueatlas/lang/zh_tw.json | 0 .../models/item/antique_atlas.json | 0 .../models/item/empty_antique_atlas.json | 0 .../assets/antiqueatlas/textures/gui/book.png | Bin .../antiqueatlas/textures/gui/book_frame.png | Bin .../textures/gui/book_frame_narrow.png | Bin .../antiqueatlas/textures/gui/bookmarks.png | Bin .../antiqueatlas/textures/gui/bookmarks_l.png | Bin .../antiqueatlas/textures/gui/eraser.png | Bin .../antiqueatlas/textures/gui/exported_bg.png | Bin .../textures/gui/icons/add_marker.png | Bin .../textures/gui/icons/del_marker.png | Bin .../textures/gui/icons/export.png | Bin .../textures/gui/icons/hide_markers.png | Bin .../textures/gui/icons/show_markers.png | Bin .../textures/gui/marker_frame_off.png | Bin .../textures/gui/marker_frame_on.png | Bin .../antiqueatlas/textures/gui/markers/bed.png | Bin .../textures/gui/markers/diamond.png | Bin .../textures/gui/markers/end_city.png | Bin .../textures/gui/markers/end_city_far.png | Bin .../gui/markers/end_city_mipped_16.png | Bin .../gui/markers/end_city_mipped_32.png | Bin .../textures/gui/markers/google_marker.png | Bin .../textures/gui/markers/nether_portal.png | Bin .../textures/gui/markers/ocean_monument.png | Bin .../textures/gui/markers/pickaxe.png | Bin .../textures/gui/markers/red_x_large.png | Bin .../textures/gui/markers/red_x_small.png | Bin .../textures/gui/markers/scroll.png | Bin .../textures/gui/markers/skull.png | Bin .../textures/gui/markers/sword.png | Bin .../textures/gui/markers/tomb.png | Bin .../textures/gui/markers/tower.png | Bin .../textures/gui/markers/unknown_marker.png | Bin .../textures/gui/markers/village.png | Bin .../textures/gui/markers/woodland_mansion.png | Bin .../textures/gui/navigate_arrows.png | Bin .../antiqueatlas/textures/gui/player.png | Bin .../antiqueatlas/textures/gui/position.png | Bin .../textures/gui/scalebar/scalebar_128.png | Bin .../textures/gui/scalebar/scalebar_16.png | Bin .../textures/gui/scalebar/scalebar_256.png | Bin .../textures/gui/scalebar/scalebar_32.png | Bin .../textures/gui/scalebar/scalebar_4.png | Bin .../textures/gui/scalebar/scalebar_512.png | Bin .../textures/gui/scalebar/scalebar_64.png | Bin .../textures/gui/scalebar/scalebar_8.png | Bin .../textures/gui/scrollbar_hor.png | Bin .../textures/gui/scrollbar_ver.png | Bin .../textures/gui/tiles/basalt_columns1.png | Bin .../textures/gui/tiles/basalt_columns2.png | Bin .../textures/gui/tiles/basalt_columns3.png | Bin .../gui/tiles/basalt_columns_lava1.png | Bin .../antiqueatlas/textures/gui/tiles/birch.png | Bin .../textures/gui/tiles/birch2.png | Bin .../textures/gui/tiles/birch_hills.png | Bin .../textures/gui/tiles/birch_hills2.png | Bin .../antiqueatlas/textures/gui/tiles/bryce.png | Bin .../textures/gui/tiles/bryce2.png | Bin .../textures/gui/tiles/bryce3.png | Bin .../textures/gui/tiles/bryce4.png | Bin .../textures/gui/tiles/bushes_cliffs.png | Bin .../textures/gui/tiles/butchers_shop.png | Bin .../antiqueatlas/textures/gui/tiles/cacti.png | Bin .../textures/gui/tiles/cave_walls.png | Bin .../textures/gui/tiles/church.png | Bin .../textures/gui/tiles/cliffs.png | Bin .../textures/gui/tiles/cliffs_clouds.png | Bin .../textures/gui/tiles/dense_birch.png | Bin .../textures/gui/tiles/dense_forest.png | Bin .../textures/gui/tiles/dense_forest2.png | Bin .../textures/gui/tiles/dense_forest_hills.png | Bin .../gui/tiles/dense_forest_hills2.png | Bin .../textures/gui/tiles/end_island.png | Bin .../textures/gui/tiles/end_island2.png | Bin .../textures/gui/tiles/end_island_plants.png | Bin .../textures/gui/tiles/end_island_plants2.png | Bin .../textures/gui/tiles/end_void.png | Bin .../textures/gui/tiles/farmland_l.png | Bin .../textures/gui/tiles/farmland_s.png | Bin .../antiqueatlas/textures/gui/tiles/fence.png | Bin .../textures/gui/tiles/forest.png | Bin .../textures/gui/tiles/forest2.png | Bin .../textures/gui/tiles/forest3.png | Bin .../textures/gui/tiles/forest_flowers.png | Bin .../textures/gui/tiles/forest_flowers2.png | Bin .../textures/gui/tiles/forest_flowers3.png | Bin .../textures/gui/tiles/forest_hills.png | Bin .../textures/gui/tiles/forest_hills2.png | Bin .../textures/gui/tiles/forest_hills3.png | Bin .../textures/gui/tiles/forest_sparse.png | Bin .../textures/gui/tiles/forest_sparse2.png | Bin .../textures/gui/tiles/forest_sparse3.png | Bin .../gui/tiles/forest_sparse_hills.png | Bin .../gui/tiles/forest_sparse_hills2.png | Bin .../gui/tiles/forest_sparse_hills3.png | Bin .../antiqueatlas/textures/gui/tiles/grass.png | Bin .../textures/gui/tiles/grass2.png | Bin .../textures/gui/tiles/grass3.png | Bin .../textures/gui/tiles/grass4.png | Bin .../antiqueatlas/textures/gui/tiles/hills.png | Bin .../textures/gui/tiles/hills_bushes.png | Bin .../textures/gui/tiles/hills_cacti.png | Bin .../textures/gui/tiles/hills_grass.png | Bin .../antiqueatlas/textures/gui/tiles/house.png | Bin .../textures/gui/tiles/house_small.png | Bin .../antiqueatlas/textures/gui/tiles/hut.png | Bin .../textures/gui/tiles/ice_border.png | Bin .../textures/gui/tiles/ice_noborder.png | Bin .../textures/gui/tiles/ice_spikes.png | Bin .../textures/gui/tiles/ice_spikes2.png | Bin .../textures/gui/tiles/jungle.png | Bin .../textures/gui/tiles/jungle2.png | Bin .../textures/gui/tiles/jungle_cliffs.png | Bin .../textures/gui/tiles/jungle_cliffs2.png | Bin .../textures/gui/tiles/jungle_edge.png | Bin .../textures/gui/tiles/jungle_edge2.png | Bin .../textures/gui/tiles/jungle_edge3.png | Bin .../textures/gui/tiles/jungle_edge_hills.png | Bin .../textures/gui/tiles/jungle_edge_hills2.png | Bin .../textures/gui/tiles/jungle_edge_hills3.png | Bin .../textures/gui/tiles/jungle_hills.png | Bin .../textures/gui/tiles/jungle_hills2.png | Bin .../textures/gui/tiles/l_house.png | Bin .../antiqueatlas/textures/gui/tiles/lava.png | Bin .../antiqueatlas/textures/gui/tiles/lava2.png | Bin .../textures/gui/tiles/lava_shore.png | Bin .../textures/gui/tiles/lava_shore2.png | Bin .../textures/gui/tiles/library.png | Bin .../textures/gui/tiles/mega_spruce.png | Bin .../textures/gui/tiles/mega_spruce2.png | Bin .../textures/gui/tiles/mega_spruce_hills.png | Bin .../textures/gui/tiles/mega_spruce_hills2.png | Bin .../textures/gui/tiles/mega_taiga.png | Bin .../textures/gui/tiles/mega_taiga2.png | Bin .../textures/gui/tiles/mega_taiga_hills.png | Bin .../textures/gui/tiles/mega_taiga_hills2.png | Bin .../antiqueatlas/textures/gui/tiles/mesa.png | Bin .../antiqueatlas/textures/gui/tiles/mesa2.png | Bin .../antiqueatlas/textures/gui/tiles/mesa3.png | Bin .../antiqueatlas/textures/gui/tiles/mesa4.png | Bin .../textures/gui/tiles/mountains.png | Bin .../textures/gui/tiles/mountains2.png | Bin .../textures/gui/tiles/mountains3.png | Bin .../textures/gui/tiles/mountains4.png | Bin .../textures/gui/tiles/mountains5.png | Bin .../textures/gui/tiles/mushroom.png | Bin .../textures/gui/tiles/mushroom2.png | Bin .../textures/gui/tiles/nether_bridge.png | Bin .../gui/tiles/nether_bridge_end_x.png | Bin .../gui/tiles/nether_bridge_end_z.png | Bin .../textures/gui/tiles/nether_bridge_gate.png | Bin .../textures/gui/tiles/nether_bridge_x.png | Bin .../textures/gui/tiles/nether_bridge_z.png | Bin .../textures/gui/tiles/nether_fort_stairs.png | Bin .../textures/gui/tiles/nether_hall.png | Bin .../textures/gui/tiles/nether_throne.png | Bin .../textures/gui/tiles/nether_tower.png | Bin .../textures/gui/tiles/nether_wall.png | Bin .../antiqueatlas/textures/gui/tiles/pines.png | Bin .../textures/gui/tiles/pines2.png | Bin .../textures/gui/tiles/pines3.png | Bin .../textures/gui/tiles/pines_hills.png | Bin .../textures/gui/tiles/pines_hills2.png | Bin .../textures/gui/tiles/pines_hills3.png | Bin .../textures/gui/tiles/plateau_grass.png | Bin .../textures/gui/tiles/plateau_grass2.png | Bin .../textures/gui/tiles/plateau_grass3.png | Bin .../textures/gui/tiles/plateau_mesa.png | Bin .../textures/gui/tiles/plateau_mesa2.png | Bin .../textures/gui/tiles/plateau_mesa_low.png | Bin .../textures/gui/tiles/plateau_mesa_low2.png | Bin .../textures/gui/tiles/plateau_savanna.png | Bin .../textures/gui/tiles/plateau_savanna2.png | Bin .../textures/gui/tiles/plateau_savanna3.png | Bin .../textures/gui/tiles/plateau_trees.png | Bin .../textures/gui/tiles/plateau_trees_low.png | Bin .../textures/gui/tiles/ravine.png | Bin .../textures/gui/tiles/ravine2.png | Bin .../textures/gui/tiles/rock_shore.png | Bin .../textures/gui/tiles/ruined_portal.png | Bin .../antiqueatlas/textures/gui/tiles/sand.png | Bin .../antiqueatlas/textures/gui/tiles/sand2.png | Bin .../antiqueatlas/textures/gui/tiles/sand3.png | Bin .../textures/gui/tiles/sand_bushes.png | Bin .../textures/gui/tiles/savanna.png | Bin .../textures/gui/tiles/savanna2.png | Bin .../textures/gui/tiles/savanna3.png | Bin .../textures/gui/tiles/savanna_cliffs.png | Bin .../textures/gui/tiles/savanna_cliffs2.png | Bin .../textures/gui/tiles/savanna_cliffs3.png | Bin .../gui/tiles/savanna_cliffs_clouds.png | Bin .../gui/tiles/savanna_cliffs_clouds2.png | Bin .../gui/tiles/savanna_cliffs_clouds3.png | Bin .../antiqueatlas/textures/gui/tiles/shore.png | Bin .../textures/gui/tiles/shore2.png | Bin .../textures/gui/tiles/shore3.png | Bin .../textures/gui/tiles/smithy.png | Bin .../antiqueatlas/textures/gui/tiles/snow.png | Bin .../antiqueatlas/textures/gui/tiles/snow1.png | Bin .../antiqueatlas/textures/gui/tiles/snow2.png | Bin .../antiqueatlas/textures/gui/tiles/snow3.png | Bin .../antiqueatlas/textures/gui/tiles/snow4.png | Bin .../antiqueatlas/textures/gui/tiles/snow5.png | Bin .../antiqueatlas/textures/gui/tiles/snow6.png | Bin .../textures/gui/tiles/snow_caps.png | Bin .../textures/gui/tiles/snow_hills.png | Bin .../textures/gui/tiles/snow_hills2.png | Bin .../textures/gui/tiles/snow_pines.png | Bin .../textures/gui/tiles/snow_pines2.png | Bin .../textures/gui/tiles/snow_pines3.png | Bin .../textures/gui/tiles/snow_pines_hills.png | Bin .../textures/gui/tiles/snow_pines_hills2.png | Bin .../textures/gui/tiles/snow_pines_hills3.png | Bin .../textures/gui/tiles/sunflowers.png | Bin .../textures/gui/tiles/sunflowers2.png | Bin .../antiqueatlas/textures/gui/tiles/swamp.png | Bin .../textures/gui/tiles/swamp2.png | Bin .../textures/gui/tiles/swamp3.png | Bin .../textures/gui/tiles/swamp4.png | Bin .../textures/gui/tiles/swamp5.png | Bin .../textures/gui/tiles/swamp6.png | Bin .../textures/gui/tiles/swamp_hills.png | Bin .../textures/gui/tiles/swamp_hills2.png | Bin .../textures/gui/tiles/swamp_hills3.png | Bin .../textures/gui/tiles/swamp_hills4.png | Bin .../textures/gui/tiles/swamp_hills5.png | Bin .../textures/gui/tiles/tall_birch.png | Bin .../textures/gui/tiles/tall_birch2.png | Bin .../textures/gui/tiles/tall_birch_hills.png | Bin .../textures/gui/tiles/tall_birch_hills2.png | Bin .../antiqueatlas/textures/gui/tiles/test.png | Bin .../textures/gui/tiles/village_path_x.png | Bin .../textures/gui/tiles/village_path_z.png | Bin .../textures/gui/tiles/village_torch.png | Bin .../antiqueatlas/textures/gui/tiles/water.png | Bin .../textures/gui/tiles/water2.png | Bin .../antiqueatlas/textures/gui/tiles/well.png | Bin .../textures/items/antique_atlas.png | Bin .../textures/items/empty_antique_atlas.png | Bin .../minecraft/atlas/tiles/badlands.json | 0 .../atlas/tiles/badlands_plateau.json | 0 .../minecraft/atlas/tiles/bamboo_jungle.json | 0 .../atlas/tiles/bamboo_jungle_hills.json | 0 .../minecraft/atlas/tiles/basalt_deltas.json | 0 .../assets/minecraft/atlas/tiles/beach.json | 0 .../minecraft/atlas/tiles/birch_forest.json | 0 .../atlas/tiles/birch_forest_hills.json | 0 .../minecraft/atlas/tiles/cold_ocean.json | 0 .../minecraft/atlas/tiles/crimson_forest.json | 0 .../minecraft/atlas/tiles/dark_forest.json | 0 .../atlas/tiles/dark_forest_hills.json | 0 .../atlas/tiles/deep_cold_ocean.json | 0 .../atlas/tiles/deep_frozen_ocean.json | 0 .../atlas/tiles/deep_lukewarm_ocean.json | 0 .../minecraft/atlas/tiles/deep_ocean.json | 0 .../atlas/tiles/deep_warm_ocean.json | 0 .../assets/minecraft/atlas/tiles/desert.json | 0 .../minecraft/atlas/tiles/desert_hills.json | 0 .../minecraft/atlas/tiles/desert_lakes.json | 0 .../minecraft/atlas/tiles/end_barrens.json | 0 .../minecraft/atlas/tiles/end_highlands.json | 0 .../minecraft/atlas/tiles/end_midlands.json | 0 .../atlas/tiles/eroded_badlands.json | 0 .../minecraft/atlas/tiles/flower_forest.json | 0 .../assets/minecraft/atlas/tiles/forest.json | 0 .../minecraft/atlas/tiles/frozen_ocean.json | 0 .../minecraft/atlas/tiles/frozen_peaks.json | 0 .../minecraft/atlas/tiles/frozen_river.json | 0 .../atlas/tiles/giant_spruce_taiga.json | 0 .../atlas/tiles/giant_spruce_taiga_hills.json | 0 .../atlas/tiles/giant_tree_taiga.json | 0 .../atlas/tiles/giant_tree_taiga_hills.json | 0 .../atlas/tiles/gravelly_mountains.json | 0 .../minecraft/atlas/tiles/ice_spikes.json | 0 .../minecraft/atlas/tiles/jagged_peaks.json | 0 .../assets/minecraft/atlas/tiles/jungle.json | 0 .../minecraft/atlas/tiles/jungle_edge.json | 0 .../minecraft/atlas/tiles/jungle_hills.json | 0 .../minecraft/atlas/tiles/lukewarm_ocean.json | 0 .../assets/minecraft/atlas/tiles/meadow.json | 0 .../tiles/modified_badlands_plateau.json | 0 .../tiles/modified_gravelly_mountains.json | 0 .../atlas/tiles/modified_jungle.json | 0 .../atlas/tiles/modified_jungle_edge.json | 0 .../modified_wooded_badlands_plateau.json | 0 .../minecraft/atlas/tiles/mountain_edge.json | 0 .../minecraft/atlas/tiles/mountains.json | 0 .../atlas/tiles/mushroom_field_shore.json | 0 .../atlas/tiles/mushroom_fields.json | 0 .../minecraft/atlas/tiles/nether_wastes.json | 0 .../assets/minecraft/atlas/tiles/ocean.json | 0 .../atlas/tiles/old_growth_birch_forest.json | 0 .../atlas/tiles/old_growth_pine_taiga.json | 0 .../atlas/tiles/old_growth_spruce_taiga.json | 0 .../assets/minecraft/atlas/tiles/plains.json | 0 .../assets/minecraft/atlas/tiles/river.json | 0 .../assets/minecraft/atlas/tiles/savanna.json | 0 .../atlas/tiles/savanna_plateau.json | 0 .../atlas/tiles/shattered_savanna.json | 0 .../tiles/shattered_savanna_plateau.json | 0 .../atlas/tiles/small_end_islands.json | 0 .../minecraft/atlas/tiles/snowy_beach.json | 0 .../atlas/tiles/snowy_mountains.json | 0 .../minecraft/atlas/tiles/snowy_plains.json | 0 .../minecraft/atlas/tiles/snowy_slopes.json | 0 .../minecraft/atlas/tiles/snowy_taiga.json | 0 .../atlas/tiles/snowy_taiga_hills.json | 0 .../atlas/tiles/snowy_taiga_mountains.json | 0 .../minecraft/atlas/tiles/snowy_tundra.json | 0 .../atlas/tiles/soul_sand_valley.json | 0 .../minecraft/atlas/tiles/stony_peaks.json | 0 .../minecraft/atlas/tiles/stony_shore.json | 0 .../atlas/tiles/sunflower_plains.json | 0 .../assets/minecraft/atlas/tiles/swamp.json | 0 .../minecraft/atlas/tiles/swamp_hills.json | 0 .../assets/minecraft/atlas/tiles/taiga.json | 0 .../minecraft/atlas/tiles/taiga_hills.json | 0 .../atlas/tiles/taiga_mountains.json | 0 .../atlas/tiles/tall_birch_forest.json | 0 .../atlas/tiles/tall_birch_hills.json | 0 .../assets/minecraft/atlas/tiles/the_end.json | 0 .../minecraft/atlas/tiles/the_void.json | 0 .../minecraft/atlas/tiles/warm_ocean.json | 0 .../minecraft/atlas/tiles/warped_forest.json | 0 .../atlas/tiles/windswept_forest.json | 0 .../atlas/tiles/windswept_gravelly_hills.json | 0 .../atlas/tiles/windswept_hills.json | 0 .../atlas/tiles/windswept_savanna.json | 0 .../atlas/tiles/wooded_badlands_plateau.json | 0 .../minecraft/atlas/tiles/wooded_hills.json | 0 .../atlas/tiles/wooded_mountains.json | 0 .../advancements/recipes/atlas.json | 0 .../advancements/recipes/atlas_new.json | 0 .../antiqueatlas/recipes/atlas_clone.json | 0 .../antiqueatlas/recipes/atlas_combine.json | 0 .../antiqueatlas/recipes/empty_atlas.json | 0 .../antiqueatlas/recipes/empty_atlas_new.json | 0 .../atlas/AntiqueAtlasClientModFabric.java | 12 + .../mc/impl/atlas/AntiqueAtlasModFabric.java | 12 + .../atlas/client/gui/AntiqueAtlasModMenu.java | 0 .../mixin/fabric/VolatileMixinPluginImpl.java | 10 + .../main/resources/antiqueatlas.mixins.json | 12 + .../src}/main/resources/fabric.mod.json | 17 +- forge/gradle.properties | 1 + .../mc/impl/atlas/AntiqueAtlasModForge.java | 35 ++ .../mixin/forge/VolatileMixinPluginImpl.java | 10 + forge/src/main/resources/META-INF/mods.toml | 44 ++ .../main/resources/antiqueatlas.mixins.json | 12 + forge/src/main/resources/pack.mcmeta | 6 + gradle.properties | 10 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 8 + .../atlas/event/MarkerClickedCallback.java | 22 - .../atlas/event/MarkerHoveredCallback.java | 18 - .../mc/impl/atlas/item/AntiqueAtlasItems.java | 31 -- .../NewPlayerConnectionCallback.java | 17 - .../NewServerConnectionCallback.java | 16 - .../atlas/network/AntiqueAtlasNetworking.java | 29 -- .../structure/StructureAddedCallback.java | 18 - .../StructurePieceAddedCallback.java | 19 - 669 files changed, 791 insertions(+), 715 deletions(-) rename {src => common/src}/main/java/hunternif/mc/api/AtlasAPI.java (100%) rename {src => common/src}/main/java/hunternif/mc/api/MarkerAPI.java (100%) rename {src => common/src}/main/java/hunternif/mc/api/TileAPI.java (100%) rename {src => common/src}/main/java/hunternif/mc/api/client/AtlasClientAPI.java (100%) rename {src => common/src}/main/java/hunternif/mc/api/client/ClientTileAPI.java (100%) rename {src => common/src}/main/java/hunternif/mc/api/package-info.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java (91%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java (87%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/ClientProxy.java (64%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/api/client/impl/MarkerApiImplClient.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/api/client/impl/TileApiImplClient.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java (96%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/api/impl/TileApiImpl.java (100%) create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/client/IResourceReloadListener.java rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java (56%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java (99%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/SetTileRenderer.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/SubTile.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/SubTileQuartet.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java (91%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TextureSet.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java (93%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TextureSetMap.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/Textures.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TileRenderIterator.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java (91%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/ExportProgressOverlay.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/ExportUpdateListener.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiArrowButton.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiAtlas.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiBlinkingMarker.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiBookmarkButton.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerBookmark.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerFinalizer.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerInList.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiPositionButton.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/GuiScaleBar.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/ProgressBarOverlay.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/AGuiScrollbar.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiBlinkingImage.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponent.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponentButton.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiCursor.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiHScrollbar.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiScrollingContainer.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiStates.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiToggleButton.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiVScrollbar.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiViewport.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/IButtonListener.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/ISelectListener.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/gui/core/ToggleGroup.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/texture/ATexture.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/texture/ITexture.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/texture/IconTexture.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/texture/Texture.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/client/texture/TileTexture.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/AtlasData.java (96%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java (89%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java (95%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/ITileStorage.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/PlayerEventHandler.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/TileDataHandler.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java (96%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/TileGroup.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/TileIdMap.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/TileInfo.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/WorldData.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/scaning/ITileDetector.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorBase.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorEnd.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorNether.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/scaning/TileHeightType.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/scaning/WorldScanner.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/core/watcher/DeathWatcher.java (100%) create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java rename {src => common/src}/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java (53%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedHandler.java (100%) create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java rename {src => common/src}/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java (97%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/item/EmptyAtlasItem.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java (93%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java (97%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/DimensionMarkersData.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersData.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java (96%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/Marker.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java (91%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java (95%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/MarkersDataHandler.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/marker/NetherPortalWatcher.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java (98%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinCartographyTableScreenHandler.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinClientPlayNetworkHandler.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinCraftingResultSlot.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinEntity.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinInGameHud.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinMinecraftClient.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntity.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntityDeath.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerManager.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java (85%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/dev/MixinCartographyTableHandlerSlot.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/prod/MixinCartographyTableHandlerSlot.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixin/structure/StructureStartMixin.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixinhooks/CartographyTableHooks.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/mixinhooks/EntityHooksAA.java (100%) create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/AntiqueAtlasPacket.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java (62%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java (66%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java (72%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java (68%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java (67%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java (58%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java (78%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java (77%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java (78%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java (79%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java (85%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java (87%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java (74%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java (80%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/registry/MarkerRenderInfo.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/registry/MarkerType.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/structure/EndCity.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/structure/NetherFortress.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/structure/Overworld.java (100%) create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java rename {src => common/src}/main/java/hunternif/mc/impl/atlas/structure/StructureHandler.java (100%) create mode 100644 common/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java rename {src => common/src}/main/java/hunternif/mc/impl/atlas/structure/Village.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/ArrayIterator.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/BitMatrix.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/ExportImageUtil.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/FileUtil.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/ListMapValueIterator.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/Log.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/MathUtil.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/Rect.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/RenderedImageScanned.java (100%) rename {src => common/src}/main/java/hunternif/mc/impl/atlas/util/Streams.java (100%) rename src/main/resources/antiqueatlas.mixins.json => common/src/main/resources/antiqueatlas-common.mixins.json (95%) rename {src => common/src}/main/resources/antiqueatlas.accesswidener (100%) rename {src => common/src}/main/resources/antiqueatlas_icon.png (100%) rename {src => common/src}/main/resources/antiqueatlas_logo.png (100%) create mode 100644 common/src/main/resources/architectury.common.json rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/bastion.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/bed.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/diamond.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/end_city.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/end_city_far.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/google.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/mansion.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/marker.json.example (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/monument.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/nether_portal.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/pickaxe.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/red_x_large.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/red_x_small.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/scroll.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/skull.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/sword.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/tomb.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/tower.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/markers/village.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/basalt_deltas.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/birch.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/birch_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/bryce.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/butchers_shop.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/cave_walls.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/church.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_birch.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/desert.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/desert_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island_plants.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/end_void.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_large.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_small.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/fence.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/forest.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_flowers.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/house.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/house_small.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/hut.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/ice.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/ice_spikes.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_cliffs.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/l_house.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/lava.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/lava_shore.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/library.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mesa.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_all.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_naked.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_snow_caps.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/mushroom.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_x.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_z.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_gate.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_x.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_z.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_fort_stairs.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_hall.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_throne.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_tower.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_wall.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/pines.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/pines_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plains.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_low.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees_low.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna_m.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/ravine.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/rock_shore.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/ruined_portal.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna_cliffs.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/shore.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/smithy.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/snow.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/soul_sand_valley.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/sunflowers.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_water.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch_hills.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/test.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_x.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_z.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/village_torch.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/water.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/texture_sets/well.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/end_island.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/end_island_plants.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/end_void.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/lava.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/lava_shore.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_x.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_z.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_gate.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_x.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_z.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_fort_stairs.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_hall.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_throne.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_tower.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/nether_wall.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_butchers_shop.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_church.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_large.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_small.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_hut.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_l_house.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_library.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_x.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_z.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_small_house.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_smithy.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_torch.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_well.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/ravine.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/ruined_portal.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/atlas/tiles/swamp_water.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/da_dk.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/de_de.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/en_us.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/es_ar.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/es_es.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/fr_fr.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/it_it.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/ja_jp.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/pt_br.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/ru_ru.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/zh_cn.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/lang/zh_tw.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/models/item/antique_atlas.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/models/item/empty_antique_atlas.json (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/book.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/book_frame.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/book_frame_narrow.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/bookmarks.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/bookmarks_l.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/eraser.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/exported_bg.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/icons/add_marker.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/icons/del_marker.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/icons/export.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/icons/hide_markers.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/icons/show_markers.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/marker_frame_off.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/marker_frame_on.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/bed.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/diamond.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/end_city.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_far.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_16.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_32.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/google_marker.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/nether_portal.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/ocean_monument.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/pickaxe.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_large.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_small.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/scroll.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/skull.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/sword.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/tomb.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/tower.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/unknown_marker.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/village.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/markers/woodland_mansion.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/navigate_arrows.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/player.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/position.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_128.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_16.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_256.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_32.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_512.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_64.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_8.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scrollbar_hor.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/scrollbar_ver.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns1.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns_lava1.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/birch.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/birch2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/bushes_cliffs.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/butchers_shop.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/cacti.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/cave_walls.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/church.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs_clouds.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_birch.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/end_void.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_l.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_s.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/fence.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/grass.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/grass2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/grass3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/grass4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_bushes.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_cacti.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_grass.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/house.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/house_small.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/hut.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_border.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_noborder.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/l_house.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/lava.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/lava2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/library.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains5.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_x.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_z.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_gate.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_x.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_z.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_fort_stairs.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_hall.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_throne.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_tower.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_wall.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/pines.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/pines2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/pines3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees_low.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/rock_shore.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/ruined_portal.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/sand.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/sand2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/sand3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/sand_bushes.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/shore.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/shore2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/shore3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/smithy.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow1.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow5.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow6.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_caps.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp5.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp6.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills3.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills4.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills5.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/test.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_x.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_z.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/village_torch.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/water.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/water2.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/gui/tiles/well.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/items/antique_atlas.png (100%) rename {src => common/src}/main/resources/assets/antiqueatlas/textures/items/empty_antique_atlas.png (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/badlands.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/badlands_plateau.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/basalt_deltas.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/beach.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/birch_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/birch_forest_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/cold_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/crimson_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/dark_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/dark_forest_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/deep_cold_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/deep_frozen_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/deep_lukewarm_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/deep_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/deep_warm_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/desert.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/desert_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/desert_lakes.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/end_barrens.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/end_highlands.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/end_midlands.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/eroded_badlands.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/flower_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/frozen_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/frozen_peaks.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/frozen_river.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/gravelly_mountains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/ice_spikes.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/jagged_peaks.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/jungle.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/jungle_edge.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/jungle_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/lukewarm_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/meadow.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/modified_badlands_plateau.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/modified_gravelly_mountains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/modified_jungle.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/modified_jungle_edge.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/modified_wooded_badlands_plateau.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/mountain_edge.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/mountains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/mushroom_field_shore.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/mushroom_fields.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/nether_wastes.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/old_growth_birch_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/old_growth_pine_taiga.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/old_growth_spruce_taiga.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/plains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/river.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/savanna.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/savanna_plateau.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/shattered_savanna.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/shattered_savanna_plateau.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/small_end_islands.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_beach.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_mountains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_plains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_slopes.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_taiga.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_mountains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/snowy_tundra.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/soul_sand_valley.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/stony_peaks.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/stony_shore.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/sunflower_plains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/swamp.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/swamp_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/taiga.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/taiga_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/taiga_mountains.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/tall_birch_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/tall_birch_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/the_end.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/the_void.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/warm_ocean.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/warped_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/windswept_forest.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/windswept_gravelly_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/windswept_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/windswept_savanna.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/wooded_badlands_plateau.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/wooded_hills.json (100%) rename {src => common/src}/main/resources/assets/minecraft/atlas/tiles/wooded_mountains.json (100%) rename {src => common/src}/main/resources/data/antiqueatlas/advancements/recipes/atlas.json (100%) rename {src => common/src}/main/resources/data/antiqueatlas/advancements/recipes/atlas_new.json (100%) rename {src => common/src}/main/resources/data/antiqueatlas/recipes/atlas_clone.json (100%) rename {src => common/src}/main/resources/data/antiqueatlas/recipes/atlas_combine.json (100%) rename {src => common/src}/main/resources/data/antiqueatlas/recipes/empty_atlas.json (100%) rename {src => common/src}/main/resources/data/antiqueatlas/recipes/empty_atlas_new.json (100%) create mode 100644 fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasClientModFabric.java create mode 100644 fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModFabric.java rename {src => fabric/src}/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java (100%) create mode 100644 fabric/src/main/java/hunternif/mc/impl/atlas/mixin/fabric/VolatileMixinPluginImpl.java create mode 100644 fabric/src/main/resources/antiqueatlas.mixins.json rename {src => fabric/src}/main/resources/fabric.mod.json (73%) create mode 100644 forge/gradle.properties create mode 100644 forge/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModForge.java create mode 100644 forge/src/main/java/hunternif/mc/impl/atlas/mixin/forge/VolatileMixinPluginImpl.java create mode 100644 forge/src/main/resources/META-INF/mods.toml create mode 100644 forge/src/main/resources/antiqueatlas.mixins.json create mode 100644 forge/src/main/resources/pack.mcmeta delete mode 100644 src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java delete mode 100644 src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java diff --git a/build.gradle b/build.gradle index be685e0cf..a1f6c0f26 100644 --- a/build.gradle +++ b/build.gradle @@ -1,101 +1,57 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' - id 'maven-publish' + id "architectury-plugin" version "3.4-SNAPSHOT" + id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 - -archivesBaseName = project.archives_base_name -version = project.mod_version + "-mc" + project.minecraft_version -group = project.maven_group - -loom { - accessWidenerPath = file("src/main/resources/antiqueatlas.accesswidener") +architectury { + minecraft = rootProject.minecraft_version } -repositories { - maven { - // for fabric - url = "https://maven.modmuss50.me/" - } - maven { - // for mod menu - url = uri("https://jitpack.io") - } - maven { - // for cloth-config - url = "https://maven.shedaniel.me/" - } - maven { - url = "https://maven.terraformersmc.com/releases" - } -} - -dependencies { - //to change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +subprojects { + apply plugin: "dev.architectury.loom" - modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}" + loom { + silentMojangMappingsLicense() + } - modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { - exclude(group: "net.fabricmc.fabric-api") + dependencies { + minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" + mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" } } -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { // add mod metadata - expand "version": project.version - } -} +allprojects { + apply plugin: "java" + apply plugin: "architectury-plugin" + apply plugin: "maven-publish" -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - it.options.release = 16 -} + archivesBaseName = rootProject.archives_base_name + version = rootProject.mod_version + "-" + project.name + "-mc" + rootProject.minecraft_version + group = rootProject.maven_group -java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() -} - -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}"} + repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + + maven { + // for cloth-config + url = "https://maven.shedaniel.me/" + } + maven { + // for mod menu + url = "https://maven.terraformersmc.com/releases" + } } -} -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + options.release = 17 } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. + java { + withSourcesJar() } } diff --git a/src/main/java/hunternif/mc/api/AtlasAPI.java b/common/src/main/java/hunternif/mc/api/AtlasAPI.java similarity index 100% rename from src/main/java/hunternif/mc/api/AtlasAPI.java rename to common/src/main/java/hunternif/mc/api/AtlasAPI.java diff --git a/src/main/java/hunternif/mc/api/MarkerAPI.java b/common/src/main/java/hunternif/mc/api/MarkerAPI.java similarity index 100% rename from src/main/java/hunternif/mc/api/MarkerAPI.java rename to common/src/main/java/hunternif/mc/api/MarkerAPI.java diff --git a/src/main/java/hunternif/mc/api/TileAPI.java b/common/src/main/java/hunternif/mc/api/TileAPI.java similarity index 100% rename from src/main/java/hunternif/mc/api/TileAPI.java rename to common/src/main/java/hunternif/mc/api/TileAPI.java diff --git a/src/main/java/hunternif/mc/api/client/AtlasClientAPI.java b/common/src/main/java/hunternif/mc/api/client/AtlasClientAPI.java similarity index 100% rename from src/main/java/hunternif/mc/api/client/AtlasClientAPI.java rename to common/src/main/java/hunternif/mc/api/client/AtlasClientAPI.java diff --git a/src/main/java/hunternif/mc/api/client/ClientTileAPI.java b/common/src/main/java/hunternif/mc/api/client/ClientTileAPI.java similarity index 100% rename from src/main/java/hunternif/mc/api/client/ClientTileAPI.java rename to common/src/main/java/hunternif/mc/api/client/ClientTileAPI.java diff --git a/src/main/java/hunternif/mc/api/package-info.java b/common/src/main/java/hunternif/mc/api/package-info.java similarity index 100% rename from src/main/java/hunternif/mc/api/package-info.java rename to common/src/main/java/hunternif/mc/api/package-info.java diff --git a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java b/common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java rename to common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java diff --git a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java b/common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java similarity index 91% rename from src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java rename to common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java index 7213143ce..dcef96517 100644 --- a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java @@ -1,5 +1,6 @@ package hunternif.mc.impl.atlas; +import dev.architectury.event.events.common.LifecycleEvent; import hunternif.mc.impl.atlas.core.TileDataHandler; import hunternif.mc.impl.atlas.core.scaning.TileDetectorBase; import hunternif.mc.impl.atlas.core.AtlasIdData; @@ -17,15 +18,13 @@ import hunternif.mc.impl.atlas.structure.*; import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; import net.minecraft.world.World; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class AntiqueAtlasMod implements ModInitializer { +public class AntiqueAtlasMod { public static final String ID = "antiqueatlas"; public static final String NAME = "Antique Atlas"; @@ -53,8 +52,7 @@ public static AtlasIdData getAtlasIdData(World world) { return ((ServerWorld) world).getPersistentStateManager().getOrCreate(AtlasIdData::fromNbt, AtlasIdData::new, "antiqueatlas:global_atlas_data"); } - @Override - public void onInitialize() { + public static void init() { TileDetectorBase.scanBiomeTypes(); AutoConfig.register(AntiqueAtlasConfig.class, JanksonConfigSerializer::new); @@ -72,8 +70,8 @@ public void onInitialize() { NewPlayerConnectionCallback.EVENT.register(globalTileData::onPlayerLogin); NewPlayerConnectionCallback.EVENT.register(PlayerEventHandler::onPlayerLogin); - ServerWorldEvents.LOAD.register(globalMarkersData::onWorldLoad); - ServerWorldEvents.LOAD.register(globalTileData::onWorldLoad); + LifecycleEvent.SERVER_LEVEL_LOAD.register(globalMarkersData::onWorldLoad); + LifecycleEvent.SERVER_LEVEL_LOAD.register(globalTileData::onWorldLoad); RecipeCraftedCallback.EVENT.register(new RecipeCraftedHandler()); diff --git a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java b/common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java similarity index 87% rename from src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java rename to common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java index 0c050d046..271a9740d 100644 --- a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModClient.java @@ -2,14 +2,13 @@ import hunternif.mc.impl.atlas.client.gui.GuiAtlas; import hunternif.mc.impl.atlas.network.AntiqueAtlasNetworking; -import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.item.ItemStack; @Environment(EnvType.CLIENT) -public class AntiqueAtlasModClient implements ClientModInitializer { +public class AntiqueAtlasModClient { private static GuiAtlas guiAtlas; @@ -37,8 +36,7 @@ private static void openAtlasGUI(GuiAtlas gui) { } } - @Override - public void onInitializeClient() { + public static void init() { ClientProxy clientProxy = new ClientProxy(); clientProxy.initClient(); diff --git a/src/main/java/hunternif/mc/impl/atlas/ClientProxy.java b/common/src/main/java/hunternif/mc/impl/atlas/ClientProxy.java similarity index 64% rename from src/main/java/hunternif/mc/impl/atlas/ClientProxy.java rename to common/src/main/java/hunternif/mc/impl/atlas/ClientProxy.java index 9b3be1db2..dc66dd9da 100644 --- a/src/main/java/hunternif/mc/impl/atlas/ClientProxy.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/ClientProxy.java @@ -1,47 +1,47 @@ package hunternif.mc.impl.atlas; +import dev.architectury.event.events.client.ClientTickEvent; +import dev.architectury.registry.ReloadListenerRegistry; import hunternif.mc.impl.atlas.client.*; import hunternif.mc.impl.atlas.marker.MarkerTextureConfig; import hunternif.mc.impl.atlas.registry.MarkerType; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.fabricmc.fabric.api.resource.ResourceManagerHelper; -import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener; import net.minecraft.client.world.ClientWorld; import net.minecraft.resource.ResourceManager; +import net.minecraft.resource.ResourceReloader; import net.minecraft.resource.ResourceType; import net.minecraft.util.Identifier; +import net.minecraft.util.profiler.Profiler; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + @Environment(EnvType.CLIENT) -public class ClientProxy implements SimpleSynchronousResourceReloadListener { +public class ClientProxy implements ResourceReloader { public void initClient() { // read Textures first from assets TextureConfig textureConfig = new TextureConfig(Textures.TILE_TEXTURES_MAP); - ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES) - .registerReloadListener(textureConfig); + ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, textureConfig); - // than read TextureSets + // then read TextureSets TextureSetMap textureSetMap = TextureSetMap.instance(); TextureSetConfig textureSetConfig = new TextureSetConfig(textureSetMap); - ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES) - .registerReloadListener(textureSetConfig); + ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, textureSetConfig); // After that, we can read the tile mappings TileTextureMap tileTextureMap = TileTextureMap.instance(); TileTextureConfig tileTextureConfig = new TileTextureConfig(tileTextureMap, textureSetMap); - ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES) - .registerReloadListener(tileTextureConfig); + ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, tileTextureConfig); // Legacy file name: - ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(this); + ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, this); MarkerTextureConfig markerTextureConfig = new MarkerTextureConfig(); - ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES) - .registerReloadListener(markerTextureConfig); + ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, markerTextureConfig); for (MarkerType type : MarkerType.REGISTRY) { type.initMips(); @@ -49,7 +49,7 @@ public void initClient() { if (!AntiqueAtlasMod.CONFIG.itemNeeded) { KeyHandler.registerBindings(); - ClientTickEvents.START_CLIENT_TICK.register(KeyHandler::onClientTick); + ClientTickEvent.CLIENT_POST.register(KeyHandler::onClientTick); } } @@ -82,15 +82,17 @@ public static void assignCustomBiomeTextures(ClientWorld world) { } @Override - public Identifier getFabricId() { - return AntiqueAtlasMod.id("proxy"); + public String getName() { + return AntiqueAtlasMod.id("proxy").toString(); } @Override - public void reload(ResourceManager var1) { - for (MarkerType type : MarkerType.REGISTRY) { - type.initMips(); - } - assignBiomeTextures(); + public CompletableFuture reload(ResourceReloader.Synchronizer synchronizer, ResourceManager manager, Profiler prepareProfiler, Profiler applyProfiler, Executor prepareExecutor, Executor applyExecutor) { + return CompletableFuture.completedFuture(null).thenCompose(synchronizer::whenPrepared).thenCompose(t -> CompletableFuture.runAsync(() -> { + for (MarkerType type : MarkerType.REGISTRY) { + type.initMips(); + } + assignBiomeTextures(); + })); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/api/client/impl/MarkerApiImplClient.java b/common/src/main/java/hunternif/mc/impl/atlas/api/client/impl/MarkerApiImplClient.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/api/client/impl/MarkerApiImplClient.java rename to common/src/main/java/hunternif/mc/impl/atlas/api/client/impl/MarkerApiImplClient.java diff --git a/src/main/java/hunternif/mc/impl/atlas/api/client/impl/TileApiImplClient.java b/common/src/main/java/hunternif/mc/impl/atlas/api/client/impl/TileApiImplClient.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/api/client/impl/TileApiImplClient.java rename to common/src/main/java/hunternif/mc/impl/atlas/api/client/impl/TileApiImplClient.java diff --git a/src/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java b/common/src/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java similarity index 96% rename from src/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java rename to common/src/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java index 110a33eb3..18b07e064 100644 --- a/src/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/api/impl/MarkerApiImpl.java @@ -72,7 +72,7 @@ private void doDeleteMarker(World world, int atlasID, int markerID) { AntiqueAtlasMod.markersData.getMarkersData(atlasID, world); data.removeMarker(markerID); - new DeleteMarkerS2CPacket(atlasID, markerID).send(world.getServer()); + new DeleteMarkerS2CPacket(atlasID, markerID).send(((ServerWorld) world).getServer()); } } } diff --git a/src/main/java/hunternif/mc/impl/atlas/api/impl/TileApiImpl.java b/common/src/main/java/hunternif/mc/impl/atlas/api/impl/TileApiImpl.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/api/impl/TileApiImpl.java rename to common/src/main/java/hunternif/mc/impl/atlas/api/impl/TileApiImpl.java diff --git a/common/src/main/java/hunternif/mc/impl/atlas/client/IResourceReloadListener.java b/common/src/main/java/hunternif/mc/impl/atlas/client/IResourceReloadListener.java new file mode 100644 index 000000000..438f08799 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/client/IResourceReloadListener.java @@ -0,0 +1,34 @@ +package hunternif.mc.impl.atlas.client; + +import net.minecraft.resource.ResourceManager; +import net.minecraft.resource.ResourceReloader; +import net.minecraft.util.profiler.Profiler; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +public interface IResourceReloadListener extends ResourceReloader +{ + + CompletableFuture load(ResourceManager manager, Profiler profiler, Executor executor); + + CompletableFuture apply(T data, + ResourceManager manager, + Profiler profiler, + Executor executor); + + + default CompletableFuture reload(ResourceReloader.Synchronizer synchronizer, + ResourceManager manager, + Profiler prepareProfiler, + Profiler applyProfiler, + Executor prepareExecutor, + Executor applyExecutor) + { + CompletableFuture load = load(manager, prepareProfiler, prepareExecutor); + + return load.thenCompose(synchronizer::whenPrepared) + .thenCompose(t -> apply(t, manager, applyProfiler, applyExecutor)); + } + +} \ No newline at end of file diff --git a/src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java similarity index 56% rename from src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java index 865b1c1b0..075701d23 100644 --- a/src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java @@ -1,40 +1,26 @@ package hunternif.mc.impl.atlas.client; +import dev.architectury.registry.client.keymappings.KeyMappingRegistry; import hunternif.mc.impl.atlas.AntiqueAtlasModClient; import hunternif.mc.impl.atlas.client.gui.GuiAtlas; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; -import java.util.ArrayList; -import java.util.List; @Environment(EnvType.CLIENT) public class KeyHandler { - /** - * ID's of keys - */ - private static final int KEY_ATLAS = 0; - - /** - * List of bindings (at this moment with only one binding) - */ - private static List bindings = new ArrayList<>(1); + public static final KeyBinding ATLAS_KEYMAPPING = new KeyBinding("key.openatlas.desc", InputUtil.Type.KEYSYM, 77, "key.antiqueatlas.category"); public static void registerBindings() { - // Initialisation of bindings - bindings.add(KEY_ATLAS, new KeyBinding("key.openatlas.desc", InputUtil.Type.KEYSYM, 77, "key.antiqueatlas.category")); - - // Registering all binding - bindings.forEach(KeyBindingHelper::registerKeyBinding); + KeyMappingRegistry.register(ATLAS_KEYMAPPING); } public static void onClientTick(MinecraftClient client) { - if (bindings.get(KEY_ATLAS).wasPressed()) { + while (ATLAS_KEYMAPPING.wasPressed()) { Screen currentScreen = MinecraftClient.getInstance().currentScreen; if (currentScreen instanceof GuiAtlas) { currentScreen.close(); diff --git a/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java b/common/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java similarity index 99% rename from src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java index 976a7d583..1036186d4 100644 --- a/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java @@ -53,7 +53,7 @@ public void drawOverlay(MatrixStack matrices, VertexConsumerProvider vertexConsu this.player = MinecraftClient.getInstance().player; this.world = MinecraftClient.getInstance().world; - if (!atlas.isEmpty() && atlas.getItem() == AntiqueAtlasItems.ATLAS) { + if (!atlas.isEmpty() && atlas.getItem() == AntiqueAtlasItems.ATLAS.get()) { int atlasID = AtlasItem.getAtlasID(atlas); drawMinimap(matrices, atlasID, vertexConsumer, light); } diff --git a/src/main/java/hunternif/mc/impl/atlas/client/SetTileRenderer.java b/common/src/main/java/hunternif/mc/impl/atlas/client/SetTileRenderer.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/SetTileRenderer.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/SetTileRenderer.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/SubTile.java b/common/src/main/java/hunternif/mc/impl/atlas/client/SubTile.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/SubTile.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/SubTile.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/SubTileQuartet.java b/common/src/main/java/hunternif/mc/impl/atlas/client/SubTileQuartet.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/SubTileQuartet.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/SubTileQuartet.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java similarity index 91% rename from src/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java index 51a6fd6cc..5e0c48c57 100644 --- a/src/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/client/TextureConfig.java @@ -6,7 +6,6 @@ import hunternif.mc.impl.atlas.util.Log; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.InvalidIdentifierException; @@ -26,7 +25,7 @@ * - The logical identifier modid:tex referenced by TextureSets */ @Environment(EnvType.CLIENT) -public class TextureConfig implements SimpleResourceReloadListener> { +public class TextureConfig implements IResourceReloadListener> { private final Map texture_map; public TextureConfig(Map texture_map) { @@ -70,7 +69,7 @@ public CompletableFuture apply(Map textures, Resourc } @Override - public Identifier getFabricId() { - return new Identifier("antiqueatlas:textures"); + public String getName() { + return AntiqueAtlasMod.id("textures").toString(); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TextureSet.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TextureSet.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/TextureSet.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TextureSet.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java similarity index 93% rename from src/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java index 8720ced03..5bafedcbc 100644 --- a/src/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/client/TextureSetConfig.java @@ -7,7 +7,6 @@ import hunternif.mc.impl.atlas.util.Log; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; @@ -24,7 +23,7 @@ * Saves texture set names with the lists of texture variations. */ @Environment(EnvType.CLIENT) -public class TextureSetConfig implements SimpleResourceReloadListener> { +public class TextureSetConfig implements IResourceReloadListener> { private static final int VERSION = 1; private static final JsonParser PARSER = new JsonParser(); private final TextureSetMap textureSetMap; @@ -147,12 +146,13 @@ public CompletableFuture apply(Collection sets, ResourceManage } @Override - public Identifier getFabricId() { - return new Identifier("antiqueatlas:texture_sets"); + public String getName() { + return AntiqueAtlasMod.id("texture_sets").toString(); } - @Override - public Collection getFabricDependencies() { - return Collections.singleton(new Identifier("antiqueatlas:textures")); - } + // TODO Fix dependencies +// @Override +// public Collection getFabricDependencies() { +// return Collections.singleton(new Identifier("antiqueatlas:textures")); +// } } diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TextureSetMap.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TextureSetMap.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/TextureSetMap.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TextureSetMap.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/Textures.java b/common/src/main/java/hunternif/mc/impl/atlas/client/Textures.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/Textures.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/Textures.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TileRenderIterator.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TileRenderIterator.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/TileRenderIterator.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TileRenderIterator.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java similarity index 91% rename from src/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java index c76e54959..d4ac7ef50 100644 --- a/src/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureConfig.java @@ -7,7 +7,6 @@ import hunternif.mc.impl.atlas.util.Log; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; @@ -15,8 +14,6 @@ import java.io.InputStream; import java.io.InputStreamReader; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -29,7 +26,7 @@ * @author Hunternif */ @Environment(EnvType.CLIENT) -public class TileTextureConfig implements SimpleResourceReloadListener> { +public class TileTextureConfig implements IResourceReloadListener> { private final TileTextureMap tileTextureMap; private final TextureSetMap textureSetMap; @@ -119,12 +116,13 @@ public CompletableFuture apply(Map tileMap, Resour } @Override - public Identifier getFabricId() { - return new Identifier("antiqueatlas:tile_textures"); + public String getName() { + return AntiqueAtlasMod.id("tile_textures").toString(); } - @Override - public Collection getFabricDependencies() { - return Collections.singleton(new Identifier("antiqueatlas:texture_sets")); - } + // TODO Fix dependencies +// @Override +// public Collection getFabricDependencies() { +// return Collections.singleton(new Identifier("antiqueatlas:texture_sets")); +// } } diff --git a/src/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/ExportProgressOverlay.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/ExportProgressOverlay.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/ExportProgressOverlay.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/ExportProgressOverlay.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/ExportUpdateListener.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/ExportUpdateListener.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/ExportUpdateListener.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/ExportUpdateListener.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiArrowButton.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiArrowButton.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiArrowButton.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiArrowButton.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiAtlas.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiAtlas.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiAtlas.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiAtlas.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBlinkingMarker.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBlinkingMarker.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBlinkingMarker.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBlinkingMarker.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBookmarkButton.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBookmarkButton.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBookmarkButton.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiBookmarkButton.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerBookmark.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerBookmark.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerBookmark.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerBookmark.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerFinalizer.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerFinalizer.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerFinalizer.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerFinalizer.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerInList.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerInList.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerInList.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiMarkerInList.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiPositionButton.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiPositionButton.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiPositionButton.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiPositionButton.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiScaleBar.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiScaleBar.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/GuiScaleBar.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiScaleBar.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/ProgressBarOverlay.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/ProgressBarOverlay.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/ProgressBarOverlay.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/ProgressBarOverlay.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/AGuiScrollbar.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/AGuiScrollbar.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/AGuiScrollbar.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/AGuiScrollbar.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiBlinkingImage.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiBlinkingImage.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiBlinkingImage.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiBlinkingImage.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponent.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponent.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponent.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponent.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponentButton.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponentButton.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponentButton.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiComponentButton.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiCursor.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiCursor.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiCursor.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiCursor.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiHScrollbar.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiHScrollbar.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiHScrollbar.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiHScrollbar.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiScrollingContainer.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiScrollingContainer.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiScrollingContainer.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiScrollingContainer.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiStates.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiStates.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiStates.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiStates.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiToggleButton.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiToggleButton.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiToggleButton.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiToggleButton.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiVScrollbar.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiVScrollbar.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiVScrollbar.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiVScrollbar.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiViewport.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiViewport.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiViewport.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/GuiViewport.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/IButtonListener.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/IButtonListener.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/IButtonListener.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/IButtonListener.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/ISelectListener.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/ISelectListener.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/ISelectListener.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/ISelectListener.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/core/ToggleGroup.java b/common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/ToggleGroup.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/core/ToggleGroup.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/gui/core/ToggleGroup.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/texture/ATexture.java b/common/src/main/java/hunternif/mc/impl/atlas/client/texture/ATexture.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/texture/ATexture.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/texture/ATexture.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/texture/ITexture.java b/common/src/main/java/hunternif/mc/impl/atlas/client/texture/ITexture.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/texture/ITexture.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/texture/ITexture.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/texture/IconTexture.java b/common/src/main/java/hunternif/mc/impl/atlas/client/texture/IconTexture.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/texture/IconTexture.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/texture/IconTexture.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/texture/Texture.java b/common/src/main/java/hunternif/mc/impl/atlas/client/texture/Texture.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/texture/Texture.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/texture/Texture.java diff --git a/src/main/java/hunternif/mc/impl/atlas/client/texture/TileTexture.java b/common/src/main/java/hunternif/mc/impl/atlas/client/texture/TileTexture.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/texture/TileTexture.java rename to common/src/main/java/hunternif/mc/impl/atlas/client/texture/TileTexture.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/AtlasData.java b/common/src/main/java/hunternif/mc/impl/atlas/core/AtlasData.java similarity index 96% rename from src/main/java/hunternif/mc/impl/atlas/core/AtlasData.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/AtlasData.java index 1c847129f..1fef75818 100644 --- a/src/main/java/hunternif/mc/impl/atlas/core/AtlasData.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/core/AtlasData.java @@ -2,9 +2,9 @@ import hunternif.mc.impl.atlas.network.packet.s2c.play.MapDataS2CPacket; import hunternif.mc.impl.atlas.util.Log; -import net.fabricmc.fabric.api.util.NbtType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtList; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; @@ -51,27 +51,30 @@ public AtlasData() { public static AtlasData fromNbt(NbtCompound compound) { AtlasData data = new AtlasData(); + data.updateFromNbt(compound); + return data; + } + + public void updateFromNbt(NbtCompound compound) { int version = compound.getInt(TAG_VERSION); if (version < VERSION) { Log.warn("Outdated atlas data format! Was %d but current is %d.", version, VERSION); - return data; + return; } - NbtList worldMapList = compound.getList(TAG_WORLD_MAP_LIST, NbtType.COMPOUND); + NbtList worldMapList = compound.getList(TAG_WORLD_MAP_LIST, NbtElement.COMPOUND_TYPE); for (int d = 0; d < worldMapList.size(); d++) { NbtCompound worldTag = worldMapList.getCompound(d); RegistryKey worldID; worldID = RegistryKey.of(Registry.WORLD_KEY, new Identifier(worldTag.getString(TAG_WORLD_ID))); NbtList dimensionTag = (NbtList) worldTag.get(TAG_VISITED_CHUNKS); - WorldData dimData = data.getWorldData(worldID); + WorldData dimData = this.getWorldData(worldID); dimData.readFromNBT(dimensionTag); double zoom = worldTag.getDouble(TAG_BROWSING_ZOOM); if (zoom == 0) zoom = 0.5; dimData.setBrowsingPosition(worldTag.getInt(TAG_BROWSING_X), worldTag.getInt(TAG_BROWSING_Y), zoom); } - - return data; } @Override diff --git a/src/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java b/common/src/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java similarity index 89% rename from src/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java index 273ab0cc9..a963f34ba 100644 --- a/src/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/core/AtlasIdData.java @@ -1,7 +1,7 @@ package hunternif.mc.impl.atlas.core; -import net.fabricmc.fabric.api.util.NbtType; import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; import net.minecraft.world.PersistentState; /** @@ -22,7 +22,7 @@ public int getNextAtlasId() { public static AtlasIdData fromNbt(NbtCompound compound) { AtlasIdData data = new AtlasIdData(); - if (compound.contains(TAG_NEXT_ID, NbtType.NUMBER)) { + if (compound.contains(TAG_NEXT_ID, NbtElement.NUMBER_TYPE)) { data.nextId = compound.getInt(TAG_NEXT_ID); } else { data.nextId = 1; diff --git a/src/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java similarity index 95% rename from src/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java index d3b166818..753d75015 100644 --- a/src/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/core/GlobalTileDataHandler.java @@ -21,7 +21,7 @@ public class GlobalTileDataHandler { private final Map, TileDataStorage> globalTileData = new ConcurrentHashMap<>(2, 0.75f, 2); - public void onWorldLoad(MinecraftServer server, ServerWorld world) { + public void onWorldLoad(ServerWorld world) { globalTileData.put(world.getRegistryKey(), world.getPersistentStateManager().getOrCreate(TileDataStorage::readNbt, () -> { TileDataStorage data = new TileDataStorage(); data.markDirty(); diff --git a/src/main/java/hunternif/mc/impl/atlas/core/ITileStorage.java b/common/src/main/java/hunternif/mc/impl/atlas/core/ITileStorage.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/ITileStorage.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/ITileStorage.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/PlayerEventHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/core/PlayerEventHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/PlayerEventHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/PlayerEventHandler.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/TileDataHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/core/TileDataHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/TileDataHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/TileDataHandler.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java b/common/src/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java similarity index 96% rename from src/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java index 8b0b93bf3..e02802957 100644 --- a/src/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/core/TileDataStorage.java @@ -3,9 +3,9 @@ import hunternif.mc.impl.atlas.network.packet.s2c.play.PutGlobalTileS2CPacket; import hunternif.mc.impl.atlas.util.Log; import hunternif.mc.impl.atlas.util.Streams; -import net.fabricmc.fabric.api.util.NbtType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtList; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; @@ -44,7 +44,7 @@ public static TileDataStorage readNbt(NbtCompound compound) { return data; } - NbtList tileList = compound.getList(TAG_TILE_LIST, NbtType.COMPOUND); + NbtList tileList = compound.getList(TAG_TILE_LIST, NbtElement.COMPOUND_TYPE); tileList.forEach(tag1 -> { NbtCompound tile = (NbtCompound) tag1; diff --git a/src/main/java/hunternif/mc/impl/atlas/core/TileGroup.java b/common/src/main/java/hunternif/mc/impl/atlas/core/TileGroup.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/TileGroup.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/TileGroup.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/TileIdMap.java b/common/src/main/java/hunternif/mc/impl/atlas/core/TileIdMap.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/TileIdMap.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/TileIdMap.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/TileInfo.java b/common/src/main/java/hunternif/mc/impl/atlas/core/TileInfo.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/TileInfo.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/TileInfo.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/WorldData.java b/common/src/main/java/hunternif/mc/impl/atlas/core/WorldData.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/WorldData.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/WorldData.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/scaning/ITileDetector.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scaning/ITileDetector.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/scaning/ITileDetector.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/scaning/ITileDetector.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorBase.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorBase.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorBase.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorBase.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorEnd.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorEnd.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorEnd.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorEnd.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorNether.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorNether.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorNether.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileDetectorNether.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileHeightType.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileHeightType.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/scaning/TileHeightType.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/scaning/TileHeightType.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/scaning/WorldScanner.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scaning/WorldScanner.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/scaning/WorldScanner.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/scaning/WorldScanner.java diff --git a/src/main/java/hunternif/mc/impl/atlas/core/watcher/DeathWatcher.java b/common/src/main/java/hunternif/mc/impl/atlas/core/watcher/DeathWatcher.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/core/watcher/DeathWatcher.java rename to common/src/main/java/hunternif/mc/impl/atlas/core/watcher/DeathWatcher.java diff --git a/common/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java new file mode 100644 index 000000000..c5d69aac6 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java @@ -0,0 +1,13 @@ +package hunternif.mc.impl.atlas.event; + +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; +import hunternif.mc.impl.atlas.marker.Marker; +import net.minecraft.entity.player.PlayerEntity; + +@FunctionalInterface +public interface MarkerClickedCallback { + Event EVENT = EventFactory.createLoop(); + + boolean onClicked(PlayerEntity player, Marker marker, int mouseState); +} diff --git a/common/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java new file mode 100644 index 000000000..225254473 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java @@ -0,0 +1,13 @@ +package hunternif.mc.impl.atlas.event; + +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; +import hunternif.mc.impl.atlas.marker.Marker; +import net.minecraft.entity.player.PlayerEntity; + +@FunctionalInterface +public interface MarkerHoveredCallback { + Event EVENT = EventFactory.createLoop(); + + void onHovered(PlayerEntity player, Marker marker); +} diff --git a/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java similarity index 53% rename from src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java rename to common/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java index a220c4aaf..9df72dfb8 100644 --- a/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedCallback.java @@ -1,7 +1,7 @@ package hunternif.mc.impl.atlas.event; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; @@ -19,18 +19,7 @@ */ public interface RecipeCraftedCallback { - Event EVENT = EventFactory.createArrayBacked(RecipeCraftedCallback.class, - (listeners) -> (player, world, recipe, result_stack, ingredients) -> { - for (RecipeCraftedCallback event : listeners) { - ActionResult result = event.onCrafted(player, world, recipe, result_stack, ingredients); - if (result != ActionResult.PASS) { - return result; - } - } - - return ActionResult.PASS; - } - ); + Event EVENT = EventFactory.createEventResult(RecipeCraftedCallback.class); ActionResult onCrafted(PlayerEntity player, World world, Recipe recipe, ItemStack result, Inventory ingredients); } diff --git a/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/event/RecipeCraftedHandler.java diff --git a/common/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java b/common/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java new file mode 100644 index 000000000..22bb14e73 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java @@ -0,0 +1,40 @@ +package hunternif.mc.impl.atlas.item; + +import dev.architectury.registry.registries.DeferredRegister; +import dev.architectury.registry.registries.RegistrySupplier; +import hunternif.mc.impl.atlas.AntiqueAtlasMod; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; + +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class AntiqueAtlasItems { + public static final DeferredRegister + ITEMS = DeferredRegister.create(AntiqueAtlasMod.ID, Registry.ITEM_KEY); + public static final DeferredRegister> + RECIPES = DeferredRegister.create(AntiqueAtlasMod.ID, Registry.RECIPE_SERIALIZER_KEY); + + public static final RegistrySupplier EMPTY_ATLAS = ITEMS.register("empty_antique_atlas", () -> new EmptyAtlasItem(new Item.Settings().group(ItemGroup.MISC))); + public static final RegistrySupplier ATLAS = ITEMS.register("antique_atlas", () -> new AtlasItem(new Item.Settings().maxCount(1))); + + public static ItemStack getAtlasFromId(int atlasID) { + ItemStack atlas = new ItemStack(ATLAS.get()); + atlas.getOrCreateNbt().putInt("atlasID", atlasID); + + return atlas; + } + + public static void register() { + if (AntiqueAtlasMod.CONFIG.itemNeeded) { + ITEMS.register(); + + RECIPES.register("atlas_clone", () -> RecipeAtlasCloning.SERIALIZER); + RECIPES.register("atlas_combine", () -> RecipeAtlasCombining.SERIALIZER); + + RECIPES.register(); + } + } +} diff --git a/src/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java b/common/src/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java similarity index 97% rename from src/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java rename to common/src/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java index 49fe3b643..a95ef6796 100644 --- a/src/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/item/AtlasItem.java @@ -26,6 +26,7 @@ import net.minecraft.world.World; import java.util.Collection; +import java.util.Objects; public class AtlasItem extends Item { @@ -96,7 +97,7 @@ public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, Collection newTiles = AntiqueAtlasMod.worldScanner.updateAtlasAroundPlayer(data, player); if (!newTiles.isEmpty()) { - new DimensionUpdateS2CPacket(atlasId, player.getEntityWorld().getRegistryKey(), newTiles).send(((ServerWorld)world).getServer()); + new DimensionUpdateS2CPacket(atlasId, player.getEntityWorld().getRegistryKey(), newTiles).send(Objects.requireNonNull(player.getServer())); } } } diff --git a/src/main/java/hunternif/mc/impl/atlas/item/EmptyAtlasItem.java b/common/src/main/java/hunternif/mc/impl/atlas/item/EmptyAtlasItem.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/item/EmptyAtlasItem.java rename to common/src/main/java/hunternif/mc/impl/atlas/item/EmptyAtlasItem.java diff --git a/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java b/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java similarity index 93% rename from src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java rename to common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java index d6e3e0360..796f3b26d 100644 --- a/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java @@ -32,13 +32,13 @@ public boolean matches(CraftingInventory inv, World world) { ItemStack stack = inv.getStack(j); if (!stack.isEmpty()) { - if (stack.getItem() == AntiqueAtlasItems.ATLAS) { + if (stack.getItem() == AntiqueAtlasItems.ATLAS.get()) { if (!filledAtlas.isEmpty()) { return false; } filledAtlas = stack; } else { - if (stack.getItem() != AntiqueAtlasItems.EMPTY_ATLAS) { + if (stack.getItem() != AntiqueAtlasItems.EMPTY_ATLAS.get()) { return false; } i++; @@ -58,13 +58,13 @@ public ItemStack craft(CraftingInventory inv) { ItemStack stack = inv.getStack(j); if (!stack.isEmpty()) { - if (stack.getItem() == AntiqueAtlasItems.ATLAS) { + if (stack.getItem() == AntiqueAtlasItems.ATLAS.get()) { if (!filledAtlas.isEmpty()) { return ItemStack.EMPTY; } filledAtlas = stack; } else { - if (stack.getItem() != AntiqueAtlasItems.EMPTY_ATLAS) { + if (stack.getItem() != AntiqueAtlasItems.EMPTY_ATLAS.get()) { return ItemStack.EMPTY; } i++; @@ -73,7 +73,7 @@ public ItemStack craft(CraftingInventory inv) { } if (!filledAtlas.isEmpty() && i >= 1) { - ItemStack newAtlas = new ItemStack(AntiqueAtlasItems.ATLAS, i + 1); + ItemStack newAtlas = new ItemStack(AntiqueAtlasItems.ATLAS.get(), i + 1); newAtlas.getOrCreateNbt().putInt("atlasID", AtlasItem.getAtlasID(filledAtlas)); if (filledAtlas.hasCustomName()) { diff --git a/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java b/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java similarity index 97% rename from src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java rename to common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java index 89f9d1d35..42288fb3b 100644 --- a/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java @@ -47,7 +47,7 @@ private boolean matches(CraftingInventory inv) { for (int i = 0; i < inv.size(); ++i) { ItemStack stack = inv.getStack(i); if (!stack.isEmpty()) { - if (stack.getItem() == AntiqueAtlasItems.ATLAS) { + if (stack.getItem() == AntiqueAtlasItems.ATLAS.get()) { atlasesFound++; } } @@ -81,7 +81,7 @@ public boolean fits(int width, int height) { @Override public ItemStack getOutput() { - return new ItemStack(AntiqueAtlasItems.ATLAS); + return new ItemStack(AntiqueAtlasItems.ATLAS.get()); } @Override diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/DimensionMarkersData.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/DimensionMarkersData.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/marker/DimensionMarkersData.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/DimensionMarkersData.java diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersData.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersData.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersData.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersData.java diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java similarity index 96% rename from src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java index f8efb3bdf..f99beea45 100644 --- a/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/marker/GlobalMarkersDataHandler.java @@ -22,7 +22,7 @@ public class GlobalMarkersDataHandler { private GlobalMarkersData data; - public void onWorldLoad(MinecraftServer server, ServerWorld world) { + public void onWorldLoad(ServerWorld world) { if (world.getRegistryKey() == World.OVERWORLD) { data = world.getPersistentStateManager().getOrCreate(GlobalMarkersData::readNbt, () -> { GlobalMarkersData data = new GlobalMarkersData(); diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/Marker.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/Marker.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/marker/Marker.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/Marker.java diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java similarity index 91% rename from src/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java index 49e3d3631..040eac583 100644 --- a/src/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/marker/MarkerTextureConfig.java @@ -3,10 +3,10 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import hunternif.mc.impl.atlas.AntiqueAtlasMod; +import hunternif.mc.impl.atlas.client.IResourceReloadListener; import hunternif.mc.impl.atlas.registry.MarkerType; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; @@ -25,7 +25,7 @@ * @author Hunternif */ @Environment(EnvType.CLIENT) -public class MarkerTextureConfig implements SimpleResourceReloadListener> { +public class MarkerTextureConfig implements IResourceReloadListener> { private static final int VERSION = 1; private static final JsonParser parser = new JsonParser(); @@ -78,7 +78,7 @@ public CompletableFuture apply(Map data, ResourceM } @Override - public Identifier getFabricId() { - return new Identifier("antiqueatlas:markers"); + public String getName() { + return AntiqueAtlasMod.id("markers").toString(); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java similarity index 95% rename from src/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java index 43ddffaa5..aa712b272 100644 --- a/src/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/marker/MarkersData.java @@ -1,237 +1,237 @@ -package hunternif.mc.impl.atlas.marker; - -import hunternif.mc.impl.atlas.AntiqueAtlasMod; -import hunternif.mc.api.MarkerAPI; -import hunternif.mc.impl.atlas.network.packet.s2c.play.PutMarkersS2CPacket; -import hunternif.mc.impl.atlas.util.Log; -import net.fabricmc.fabric.api.util.NbtType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtList; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.PersistentState; -import net.minecraft.world.World; - -import java.util.*; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * Contains markers, mapped to dimensions, and then to their chunk coordinates. - *

- * On the server a separate instance of MarkersData contains all the global - * markers, which are also copied to atlases, but not saved with them. - * At runtime clients have both types of markers in the same collection.. - *

- * @author Hunternif - */ -public class MarkersData extends PersistentState { - private static final int VERSION = 4; - private static final String TAG_VERSION = "aaVersion"; - private static final String TAG_WORLD_MAP_LIST = "worldMap"; - private static final String TAG_WORLD_ID = "worldID"; - private static final String TAG_MARKERS = "markers"; - private static final String TAG_MARKER_ID = "id"; - private static final String TAG_MARKER_TYPE = "markerType"; - private static final String TAG_MARKER_LABEL = "label"; - private static final String TAG_MARKER_X = "x"; - private static final String TAG_MARKER_Y = "y"; - private static final String TAG_MARKER_VISIBLE_AHEAD = "visAh"; - - /** Markers are stored in lists within square areas this many MC chunks - * across. */ - public static final int CHUNK_STEP = 8; - - /** Set of players this data has been sent to, only once after they connect. */ - private final Set playersSentTo = new HashSet<>(); - - private final AtomicInteger largestID = new AtomicInteger(0); - - private int getNewID() { - return largestID.incrementAndGet(); - } - - private final Map idMap = new ConcurrentHashMap<>(2, 0.75f, 2); - /** - * Maps a list of markers in a square to the square's coordinates, then to - * dimension ID. It exists in case someone needs to quickly find markers - * located in a square. - * Within the list markers are ordered by the Z coordinate, so that markers - * placed closer to the south will appear in front of those placed closer to - * the north. - * TODO: consider using Quad-tree. At small zoom levels iterating through - * chunks to render markers gets very slow. - */ - private final Map, DimensionMarkersData> worldMap = - new ConcurrentHashMap<>(2, 0.75f, 2); - - public MarkersData() { - } - - public static MarkersData fromNbt(NbtCompound compound) { - MarkersData data = new MarkersData(); - doReadNbt(compound, data); - return data; - } - - protected static void doReadNbt(NbtCompound compound, MarkersData data) { - - int version = compound.getInt(TAG_VERSION); - if (version < VERSION) { - Log.warn("Outdated atlas data format! Was %d but current is %d", version, VERSION); - return; - } - - NbtList dimensionMapList = compound.getList(TAG_WORLD_MAP_LIST, NbtType.COMPOUND); - for (int d = 0; d < dimensionMapList.size(); d++) { - NbtCompound tag = dimensionMapList.getCompound(d); - RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, new Identifier(tag.getString(TAG_WORLD_ID))); - - NbtList tagList = tag.getList(TAG_MARKERS, NbtType.COMPOUND); - for (int i = 0; i < tagList.size(); i++) { - NbtCompound markerTag = tagList.getCompound(i); - boolean visibleAhead = markerTag.getBoolean(TAG_MARKER_VISIBLE_AHEAD); - - int id = markerTag.getInt(TAG_MARKER_ID); - if (data.getMarkerByID(id) != null) { - Log.warn("Loading marker with duplicate id %d. Getting new id", id); - id = data.getNewID(); - } - data.markDirty(); - if (data.largestID.intValue() < id) { - data.largestID.set(id); - } - - Marker marker = new Marker( - id, - new Identifier(markerTag.getString(TAG_MARKER_TYPE)), - Text.Serializer.fromJson(markerTag.getString(TAG_MARKER_LABEL)), - world, - markerTag.getInt(TAG_MARKER_X), - markerTag.getInt(TAG_MARKER_Y), - visibleAhead); - data.loadMarker(marker); - } - } - } - - @Override - public NbtCompound writeNbt(NbtCompound compound) { - Log.info("Saving local markers data to NBT"); - compound.putInt(TAG_VERSION, VERSION); - NbtList dimensionMapList = new NbtList(); - for (RegistryKey world : worldMap.keySet()) { - NbtCompound tag = new NbtCompound(); - tag.putString(TAG_WORLD_ID, world.getValue().toString()); - DimensionMarkersData data = getMarkersDataInWorld(world); - NbtList tagList = new NbtList(); - for (Marker marker : data.getAllMarkers()) { - NbtCompound markerTag = new NbtCompound(); - markerTag.putInt(TAG_MARKER_ID, marker.getId()); - markerTag.putString(TAG_MARKER_TYPE, marker.getType().toString()); - markerTag.putString(TAG_MARKER_LABEL, Text.Serializer.toJson(marker.getLabel())); - markerTag.putInt(TAG_MARKER_X, marker.getX()); - markerTag.putInt(TAG_MARKER_Y, marker.getZ()); - markerTag.putBoolean(TAG_MARKER_VISIBLE_AHEAD, marker.isVisibleAhead()); - tagList.add(markerTag); - } - tag.put(TAG_MARKERS, tagList); - dimensionMapList.add(tag); - } - compound.put(TAG_WORLD_MAP_LIST, dimensionMapList); - - return compound; - } - - public Set> getVisitedDimensions() { - return worldMap.keySet(); - } - - /** This method is rather inefficient, use it sparingly. */ - public Collection getMarkersInWorld(RegistryKey world) { - return getMarkersDataInWorld(world).getAllMarkers(); - } - - /** Creates a new instance of {@link DimensionMarkersData}, if necessary. */ - public DimensionMarkersData getMarkersDataInWorld(RegistryKey world) { - return worldMap.computeIfAbsent(world, k -> new DimensionMarkersData(this, world)); - } - - /** The "chunk" here is {@link MarkersData#CHUNK_STEP} times larger than the - * Minecraft 16x16 chunk! May return null. */ - public List getMarkersAtChunk(RegistryKey world, int x, int z) { - return getMarkersDataInWorld(world).getMarkersAtChunk(x, z); - } - - private Marker getMarkerByID(int id) { - return idMap.get(id); - } - public Marker removeMarker(int id) { - Marker marker = getMarkerByID(id); - if (marker == null) return null; - if (idMap.remove(id) != null) { - getMarkersDataInWorld(marker.getWorld()).removeMarker(marker); - markDirty(); - } - return marker; - } - - /** For internal use. Use the {@link MarkerAPI} to put markers! This method - * creates a new marker from the given data, saves and returns it. - * Server side only! */ - public Marker createAndSaveMarker(Identifier type, RegistryKey world, int x, int z, boolean visibleAhead, Text label) { - Marker marker = new Marker(getNewID(), type, label, world, x, z, visibleAhead); - Log.info("Created new marker %s", marker.toString()); - idMap.put(marker.getId(), marker); - getMarkersDataInWorld(world).insertMarker(marker); - markDirty(); - return marker; - } - - /** - * For internal use, when markers are loaded from NBT or sent from the - * server. IF a marker's id is conflicting, the marker will not load! - * @return the marker instance that was added. - */ - public Marker loadMarker(Marker marker) { - if (!idMap.containsKey(marker.getId())) { - idMap.put(marker.getId(), marker); - int totalMarkers = 0; - for (Entry, DimensionMarkersData> e: worldMap.entrySet()){ - totalMarkers += e.getValue().getAllMarkers().size(); - } - if (totalMarkers < AntiqueAtlasMod.CONFIG.markerLimit){ - getMarkersDataInWorld(marker.getWorld()).insertMarker(marker); - } else { - Log.warn("Could not add new marker. Atlas is at it's limit of %d markers", AntiqueAtlasMod.CONFIG.markerLimit); - } - } - return marker; - } - - public boolean isSyncedOnPlayer(PlayerEntity player) { - return playersSentTo.contains(player); - } - - /** Send all data to the player in several packets. Called once during the - * first run of ItemAtals.onUpdate(). */ - public void syncOnPlayer(int atlasID, ServerPlayerEntity player) { - for (RegistryKey world : worldMap.keySet()) { - DimensionMarkersData data = getMarkersDataInWorld(world); - - new PutMarkersS2CPacket(atlasID, world, data.getAllMarkers()).send(player); - } - Log.info("Sent markers data #%d to player %s", atlasID, player.getCommandSource().getName()); - playersSentTo.add(player); - } - - public boolean isEmpty() { - return idMap.isEmpty(); - } - -} +package hunternif.mc.impl.atlas.marker; + +import hunternif.mc.impl.atlas.AntiqueAtlasMod; +import hunternif.mc.api.MarkerAPI; +import hunternif.mc.impl.atlas.network.packet.s2c.play.PutMarkersS2CPacket; +import hunternif.mc.impl.atlas.util.Log; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; +import net.minecraft.nbt.NbtList; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.PersistentState; +import net.minecraft.world.World; + +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Contains markers, mapped to dimensions, and then to their chunk coordinates. + *

+ * On the server a separate instance of MarkersData contains all the global + * markers, which are also copied to atlases, but not saved with them. + * At runtime clients have both types of markers in the same collection.. + *

+ * @author Hunternif + */ +public class MarkersData extends PersistentState { + private static final int VERSION = 4; + private static final String TAG_VERSION = "aaVersion"; + private static final String TAG_WORLD_MAP_LIST = "worldMap"; + private static final String TAG_WORLD_ID = "worldID"; + private static final String TAG_MARKERS = "markers"; + private static final String TAG_MARKER_ID = "id"; + private static final String TAG_MARKER_TYPE = "markerType"; + private static final String TAG_MARKER_LABEL = "label"; + private static final String TAG_MARKER_X = "x"; + private static final String TAG_MARKER_Y = "y"; + private static final String TAG_MARKER_VISIBLE_AHEAD = "visAh"; + + /** Markers are stored in lists within square areas this many MC chunks + * across. */ + public static final int CHUNK_STEP = 8; + + /** Set of players this data has been sent to, only once after they connect. */ + private final Set playersSentTo = new HashSet<>(); + + private final AtomicInteger largestID = new AtomicInteger(0); + + private int getNewID() { + return largestID.incrementAndGet(); + } + + private final Map idMap = new ConcurrentHashMap<>(2, 0.75f, 2); + /** + * Maps a list of markers in a square to the square's coordinates, then to + * dimension ID. It exists in case someone needs to quickly find markers + * located in a square. + * Within the list markers are ordered by the Z coordinate, so that markers + * placed closer to the south will appear in front of those placed closer to + * the north. + * TODO: consider using Quad-tree. At small zoom levels iterating through + * chunks to render markers gets very slow. + */ + private final Map, DimensionMarkersData> worldMap = + new ConcurrentHashMap<>(2, 0.75f, 2); + + public MarkersData() { + } + + public static MarkersData fromNbt(NbtCompound compound) { + MarkersData data = new MarkersData(); + doReadNbt(compound, data); + return data; + } + + protected static void doReadNbt(NbtCompound compound, MarkersData data) { + + int version = compound.getInt(TAG_VERSION); + if (version < VERSION) { + Log.warn("Outdated atlas data format! Was %d but current is %d", version, VERSION); + return; + } + + NbtList dimensionMapList = compound.getList(TAG_WORLD_MAP_LIST, NbtElement.COMPOUND_TYPE); + for (int d = 0; d < dimensionMapList.size(); d++) { + NbtCompound tag = dimensionMapList.getCompound(d); + RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, new Identifier(tag.getString(TAG_WORLD_ID))); + + NbtList tagList = tag.getList(TAG_MARKERS, NbtElement.COMPOUND_TYPE); + for (int i = 0; i < tagList.size(); i++) { + NbtCompound markerTag = tagList.getCompound(i); + boolean visibleAhead = markerTag.getBoolean(TAG_MARKER_VISIBLE_AHEAD); + + int id = markerTag.getInt(TAG_MARKER_ID); + if (data.getMarkerByID(id) != null) { + Log.warn("Loading marker with duplicate id %d. Getting new id", id); + id = data.getNewID(); + } + data.markDirty(); + if (data.largestID.intValue() < id) { + data.largestID.set(id); + } + + Marker marker = new Marker( + id, + new Identifier(markerTag.getString(TAG_MARKER_TYPE)), + Text.Serializer.fromJson(markerTag.getString(TAG_MARKER_LABEL)), + world, + markerTag.getInt(TAG_MARKER_X), + markerTag.getInt(TAG_MARKER_Y), + visibleAhead); + data.loadMarker(marker); + } + } + } + + @Override + public NbtCompound writeNbt(NbtCompound compound) { + Log.info("Saving local markers data to NBT"); + compound.putInt(TAG_VERSION, VERSION); + NbtList dimensionMapList = new NbtList(); + for (RegistryKey world : worldMap.keySet()) { + NbtCompound tag = new NbtCompound(); + tag.putString(TAG_WORLD_ID, world.getValue().toString()); + DimensionMarkersData data = getMarkersDataInWorld(world); + NbtList tagList = new NbtList(); + for (Marker marker : data.getAllMarkers()) { + NbtCompound markerTag = new NbtCompound(); + markerTag.putInt(TAG_MARKER_ID, marker.getId()); + markerTag.putString(TAG_MARKER_TYPE, marker.getType().toString()); + markerTag.putString(TAG_MARKER_LABEL, Text.Serializer.toJson(marker.getLabel())); + markerTag.putInt(TAG_MARKER_X, marker.getX()); + markerTag.putInt(TAG_MARKER_Y, marker.getZ()); + markerTag.putBoolean(TAG_MARKER_VISIBLE_AHEAD, marker.isVisibleAhead()); + tagList.add(markerTag); + } + tag.put(TAG_MARKERS, tagList); + dimensionMapList.add(tag); + } + compound.put(TAG_WORLD_MAP_LIST, dimensionMapList); + + return compound; + } + + public Set> getVisitedDimensions() { + return worldMap.keySet(); + } + + /** This method is rather inefficient, use it sparingly. */ + public Collection getMarkersInWorld(RegistryKey world) { + return getMarkersDataInWorld(world).getAllMarkers(); + } + + /** Creates a new instance of {@link DimensionMarkersData}, if necessary. */ + public DimensionMarkersData getMarkersDataInWorld(RegistryKey world) { + return worldMap.computeIfAbsent(world, k -> new DimensionMarkersData(this, world)); + } + + /** The "chunk" here is {@link MarkersData#CHUNK_STEP} times larger than the + * Minecraft 16x16 chunk! May return null. */ + public List getMarkersAtChunk(RegistryKey world, int x, int z) { + return getMarkersDataInWorld(world).getMarkersAtChunk(x, z); + } + + private Marker getMarkerByID(int id) { + return idMap.get(id); + } + public Marker removeMarker(int id) { + Marker marker = getMarkerByID(id); + if (marker == null) return null; + if (idMap.remove(id) != null) { + getMarkersDataInWorld(marker.getWorld()).removeMarker(marker); + markDirty(); + } + return marker; + } + + /** For internal use. Use the {@link MarkerAPI} to put markers! This method + * creates a new marker from the given data, saves and returns it. + * Server side only! */ + public Marker createAndSaveMarker(Identifier type, RegistryKey world, int x, int z, boolean visibleAhead, Text label) { + Marker marker = new Marker(getNewID(), type, label, world, x, z, visibleAhead); + Log.info("Created new marker %s", marker.toString()); + idMap.put(marker.getId(), marker); + getMarkersDataInWorld(world).insertMarker(marker); + markDirty(); + return marker; + } + + /** + * For internal use, when markers are loaded from NBT or sent from the + * server. IF a marker's id is conflicting, the marker will not load! + * @return the marker instance that was added. + */ + public Marker loadMarker(Marker marker) { + if (!idMap.containsKey(marker.getId())) { + idMap.put(marker.getId(), marker); + int totalMarkers = 0; + for (Entry, DimensionMarkersData> e: worldMap.entrySet()){ + totalMarkers += e.getValue().getAllMarkers().size(); + } + if (totalMarkers < AntiqueAtlasMod.CONFIG.markerLimit){ + getMarkersDataInWorld(marker.getWorld()).insertMarker(marker); + } else { + Log.warn("Could not add new marker. Atlas is at it's limit of %d markers", AntiqueAtlasMod.CONFIG.markerLimit); + } + } + return marker; + } + + public boolean isSyncedOnPlayer(PlayerEntity player) { + return playersSentTo.contains(player); + } + + /** Send all data to the player in several packets. Called once during the + * first run of ItemAtlas.onUpdate(). */ + public void syncOnPlayer(int atlasID, ServerPlayerEntity player) { + for (RegistryKey world : worldMap.keySet()) { + DimensionMarkersData data = getMarkersDataInWorld(world); + + new PutMarkersS2CPacket(atlasID, world, data.getAllMarkers()).send(player); + } + Log.info("Sent markers data #%d to player %s", atlasID, player.getCommandSource().getName()); + playersSentTo.add(player); + } + + public boolean isEmpty() { + return idMap.isEmpty(); + } + +} diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/MarkersDataHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/MarkersDataHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/marker/MarkersDataHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/MarkersDataHandler.java diff --git a/src/main/java/hunternif/mc/impl/atlas/marker/NetherPortalWatcher.java b/common/src/main/java/hunternif/mc/impl/atlas/marker/NetherPortalWatcher.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/marker/NetherPortalWatcher.java rename to common/src/main/java/hunternif/mc/impl/atlas/marker/NetherPortalWatcher.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java similarity index 98% rename from src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java index 485401835..d96e7079b 100644 --- a/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java @@ -48,7 +48,7 @@ public abstract class HeldItemRendererMixin { @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isEmpty()Z", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) private void renderAtlas(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci, boolean bl, Arm arm) { - if (item.getItem() == AntiqueAtlasItems.ATLAS) { + if (item.getItem() == AntiqueAtlasItems.ATLAS.get()) { if (bl && this.offHand.isEmpty()) { renderAtlasInBothHands(matrices, vertexConsumers, light, pitch, equipProgress, swingProgress); } else { diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinCartographyTableScreenHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinCartographyTableScreenHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinCartographyTableScreenHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinCartographyTableScreenHandler.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinClientPlayNetworkHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinClientPlayNetworkHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinClientPlayNetworkHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinClientPlayNetworkHandler.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinCraftingResultSlot.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinCraftingResultSlot.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinCraftingResultSlot.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinCraftingResultSlot.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinEntity.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinEntity.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinEntity.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinEntity.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinInGameHud.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinInGameHud.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinInGameHud.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinInGameHud.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinMinecraftClient.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinMinecraftClient.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinMinecraftClient.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinMinecraftClient.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntity.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntity.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntity.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntity.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntityDeath.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntityDeath.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntityDeath.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerEntityDeath.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerManager.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerManager.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerManager.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/MixinPlayerManager.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java similarity index 85% rename from src/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java index 7fece2ab1..896be259e 100644 --- a/src/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/mixin/VolatileMixinPlugin.java @@ -7,7 +7,7 @@ * License: MIT */ -import net.fabricmc.loader.api.FabricLoader; +import dev.architectury.injectables.annotations.ExpectPlatform; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -25,12 +25,16 @@ public String getRefMapperConfig() { return null; } + @ExpectPlatform + public static boolean isDevelopmentEnvironment() { + throw new AssertionError("Not implemented"); + } + @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - boolean isDevelopmentEnvironment = FabricLoader.getInstance().isDevelopmentEnvironment(); - if (mixinClassName.contains("mixin.dev") && !isDevelopmentEnvironment) + if (mixinClassName.contains("mixin.dev") && !isDevelopmentEnvironment()) return false; - else return !mixinClassName.contains("mixin.prod") || !isDevelopmentEnvironment; + else return !mixinClassName.contains("mixin.prod") || !isDevelopmentEnvironment(); } @Override diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/dev/MixinCartographyTableHandlerSlot.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/dev/MixinCartographyTableHandlerSlot.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/dev/MixinCartographyTableHandlerSlot.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/dev/MixinCartographyTableHandlerSlot.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/prod/MixinCartographyTableHandlerSlot.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/prod/MixinCartographyTableHandlerSlot.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/prod/MixinCartographyTableHandlerSlot.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/prod/MixinCartographyTableHandlerSlot.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixin/structure/StructureStartMixin.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/structure/StructureStartMixin.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixin/structure/StructureStartMixin.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixin/structure/StructureStartMixin.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixinhooks/CartographyTableHooks.java b/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/CartographyTableHooks.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixinhooks/CartographyTableHooks.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/CartographyTableHooks.java diff --git a/src/main/java/hunternif/mc/impl/atlas/mixinhooks/EntityHooksAA.java b/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/EntityHooksAA.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/mixinhooks/EntityHooksAA.java rename to common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/EntityHooksAA.java diff --git a/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java new file mode 100644 index 000000000..7dfd2a2ca --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java @@ -0,0 +1,12 @@ +package hunternif.mc.impl.atlas.mixinhooks; + +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; + +@FunctionalInterface +public interface NewPlayerConnectionCallback { + Event EVENT = EventFactory.createLoop(); + + void onNewConnection(ServerPlayerEntity player); +} diff --git a/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java new file mode 100644 index 000000000..1f456cf19 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java @@ -0,0 +1,11 @@ +package hunternif.mc.impl.atlas.mixinhooks; + +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; + +@FunctionalInterface +public interface NewServerConnectionCallback { + Event EVENT = EventFactory.createLoop(); + + void onNewConnection(boolean isRemote); +} diff --git a/common/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java b/common/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java new file mode 100644 index 000000000..dc8701155 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java @@ -0,0 +1,28 @@ +package hunternif.mc.impl.atlas.network; + +import dev.architectury.networking.NetworkManager; +import hunternif.mc.impl.atlas.network.packet.c2s.play.*; +import hunternif.mc.impl.atlas.network.packet.s2c.play.*; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +public class AntiqueAtlasNetworking { + @Environment(EnvType.CLIENT) + public static void registerS2CListeners() { + NetworkManager.registerReceiver(NetworkManager.Side.S2C, PutGlobalTileS2CPacket.ID, PutGlobalTileS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, DeleteGlobalTileS2CPacket.ID, DeleteGlobalTileS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, DeleteMarkerS2CPacket.ID, DeleteMarkerS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, DimensionUpdateS2CPacket.ID, DimensionUpdateS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, MapDataS2CPacket.ID, MapDataS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, PutMarkersS2CPacket.ID, PutMarkersS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, PutTileS2CPacket.ID, PutTileS2CPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, TileGroupsS2CPacket.ID, TileGroupsS2CPacket::apply); + } + + public static void registerC2SListeners() { + NetworkManager.registerReceiver(NetworkManager.Side.C2S, PutMarkerC2SPacket.ID, PutMarkerC2SPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.C2S, PutBrowsingPositionC2SPacket.ID, PutBrowsingPositionC2SPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.C2S, DeleteMarkerC2SPacket.ID, DeleteMarkerC2SPacket::apply); + NetworkManager.registerReceiver(NetworkManager.Side.C2S, PutTileC2SPacket.ID, PutTileC2SPacket::apply); + } +} diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/AntiqueAtlasPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/AntiqueAtlasPacket.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/AntiqueAtlasPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/AntiqueAtlasPacket.java diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java similarity index 62% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java index 9789b404c..4a3276cae 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/C2SPacket.java @@ -1,10 +1,10 @@ package hunternif.mc.impl.atlas.network.packet.c2s; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.network.packet.AntiqueAtlasPacket; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; public abstract class C2SPacket extends AntiqueAtlasPacket { public void send() { - ClientPlayNetworking.send(this.getId(), this); + NetworkManager.sendToServer(this.getId(), this); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java similarity index 66% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java index bec2b3535..bebf7ff7f 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/DeleteMarkerC2SPacket.java @@ -1,14 +1,11 @@ package hunternif.mc.impl.atlas.network.packet.c2s.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.api.AtlasAPI; import hunternif.mc.impl.atlas.network.packet.c2s.C2SPacket; import hunternif.mc.impl.atlas.util.Log; -import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; /** @@ -31,18 +28,18 @@ public DeleteMarkerC2SPacket(int atlasID, int markerID) { public Identifier getId() { return ID; } - public static void apply(MinecraftServer server, ServerPlayerEntity player, ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); int markerID = buf.readVarInt(); - server.execute(() -> { - if (AntiqueAtlasMod.CONFIG.itemNeeded && !AtlasAPI.getPlayerAtlases(player).contains(atlasID)) { + context.queue(() -> { + if (AntiqueAtlasMod.CONFIG.itemNeeded && !AtlasAPI.getPlayerAtlases(context.getPlayer()).contains(atlasID)) { Log.warn("Player %s attempted to delete marker from someone else's Atlas #%d", - player.getName(), atlasID); + context.getPlayer().getName(), atlasID); return; } - AtlasAPI.getMarkerAPI().deleteMarker(player.getEntityWorld(), atlasID, markerID); + AtlasAPI.getMarkerAPI().deleteMarker(context.getPlayer().getEntityWorld(), atlasID, markerID); }); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java similarity index 72% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java index d722b77ad..ea4a8afef 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutBrowsingPositionC2SPacket.java @@ -1,14 +1,11 @@ package hunternif.mc.impl.atlas.network.packet.c2s.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.api.AtlasAPI; import hunternif.mc.impl.atlas.network.packet.c2s.C2SPacket; import hunternif.mc.impl.atlas.util.Log; -import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; @@ -35,21 +32,21 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftServer server, ServerPlayerEntity player, ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int x = buf.readVarInt(); int y = buf.readVarInt(); double zoom = buf.readDouble(); - server.execute(() -> { - if (AntiqueAtlasMod.CONFIG.itemNeeded && !AtlasAPI.getPlayerAtlases(player).contains(atlasID)) { + context.queue(() -> { + if (AntiqueAtlasMod.CONFIG.itemNeeded && !AtlasAPI.getPlayerAtlases(context.getPlayer()).contains(atlasID)) { Log.warn("Player %s attempted to put position marker into someone else's Atlas #%d", - player.getCommandSource().getName(), atlasID); + context.getPlayer().getCommandSource().getName(), atlasID); return; } - AntiqueAtlasMod.tileData.getData(atlasID, player.getEntityWorld()) + AntiqueAtlasMod.tileData.getData(atlasID, context.getPlayer().getEntityWorld()) .getWorldData(world).setBrowsingPosition(x, y, zoom); }); } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java similarity index 68% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java index 296cb6381..58c0d12fa 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutMarkerC2SPacket.java @@ -1,13 +1,10 @@ package hunternif.mc.impl.atlas.network.packet.c2s.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.api.AtlasAPI; import hunternif.mc.impl.atlas.network.packet.c2s.C2SPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -34,7 +31,7 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftServer server, ServerPlayerEntity player, ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); Identifier markerType = buf.readIdentifier(); int x = buf.readVarInt(); @@ -42,15 +39,15 @@ public static void apply(MinecraftServer server, ServerPlayerEntity player, Serv boolean visibleBeforeDiscovery = buf.readBoolean(); Text label = buf.readText(); - server.execute(() -> { - if (!AtlasAPI.getPlayerAtlases(player).contains(atlasID)) { + context.queue(() -> { + if (!AtlasAPI.getPlayerAtlases(context.getPlayer()).contains(atlasID)) { AntiqueAtlasMod.LOG.warn( "Player {} attempted to put marker into someone else's Atlas #{}}", - player.getName(), atlasID); + context.getPlayer().getName(), atlasID); return; } - AtlasAPI.getMarkerAPI().putMarker(player.world, visibleBeforeDiscovery, atlasID, markerType, label, x,z); + AtlasAPI.getMarkerAPI().putMarker(context.getPlayer().getEntityWorld(), visibleBeforeDiscovery, atlasID, markerType, label, x,z); }); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java similarity index 67% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java index 8650f5ea5..54bb63da0 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/c2s/play/PutTileC2SPacket.java @@ -1,14 +1,11 @@ package hunternif.mc.impl.atlas.network.packet.c2s.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.api.AtlasAPI; import hunternif.mc.impl.atlas.network.packet.c2s.C2SPacket; import hunternif.mc.impl.atlas.util.Log; -import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; /** @@ -32,20 +29,20 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftServer server, ServerPlayerEntity player, ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); int x = buf.readVarInt(); int z = buf.readVarInt(); Identifier tile = buf.readIdentifier(); - server.execute(() -> { - if (AntiqueAtlasMod.CONFIG.itemNeeded && !AtlasAPI.getPlayerAtlases(player).contains(atlasID)) { + context.queue(() -> { + if (AntiqueAtlasMod.CONFIG.itemNeeded && !AtlasAPI.getPlayerAtlases(context.getPlayer()).contains(atlasID)) { Log.warn("Player %s attempted to modify someone else's Atlas #%d", - player.getName(), atlasID); + context.getPlayer().getName(), atlasID); return; } - AtlasAPI.getTileAPI().putTile(player.getEntityWorld(), atlasID, tile, x, z); + AtlasAPI.getTileAPI().putTile(context.getPlayer().getEntityWorld(), atlasID, tile, x, z); }); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java similarity index 58% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java index e698540b5..ee19d2086 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/S2CPacket.java @@ -1,25 +1,21 @@ package hunternif.mc.impl.atlas.network.packet.s2c; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.network.packet.AntiqueAtlasPacket; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; public abstract class S2CPacket extends AntiqueAtlasPacket { public void send(ServerPlayerEntity playerEntity) { - ServerPlayNetworking.send(playerEntity, this.getId(), this); + NetworkManager.sendToPlayer(playerEntity, this.getId(), this); } public void send(ServerWorld world) { - for (ServerPlayerEntity playerEntity : world.getPlayers()) { - send(playerEntity); - } + NetworkManager.sendToPlayers(world.getPlayers(), this.getId(), this); } public void send(MinecraftServer server) { - for (ServerPlayerEntity playerEntity : server.getPlayerManager().getPlayerList()) { - send(playerEntity); - } + NetworkManager.sendToPlayers(server.getPlayerManager().getPlayerList(), this.getId(), this); } } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java similarity index 78% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java index 8a28844d4..1cb55f08a 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteGlobalTileS2CPacket.java @@ -1,11 +1,9 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.core.TileDataStorage; import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -31,12 +29,12 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int chunkX = buf.readVarInt(); int chunkZ = buf.readVarInt(); - client.execute(() -> { + context.queue(() -> { TileDataStorage data = AntiqueAtlasMod.globalTileData.getData(world); data.removeTile(chunkX, chunkZ); }); diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java similarity index 77% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java index f61f7b78b..7b88e9d55 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DeleteMarkerS2CPacket.java @@ -1,5 +1,6 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.AntiqueAtlasModClient; import hunternif.mc.impl.atlas.marker.MarkersData; @@ -7,9 +8,6 @@ import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; @@ -36,14 +34,14 @@ public Identifier getId() { } @Environment(EnvType.CLIENT) - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); int markerID = buf.readVarInt(); - client.execute(() -> { + context.queue(() -> { MarkersData data = atlasID == GLOBAL ? AntiqueAtlasMod.globalMarkersData.getData() : - AntiqueAtlasMod.markersData.getMarkersData(atlasID, client.player.getEntityWorld()); + AntiqueAtlasMod.markersData.getMarkersData(atlasID, context.getPlayer().getEntityWorld()); data.removeMarker(markerID); AntiqueAtlasModClient.getAtlasGUI().updateBookmarkerList(); diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java similarity index 78% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java index 07bfe357b..3f3e41913 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/DimensionUpdateS2CPacket.java @@ -1,12 +1,10 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.core.AtlasData; import hunternif.mc.impl.atlas.core.TileInfo; import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -37,7 +35,7 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int tileCount = buf.readVarInt(); @@ -56,9 +54,9 @@ public static void apply(MinecraftClient client, ClientPlayNetworkHandler handle ); } - client.execute(() -> { - assert client.player != null; - AtlasData data = AntiqueAtlasMod.tileData.getData(atlasID, client.player.getEntityWorld()); + context.queue(() -> { + assert context.getPlayer() != null; + AtlasData data = AntiqueAtlasMod.tileData.getData(atlasID, context.getPlayer().getEntityWorld()); for (TileInfo info : tiles) { data.getWorldData(world).setTile(info.x, info.z, info.id); diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java similarity index 79% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java index 23884abc9..11f664823 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/MapDataS2CPacket.java @@ -1,14 +1,13 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.client.gui.GuiAtlas; import hunternif.mc.impl.atlas.core.AtlasData; import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; @@ -32,15 +31,15 @@ public Identifier getId() { } @Environment(EnvType.CLIENT) - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); NbtCompound data = buf.readNbt(); if (data == null) return; - client.execute(() -> { - AtlasData atlasData = AntiqueAtlasMod.tileData.getData(atlasID, client.player.getEntityWorld()); - atlasData.fromNbt(data); + context.queue(() -> { + AtlasData atlasData = AntiqueAtlasMod.tileData.getData(atlasID, context.getPlayer().getEntityWorld()); + atlasData.updateFromNbt(data); if (AntiqueAtlasMod.CONFIG.doSaveBrowsingPos && MinecraftClient.getInstance().currentScreen instanceof GuiAtlas) { ((GuiAtlas) MinecraftClient.getInstance().currentScreen).loadSavedBrowsingPosition(); diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java similarity index 85% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java index fb336eee8..827977f36 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutGlobalTileS2CPacket.java @@ -1,11 +1,9 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.core.TileDataStorage; import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.math.ChunkPos; @@ -48,7 +46,7 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int tileCount = buf.readVarInt(); diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java similarity index 87% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java index df0614191..c0099d9fd 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutMarkersS2CPacket.java @@ -2,6 +2,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.AntiqueAtlasModClient; import hunternif.mc.impl.atlas.marker.Marker; @@ -10,9 +11,6 @@ import hunternif.mc.impl.atlas.registry.MarkerType; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -60,7 +58,7 @@ public Identifier getId() { } @Environment(EnvType.CLIENT) - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int typesLength = buf.readVarInt(); @@ -74,10 +72,10 @@ public static void apply(MinecraftClient client, ClientPlayNetworkHandler handle } } - client.execute(() -> { + context.queue(() -> { MarkersData markersData = atlasID == GLOBAL ? AntiqueAtlasMod.globalMarkersData.getData() - : AntiqueAtlasMod.markersData.getMarkersData(atlasID, client.player.getEntityWorld()); + : AntiqueAtlasMod.markersData.getMarkersData(atlasID, context.getPlayer().getEntityWorld()); for (Identifier type : markersByType.keys()) { MarkerType markerType = MarkerType.REGISTRY.get(type); diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java similarity index 74% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java index edf689021..68569fa6f 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/PutTileS2CPacket.java @@ -1,11 +1,9 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.core.AtlasData; import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -33,15 +31,15 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int x = buf.readVarInt(); int z = buf.readVarInt(); Identifier tile = buf.readIdentifier(); - client.execute(() -> { - AtlasData data = AntiqueAtlasMod.tileData.getData(atlasID, client.player.getEntityWorld()); + context.queue(() -> { + AtlasData data = AntiqueAtlasMod.tileData.getData(atlasID, context.getPlayer().getEntityWorld()); data.setTile(world, x, z, tile); }); } diff --git a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java similarity index 80% rename from src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java rename to common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java index ad8552a55..422a9ce6c 100644 --- a/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java +++ b/common/src/main/java/hunternif/mc/impl/atlas/network/packet/s2c/play/TileGroupsS2CPacket.java @@ -1,17 +1,14 @@ package hunternif.mc.impl.atlas.network.packet.s2c.play; +import dev.architectury.networking.NetworkManager; import hunternif.mc.impl.atlas.AntiqueAtlasMod; import hunternif.mc.impl.atlas.core.AtlasData; import hunternif.mc.impl.atlas.core.WorldData; import hunternif.mc.impl.atlas.core.TileGroup; import hunternif.mc.impl.atlas.network.packet.s2c.S2CPacket; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; @@ -44,7 +41,7 @@ public Identifier getId() { return ID; } - public static void apply(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + public static void apply(PacketByteBuf buf, NetworkManager.PacketContext context) { int atlasID = buf.readVarInt(); RegistryKey world = RegistryKey.of(Registry.WORLD_KEY, buf.readIdentifier()); int length = buf.readVarInt(); @@ -58,9 +55,8 @@ public static void apply(MinecraftClient client, ClientPlayNetworkHandler handle } } - client.execute(() -> { - assert client.player != null; - AtlasData atlasData = AntiqueAtlasMod.tileData.getData(atlasID, client.player.getEntityWorld()); + context.queue(() -> { + AtlasData atlasData = AntiqueAtlasMod.tileData.getData(atlasID, context.getPlayer().getEntityWorld()); WorldData dimData = atlasData.getWorldData(world); for (TileGroup t : tileGroups) { dimData.putTileGroup(t); diff --git a/src/main/java/hunternif/mc/impl/atlas/registry/MarkerRenderInfo.java b/common/src/main/java/hunternif/mc/impl/atlas/registry/MarkerRenderInfo.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/registry/MarkerRenderInfo.java rename to common/src/main/java/hunternif/mc/impl/atlas/registry/MarkerRenderInfo.java diff --git a/src/main/java/hunternif/mc/impl/atlas/registry/MarkerType.java b/common/src/main/java/hunternif/mc/impl/atlas/registry/MarkerType.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/registry/MarkerType.java rename to common/src/main/java/hunternif/mc/impl/atlas/registry/MarkerType.java diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/EndCity.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/EndCity.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/structure/EndCity.java rename to common/src/main/java/hunternif/mc/impl/atlas/structure/EndCity.java diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/NetherFortress.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/NetherFortress.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/structure/NetherFortress.java rename to common/src/main/java/hunternif/mc/impl/atlas/structure/NetherFortress.java diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/Overworld.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/Overworld.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/structure/Overworld.java rename to common/src/main/java/hunternif/mc/impl/atlas/structure/Overworld.java diff --git a/common/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java new file mode 100644 index 000000000..d1262a02f --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java @@ -0,0 +1,12 @@ +package hunternif.mc.impl.atlas.structure; + +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.structure.StructureStart; + +public interface StructureAddedCallback { + Event EVENT = EventFactory.createLoop(); + + void onStructureAdded(StructureStart structureStart, ServerWorld world); +} diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/StructureHandler.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/StructureHandler.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/structure/StructureHandler.java rename to common/src/main/java/hunternif/mc/impl/atlas/structure/StructureHandler.java diff --git a/common/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java new file mode 100644 index 000000000..19b9eb8d0 --- /dev/null +++ b/common/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java @@ -0,0 +1,12 @@ +package hunternif.mc.impl.atlas.structure; + +import dev.architectury.event.Event; +import dev.architectury.event.EventFactory; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.structure.StructurePiece; + +public interface StructurePieceAddedCallback { + Event EVENT = EventFactory.createLoop(); + + void onStructurePieceAdded(StructurePiece structurePiece, ServerWorld world); +} diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/Village.java b/common/src/main/java/hunternif/mc/impl/atlas/structure/Village.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/structure/Village.java rename to common/src/main/java/hunternif/mc/impl/atlas/structure/Village.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/ArrayIterator.java b/common/src/main/java/hunternif/mc/impl/atlas/util/ArrayIterator.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/ArrayIterator.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/ArrayIterator.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/BitMatrix.java b/common/src/main/java/hunternif/mc/impl/atlas/util/BitMatrix.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/BitMatrix.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/BitMatrix.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/ExportImageUtil.java b/common/src/main/java/hunternif/mc/impl/atlas/util/ExportImageUtil.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/ExportImageUtil.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/ExportImageUtil.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/FileUtil.java b/common/src/main/java/hunternif/mc/impl/atlas/util/FileUtil.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/FileUtil.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/FileUtil.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/ListMapValueIterator.java b/common/src/main/java/hunternif/mc/impl/atlas/util/ListMapValueIterator.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/ListMapValueIterator.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/ListMapValueIterator.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/Log.java b/common/src/main/java/hunternif/mc/impl/atlas/util/Log.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/Log.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/Log.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/MathUtil.java b/common/src/main/java/hunternif/mc/impl/atlas/util/MathUtil.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/MathUtil.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/MathUtil.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/Rect.java b/common/src/main/java/hunternif/mc/impl/atlas/util/Rect.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/Rect.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/Rect.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/RenderedImageScanned.java b/common/src/main/java/hunternif/mc/impl/atlas/util/RenderedImageScanned.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/RenderedImageScanned.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/RenderedImageScanned.java diff --git a/src/main/java/hunternif/mc/impl/atlas/util/Streams.java b/common/src/main/java/hunternif/mc/impl/atlas/util/Streams.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/util/Streams.java rename to common/src/main/java/hunternif/mc/impl/atlas/util/Streams.java diff --git a/src/main/resources/antiqueatlas.mixins.json b/common/src/main/resources/antiqueatlas-common.mixins.json similarity index 95% rename from src/main/resources/antiqueatlas.mixins.json rename to common/src/main/resources/antiqueatlas-common.mixins.json index 51e143e5d..fee6905dc 100644 --- a/src/main/resources/antiqueatlas.mixins.json +++ b/common/src/main/resources/antiqueatlas-common.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "hunternif.mc.impl.atlas.mixin", - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_17", "plugin": "hunternif.mc.impl.atlas.mixin.VolatileMixinPlugin", "mixins": [ "MixinCraftingResultSlot", diff --git a/src/main/resources/antiqueatlas.accesswidener b/common/src/main/resources/antiqueatlas.accesswidener similarity index 100% rename from src/main/resources/antiqueatlas.accesswidener rename to common/src/main/resources/antiqueatlas.accesswidener diff --git a/src/main/resources/antiqueatlas_icon.png b/common/src/main/resources/antiqueatlas_icon.png similarity index 100% rename from src/main/resources/antiqueatlas_icon.png rename to common/src/main/resources/antiqueatlas_icon.png diff --git a/src/main/resources/antiqueatlas_logo.png b/common/src/main/resources/antiqueatlas_logo.png similarity index 100% rename from src/main/resources/antiqueatlas_logo.png rename to common/src/main/resources/antiqueatlas_logo.png diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json new file mode 100644 index 000000000..d0ed84985 --- /dev/null +++ b/common/src/main/resources/architectury.common.json @@ -0,0 +1,3 @@ +{ + "accessWidener": "antiqueatlas.accesswidener" +} diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/bastion.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/bastion.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/bastion.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/bastion.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/bed.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/bed.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/bed.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/bed.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/diamond.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/diamond.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/diamond.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/diamond.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/end_city.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/end_city.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/end_city.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/end_city.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/end_city_far.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/end_city_far.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/end_city_far.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/end_city_far.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/google.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/google.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/google.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/google.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/mansion.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/mansion.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/mansion.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/mansion.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/marker.json.example b/common/src/main/resources/assets/antiqueatlas/atlas/markers/marker.json.example similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/marker.json.example rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/marker.json.example diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/monument.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/monument.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/monument.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/monument.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/nether_portal.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/nether_portal.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/nether_portal.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/nether_portal.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/pickaxe.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/pickaxe.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/pickaxe.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/pickaxe.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/red_x_large.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/red_x_large.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/red_x_large.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/red_x_large.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/red_x_small.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/red_x_small.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/red_x_small.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/red_x_small.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/scroll.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/scroll.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/scroll.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/scroll.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/skull.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/skull.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/skull.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/skull.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/sword.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/sword.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/sword.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/sword.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/tomb.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/tomb.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/tomb.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/tomb.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/tower.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/tower.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/tower.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/tower.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/markers/village.json b/common/src/main/resources/assets/antiqueatlas/atlas/markers/village.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/markers/village.json rename to common/src/main/resources/assets/antiqueatlas/atlas/markers/village.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/basalt_deltas.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/basalt_deltas.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/basalt_deltas.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/basalt_deltas.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/birch_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/bryce.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/bryce.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/bryce.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/bryce.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/butchers_shop.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/butchers_shop.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/butchers_shop.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/butchers_shop.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/cave_walls.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/cave_walls.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/cave_walls.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/cave_walls.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/church.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/church.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/church.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/church.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_birch.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_birch.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_birch.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_birch.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/dense_forest_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/desert_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island_plants.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island_plants.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island_plants.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_island_plants.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_void.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_void.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_void.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/end_void.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_large.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_large.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_large.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_large.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_small.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_small.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_small.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/farmland_small.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/fence.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/fence.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/fence.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/fence.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_flowers.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_flowers.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_flowers.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_flowers.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/forest_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/house.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/house.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/house.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/house.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/house_small.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/house_small.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/house_small.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/house_small.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/hut.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/hut.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/hut.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/hut.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice_spikes.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice_spikes.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice_spikes.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ice_spikes.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_cliffs.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_cliffs.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_cliffs.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_cliffs.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_edge_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/jungle_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/l_house.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/l_house.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/l_house.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/l_house.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava_shore.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava_shore.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava_shore.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/lava_shore.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/library.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/library.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/library.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/library.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_spruce_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mega_taiga_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mesa.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mesa.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mesa.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mesa.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_all.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_all.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_all.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_all.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_naked.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_naked.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_naked.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_naked.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_snow_caps.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_snow_caps.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_snow_caps.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mountains_snow_caps.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mushroom.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mushroom.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/mushroom.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/mushroom.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_x.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_x.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_x.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_x.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_z.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_z.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_z.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_end_z.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_gate.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_gate.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_gate.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_gate.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_x.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_x.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_x.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_x.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_z.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_z.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_z.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_bridge_z.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_fort_stairs.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_fort_stairs.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_fort_stairs.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_fort_stairs.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_hall.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_hall.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_hall.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_hall.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_throne.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_throne.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_throne.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_throne.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_tower.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_tower.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_tower.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_tower.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_wall.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_wall.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_wall.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/nether_wall.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/pines_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plains.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plains.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plains.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plains.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_low.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_low.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_low.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_low.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees_low.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees_low.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees_low.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_mesa_trees_low.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna_m.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna_m.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna_m.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/plateau_savanna_m.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ravine.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ravine.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/ravine.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ravine.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/rock_shore.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/rock_shore.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/rock_shore.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/rock_shore.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ruined_portal.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ruined_portal.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/ruined_portal.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/ruined_portal.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna_cliffs.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna_cliffs.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna_cliffs.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/savanna_cliffs.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/shore.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/shore.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/shore.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/shore.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/smithy.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/smithy.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/smithy.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/smithy.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/snow_pines_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/soul_sand_valley.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/soul_sand_valley.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/soul_sand_valley.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/soul_sand_valley.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sparse_forest_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sunflowers.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sunflowers.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/sunflowers.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/sunflowers.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_water.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_water.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_water.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/swamp_water.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch_hills.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch_hills.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch_hills.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/tall_birch_hills.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/test.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/test.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/test.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/test.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_x.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_x.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_x.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_x.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_z.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_z.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_z.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_path_z.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_torch.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_torch.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_torch.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/village_torch.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/water.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/water.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/water.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/water.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/texture_sets/well.json b/common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/well.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/texture_sets/well.json rename to common/src/main/resources/assets/antiqueatlas/atlas/texture_sets/well.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/end_island.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/end_island.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/end_island.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/end_island.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/end_island_plants.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/end_island_plants.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/end_island_plants.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/end_island_plants.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/end_void.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/end_void.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/end_void.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/end_void.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/lava.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/lava.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/lava.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/lava.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/lava_shore.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/lava_shore.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/lava_shore.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/lava_shore.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_x.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_x.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_x.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_x.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_z.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_z.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_z.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_end_z.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_gate.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_gate.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_gate.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_gate.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_x.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_x.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_x.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_x.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_z.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_z.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_z.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_bridge_z.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_fort_stairs.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_fort_stairs.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_fort_stairs.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_fort_stairs.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_hall.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_hall.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_hall.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_hall.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_throne.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_throne.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_throne.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_throne.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_tower.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_tower.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_tower.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_tower.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_wall.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_wall.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/nether_wall.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/nether_wall.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_butchers_shop.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_butchers_shop.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_butchers_shop.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_butchers_shop.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_church.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_church.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_church.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_church.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_large.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_large.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_large.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_large.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_small.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_small.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_small.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_farmland_small.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_hut.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_hut.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_hut.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_hut.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_l_house.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_l_house.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_l_house.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_l_house.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_library.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_library.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_library.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_library.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_x.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_x.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_x.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_x.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_z.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_z.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_z.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_path_z.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_small_house.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_small_house.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_small_house.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_small_house.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_smithy.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_smithy.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_smithy.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_smithy.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_torch.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_torch.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_torch.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_torch.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_well.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_well.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_well.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/npc_village_well.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/ravine.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/ravine.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/ravine.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/ravine.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/ruined_portal.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/ruined_portal.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/ruined_portal.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/ruined_portal.json diff --git a/src/main/resources/assets/antiqueatlas/atlas/tiles/swamp_water.json b/common/src/main/resources/assets/antiqueatlas/atlas/tiles/swamp_water.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/atlas/tiles/swamp_water.json rename to common/src/main/resources/assets/antiqueatlas/atlas/tiles/swamp_water.json diff --git a/src/main/resources/assets/antiqueatlas/lang/da_dk.json b/common/src/main/resources/assets/antiqueatlas/lang/da_dk.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/da_dk.json rename to common/src/main/resources/assets/antiqueatlas/lang/da_dk.json diff --git a/src/main/resources/assets/antiqueatlas/lang/de_de.json b/common/src/main/resources/assets/antiqueatlas/lang/de_de.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/de_de.json rename to common/src/main/resources/assets/antiqueatlas/lang/de_de.json diff --git a/src/main/resources/assets/antiqueatlas/lang/en_us.json b/common/src/main/resources/assets/antiqueatlas/lang/en_us.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/en_us.json rename to common/src/main/resources/assets/antiqueatlas/lang/en_us.json diff --git a/src/main/resources/assets/antiqueatlas/lang/es_ar.json b/common/src/main/resources/assets/antiqueatlas/lang/es_ar.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/es_ar.json rename to common/src/main/resources/assets/antiqueatlas/lang/es_ar.json diff --git a/src/main/resources/assets/antiqueatlas/lang/es_es.json b/common/src/main/resources/assets/antiqueatlas/lang/es_es.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/es_es.json rename to common/src/main/resources/assets/antiqueatlas/lang/es_es.json diff --git a/src/main/resources/assets/antiqueatlas/lang/fr_fr.json b/common/src/main/resources/assets/antiqueatlas/lang/fr_fr.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/fr_fr.json rename to common/src/main/resources/assets/antiqueatlas/lang/fr_fr.json diff --git a/src/main/resources/assets/antiqueatlas/lang/it_it.json b/common/src/main/resources/assets/antiqueatlas/lang/it_it.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/it_it.json rename to common/src/main/resources/assets/antiqueatlas/lang/it_it.json diff --git a/src/main/resources/assets/antiqueatlas/lang/ja_jp.json b/common/src/main/resources/assets/antiqueatlas/lang/ja_jp.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/ja_jp.json rename to common/src/main/resources/assets/antiqueatlas/lang/ja_jp.json diff --git a/src/main/resources/assets/antiqueatlas/lang/pt_br.json b/common/src/main/resources/assets/antiqueatlas/lang/pt_br.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/pt_br.json rename to common/src/main/resources/assets/antiqueatlas/lang/pt_br.json diff --git a/src/main/resources/assets/antiqueatlas/lang/ru_ru.json b/common/src/main/resources/assets/antiqueatlas/lang/ru_ru.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/ru_ru.json rename to common/src/main/resources/assets/antiqueatlas/lang/ru_ru.json diff --git a/src/main/resources/assets/antiqueatlas/lang/zh_cn.json b/common/src/main/resources/assets/antiqueatlas/lang/zh_cn.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/zh_cn.json rename to common/src/main/resources/assets/antiqueatlas/lang/zh_cn.json diff --git a/src/main/resources/assets/antiqueatlas/lang/zh_tw.json b/common/src/main/resources/assets/antiqueatlas/lang/zh_tw.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/lang/zh_tw.json rename to common/src/main/resources/assets/antiqueatlas/lang/zh_tw.json diff --git a/src/main/resources/assets/antiqueatlas/models/item/antique_atlas.json b/common/src/main/resources/assets/antiqueatlas/models/item/antique_atlas.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/models/item/antique_atlas.json rename to common/src/main/resources/assets/antiqueatlas/models/item/antique_atlas.json diff --git a/src/main/resources/assets/antiqueatlas/models/item/empty_antique_atlas.json b/common/src/main/resources/assets/antiqueatlas/models/item/empty_antique_atlas.json similarity index 100% rename from src/main/resources/assets/antiqueatlas/models/item/empty_antique_atlas.json rename to common/src/main/resources/assets/antiqueatlas/models/item/empty_antique_atlas.json diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/book.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/book.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/book.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/book.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/book_frame.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/book_frame.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/book_frame.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/book_frame.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/book_frame_narrow.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/book_frame_narrow.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/book_frame_narrow.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/book_frame_narrow.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/bookmarks.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/bookmarks.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/bookmarks.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/bookmarks.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/bookmarks_l.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/bookmarks_l.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/bookmarks_l.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/bookmarks_l.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/eraser.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/eraser.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/eraser.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/eraser.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/exported_bg.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/exported_bg.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/exported_bg.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/exported_bg.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/icons/add_marker.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/icons/add_marker.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/icons/add_marker.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/icons/add_marker.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/icons/del_marker.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/icons/del_marker.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/icons/del_marker.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/icons/del_marker.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/icons/export.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/icons/export.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/icons/export.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/icons/export.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/icons/hide_markers.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/icons/hide_markers.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/icons/hide_markers.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/icons/hide_markers.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/icons/show_markers.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/icons/show_markers.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/icons/show_markers.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/icons/show_markers.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_off.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_off.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_off.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_off.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_on.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_on.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_on.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/marker_frame_on.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/bed.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/bed.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/bed.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/bed.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/diamond.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/diamond.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/diamond.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/diamond.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_far.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_far.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_far.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_far.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_16.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_16.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_16.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_16.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_32.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_32.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_32.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/end_city_mipped_32.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/google_marker.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/google_marker.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/google_marker.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/google_marker.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/nether_portal.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/nether_portal.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/nether_portal.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/nether_portal.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/ocean_monument.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/ocean_monument.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/ocean_monument.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/ocean_monument.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/pickaxe.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/pickaxe.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/pickaxe.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/pickaxe.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_large.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_large.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_large.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_large.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_small.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_small.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_small.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/red_x_small.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/scroll.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/scroll.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/scroll.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/scroll.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/skull.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/skull.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/skull.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/skull.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/sword.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/sword.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/sword.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/sword.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/tomb.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/tomb.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/tomb.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/tomb.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/tower.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/tower.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/tower.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/tower.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/unknown_marker.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/unknown_marker.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/unknown_marker.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/unknown_marker.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/village.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/village.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/village.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/village.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/markers/woodland_mansion.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/markers/woodland_mansion.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/markers/woodland_mansion.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/markers/woodland_mansion.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/navigate_arrows.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/navigate_arrows.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/navigate_arrows.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/navigate_arrows.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/player.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/player.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/player.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/player.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/position.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/position.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/position.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/position.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_128.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_128.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_128.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_128.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_16.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_16.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_16.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_16.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_256.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_256.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_256.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_256.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_32.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_32.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_32.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_32.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_512.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_512.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_512.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_512.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_64.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_64.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_64.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_64.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_8.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_8.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_8.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scalebar/scalebar_8.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_hor.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_hor.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_hor.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_hor.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_ver.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_ver.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_ver.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/scrollbar_ver.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns1.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns1.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns1.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns1.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns_lava1.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns_lava1.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns_lava1.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/basalt_columns_lava1.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/birch_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bryce4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bushes_cliffs.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bushes_cliffs.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/bushes_cliffs.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/bushes_cliffs.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/butchers_shop.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/butchers_shop.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/butchers_shop.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/butchers_shop.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cacti.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cacti.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/cacti.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cacti.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cave_walls.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cave_walls.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/cave_walls.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cave_walls.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/church.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/church.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/church.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/church.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs_clouds.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs_clouds.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs_clouds.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/cliffs_clouds.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_birch.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_birch.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_birch.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_birch.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/dense_forest_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_island_plants2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_void.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_void.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_void.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/end_void.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_l.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_l.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_l.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_l.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_s.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_s.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_s.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/farmland_s.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/fence.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/fence.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/fence.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/fence.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_flowers3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_hills3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/forest_sparse_hills3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/grass4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_bushes.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_bushes.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_bushes.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_bushes.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_cacti.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_cacti.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_cacti.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_cacti.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_grass.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_grass.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_grass.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hills_grass.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/house.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/house.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/house.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/house.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/house_small.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/house_small.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/house_small.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/house_small.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hut.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hut.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/hut.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/hut.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_border.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_border.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_border.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_border.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_noborder.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_noborder.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_noborder.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_noborder.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ice_spikes2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_cliffs2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_edge_hills3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/jungle_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/l_house.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/l_house.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/l_house.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/l_house.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/lava_shore2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/library.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/library.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/library.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/library.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_spruce_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mega_taiga_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mesa4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains5.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains5.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains5.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mountains5.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/mushroom2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_x.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_x.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_x.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_x.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_z.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_z.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_z.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_end_z.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_gate.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_gate.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_gate.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_gate.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_x.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_x.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_x.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_x.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_z.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_z.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_z.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_bridge_z.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_fort_stairs.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_fort_stairs.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_fort_stairs.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_fort_stairs.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_hall.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_hall.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_hall.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_hall.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_throne.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_throne.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_throne.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_throne.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_tower.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_tower.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_tower.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_tower.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_wall.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_wall.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_wall.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/nether_wall.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/pines_hills3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_grass3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_mesa_low2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_savanna3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees_low.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees_low.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees_low.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/plateau_trees_low.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ravine2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/rock_shore.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/rock_shore.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/rock_shore.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/rock_shore.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ruined_portal.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ruined_portal.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/ruined_portal.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/ruined_portal.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand_bushes.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand_bushes.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand_bushes.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sand_bushes.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/savanna_cliffs_clouds3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/shore3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/smithy.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/smithy.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/smithy.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/smithy.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow1.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow1.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow1.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow1.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow5.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow5.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow5.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow5.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow6.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow6.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow6.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow6.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_caps.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_caps.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_caps.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_caps.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/snow_pines_hills3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/sunflowers2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp5.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp5.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp5.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp5.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp6.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp6.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp6.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp6.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills3.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills3.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills3.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills3.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills4.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills4.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills4.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills4.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills5.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills5.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills5.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/swamp_hills5.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/tall_birch_hills2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/test.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/test.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/test.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/test.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_x.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_x.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_x.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_x.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_z.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_z.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_z.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_path_z.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_torch.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_torch.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_torch.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/village_torch.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/water.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/water.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/water.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/water.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/water2.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/water2.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/water2.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/water2.png diff --git a/src/main/resources/assets/antiqueatlas/textures/gui/tiles/well.png b/common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/well.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/gui/tiles/well.png rename to common/src/main/resources/assets/antiqueatlas/textures/gui/tiles/well.png diff --git a/src/main/resources/assets/antiqueatlas/textures/items/antique_atlas.png b/common/src/main/resources/assets/antiqueatlas/textures/items/antique_atlas.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/items/antique_atlas.png rename to common/src/main/resources/assets/antiqueatlas/textures/items/antique_atlas.png diff --git a/src/main/resources/assets/antiqueatlas/textures/items/empty_antique_atlas.png b/common/src/main/resources/assets/antiqueatlas/textures/items/empty_antique_atlas.png similarity index 100% rename from src/main/resources/assets/antiqueatlas/textures/items/empty_antique_atlas.png rename to common/src/main/resources/assets/antiqueatlas/textures/items/empty_antique_atlas.png diff --git a/src/main/resources/assets/minecraft/atlas/tiles/badlands.json b/common/src/main/resources/assets/minecraft/atlas/tiles/badlands.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/badlands.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/badlands.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/badlands_plateau.json b/common/src/main/resources/assets/minecraft/atlas/tiles/badlands_plateau.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/badlands_plateau.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/badlands_plateau.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle.json b/common/src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/bamboo_jungle_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/basalt_deltas.json b/common/src/main/resources/assets/minecraft/atlas/tiles/basalt_deltas.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/basalt_deltas.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/basalt_deltas.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/beach.json b/common/src/main/resources/assets/minecraft/atlas/tiles/beach.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/beach.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/beach.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/birch_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/birch_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/birch_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/birch_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/birch_forest_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/birch_forest_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/birch_forest_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/birch_forest_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/cold_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/cold_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/cold_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/cold_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/crimson_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/crimson_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/crimson_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/crimson_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/dark_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/dark_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/dark_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/dark_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/dark_forest_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/dark_forest_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/dark_forest_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/dark_forest_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/deep_cold_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/deep_cold_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/deep_cold_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/deep_cold_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/deep_frozen_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/deep_frozen_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/deep_frozen_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/deep_frozen_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/deep_lukewarm_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/deep_lukewarm_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/deep_lukewarm_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/deep_lukewarm_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/deep_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/deep_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/deep_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/deep_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/deep_warm_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/deep_warm_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/deep_warm_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/deep_warm_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/desert.json b/common/src/main/resources/assets/minecraft/atlas/tiles/desert.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/desert.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/desert.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/desert_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/desert_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/desert_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/desert_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/desert_lakes.json b/common/src/main/resources/assets/minecraft/atlas/tiles/desert_lakes.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/desert_lakes.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/desert_lakes.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/end_barrens.json b/common/src/main/resources/assets/minecraft/atlas/tiles/end_barrens.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/end_barrens.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/end_barrens.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/end_highlands.json b/common/src/main/resources/assets/minecraft/atlas/tiles/end_highlands.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/end_highlands.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/end_highlands.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/end_midlands.json b/common/src/main/resources/assets/minecraft/atlas/tiles/end_midlands.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/end_midlands.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/end_midlands.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/eroded_badlands.json b/common/src/main/resources/assets/minecraft/atlas/tiles/eroded_badlands.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/eroded_badlands.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/eroded_badlands.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/flower_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/flower_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/flower_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/flower_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/frozen_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/frozen_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/frozen_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/frozen_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/frozen_peaks.json b/common/src/main/resources/assets/minecraft/atlas/tiles/frozen_peaks.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/frozen_peaks.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/frozen_peaks.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/frozen_river.json b/common/src/main/resources/assets/minecraft/atlas/tiles/frozen_river.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/frozen_river.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/frozen_river.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga.json b/common/src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/giant_spruce_taiga_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga.json b/common/src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/giant_tree_taiga_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/gravelly_mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/gravelly_mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/gravelly_mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/gravelly_mountains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/ice_spikes.json b/common/src/main/resources/assets/minecraft/atlas/tiles/ice_spikes.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/ice_spikes.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/ice_spikes.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/jagged_peaks.json b/common/src/main/resources/assets/minecraft/atlas/tiles/jagged_peaks.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/jagged_peaks.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/jagged_peaks.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/jungle.json b/common/src/main/resources/assets/minecraft/atlas/tiles/jungle.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/jungle.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/jungle.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/jungle_edge.json b/common/src/main/resources/assets/minecraft/atlas/tiles/jungle_edge.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/jungle_edge.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/jungle_edge.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/jungle_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/jungle_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/jungle_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/jungle_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/lukewarm_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/lukewarm_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/lukewarm_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/lukewarm_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/meadow.json b/common/src/main/resources/assets/minecraft/atlas/tiles/meadow.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/meadow.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/meadow.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/modified_badlands_plateau.json b/common/src/main/resources/assets/minecraft/atlas/tiles/modified_badlands_plateau.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/modified_badlands_plateau.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/modified_badlands_plateau.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/modified_gravelly_mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/modified_gravelly_mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/modified_gravelly_mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/modified_gravelly_mountains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/modified_jungle.json b/common/src/main/resources/assets/minecraft/atlas/tiles/modified_jungle.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/modified_jungle.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/modified_jungle.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/modified_jungle_edge.json b/common/src/main/resources/assets/minecraft/atlas/tiles/modified_jungle_edge.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/modified_jungle_edge.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/modified_jungle_edge.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/modified_wooded_badlands_plateau.json b/common/src/main/resources/assets/minecraft/atlas/tiles/modified_wooded_badlands_plateau.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/modified_wooded_badlands_plateau.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/modified_wooded_badlands_plateau.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/mountain_edge.json b/common/src/main/resources/assets/minecraft/atlas/tiles/mountain_edge.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/mountain_edge.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/mountain_edge.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/mountains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/mushroom_field_shore.json b/common/src/main/resources/assets/minecraft/atlas/tiles/mushroom_field_shore.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/mushroom_field_shore.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/mushroom_field_shore.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/mushroom_fields.json b/common/src/main/resources/assets/minecraft/atlas/tiles/mushroom_fields.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/mushroom_fields.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/mushroom_fields.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/nether_wastes.json b/common/src/main/resources/assets/minecraft/atlas/tiles/nether_wastes.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/nether_wastes.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/nether_wastes.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/old_growth_birch_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/old_growth_birch_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/old_growth_birch_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/old_growth_birch_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/old_growth_pine_taiga.json b/common/src/main/resources/assets/minecraft/atlas/tiles/old_growth_pine_taiga.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/old_growth_pine_taiga.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/old_growth_pine_taiga.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/old_growth_spruce_taiga.json b/common/src/main/resources/assets/minecraft/atlas/tiles/old_growth_spruce_taiga.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/old_growth_spruce_taiga.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/old_growth_spruce_taiga.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/plains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/plains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/plains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/plains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/river.json b/common/src/main/resources/assets/minecraft/atlas/tiles/river.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/river.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/river.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/savanna.json b/common/src/main/resources/assets/minecraft/atlas/tiles/savanna.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/savanna.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/savanna.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/savanna_plateau.json b/common/src/main/resources/assets/minecraft/atlas/tiles/savanna_plateau.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/savanna_plateau.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/savanna_plateau.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna.json b/common/src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna_plateau.json b/common/src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna_plateau.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna_plateau.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/shattered_savanna_plateau.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/small_end_islands.json b/common/src/main/resources/assets/minecraft/atlas/tiles/small_end_islands.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/small_end_islands.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/small_end_islands.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_beach.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_beach.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_beach.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_beach.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_mountains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_plains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_plains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_plains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_plains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_slopes.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_slopes.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_slopes.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_slopes.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_taiga_mountains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/snowy_tundra.json b/common/src/main/resources/assets/minecraft/atlas/tiles/snowy_tundra.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/snowy_tundra.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/snowy_tundra.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/soul_sand_valley.json b/common/src/main/resources/assets/minecraft/atlas/tiles/soul_sand_valley.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/soul_sand_valley.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/soul_sand_valley.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/stony_peaks.json b/common/src/main/resources/assets/minecraft/atlas/tiles/stony_peaks.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/stony_peaks.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/stony_peaks.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/stony_shore.json b/common/src/main/resources/assets/minecraft/atlas/tiles/stony_shore.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/stony_shore.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/stony_shore.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/sunflower_plains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/sunflower_plains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/sunflower_plains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/sunflower_plains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/swamp.json b/common/src/main/resources/assets/minecraft/atlas/tiles/swamp.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/swamp.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/swamp.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/swamp_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/swamp_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/swamp_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/swamp_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/taiga.json b/common/src/main/resources/assets/minecraft/atlas/tiles/taiga.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/taiga.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/taiga.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/taiga_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/taiga_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/taiga_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/taiga_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/taiga_mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/taiga_mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/taiga_mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/taiga_mountains.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/tall_birch_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/tall_birch_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/tall_birch_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/tall_birch_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/tall_birch_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/tall_birch_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/tall_birch_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/tall_birch_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/the_end.json b/common/src/main/resources/assets/minecraft/atlas/tiles/the_end.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/the_end.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/the_end.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/the_void.json b/common/src/main/resources/assets/minecraft/atlas/tiles/the_void.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/the_void.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/the_void.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/warm_ocean.json b/common/src/main/resources/assets/minecraft/atlas/tiles/warm_ocean.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/warm_ocean.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/warm_ocean.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/warped_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/warped_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/warped_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/warped_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/windswept_forest.json b/common/src/main/resources/assets/minecraft/atlas/tiles/windswept_forest.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/windswept_forest.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/windswept_forest.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/windswept_gravelly_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/windswept_gravelly_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/windswept_gravelly_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/windswept_gravelly_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/windswept_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/windswept_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/windswept_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/windswept_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/windswept_savanna.json b/common/src/main/resources/assets/minecraft/atlas/tiles/windswept_savanna.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/windswept_savanna.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/windswept_savanna.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/wooded_badlands_plateau.json b/common/src/main/resources/assets/minecraft/atlas/tiles/wooded_badlands_plateau.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/wooded_badlands_plateau.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/wooded_badlands_plateau.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/wooded_hills.json b/common/src/main/resources/assets/minecraft/atlas/tiles/wooded_hills.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/wooded_hills.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/wooded_hills.json diff --git a/src/main/resources/assets/minecraft/atlas/tiles/wooded_mountains.json b/common/src/main/resources/assets/minecraft/atlas/tiles/wooded_mountains.json similarity index 100% rename from src/main/resources/assets/minecraft/atlas/tiles/wooded_mountains.json rename to common/src/main/resources/assets/minecraft/atlas/tiles/wooded_mountains.json diff --git a/src/main/resources/data/antiqueatlas/advancements/recipes/atlas.json b/common/src/main/resources/data/antiqueatlas/advancements/recipes/atlas.json similarity index 100% rename from src/main/resources/data/antiqueatlas/advancements/recipes/atlas.json rename to common/src/main/resources/data/antiqueatlas/advancements/recipes/atlas.json diff --git a/src/main/resources/data/antiqueatlas/advancements/recipes/atlas_new.json b/common/src/main/resources/data/antiqueatlas/advancements/recipes/atlas_new.json similarity index 100% rename from src/main/resources/data/antiqueatlas/advancements/recipes/atlas_new.json rename to common/src/main/resources/data/antiqueatlas/advancements/recipes/atlas_new.json diff --git a/src/main/resources/data/antiqueatlas/recipes/atlas_clone.json b/common/src/main/resources/data/antiqueatlas/recipes/atlas_clone.json similarity index 100% rename from src/main/resources/data/antiqueatlas/recipes/atlas_clone.json rename to common/src/main/resources/data/antiqueatlas/recipes/atlas_clone.json diff --git a/src/main/resources/data/antiqueatlas/recipes/atlas_combine.json b/common/src/main/resources/data/antiqueatlas/recipes/atlas_combine.json similarity index 100% rename from src/main/resources/data/antiqueatlas/recipes/atlas_combine.json rename to common/src/main/resources/data/antiqueatlas/recipes/atlas_combine.json diff --git a/src/main/resources/data/antiqueatlas/recipes/empty_atlas.json b/common/src/main/resources/data/antiqueatlas/recipes/empty_atlas.json similarity index 100% rename from src/main/resources/data/antiqueatlas/recipes/empty_atlas.json rename to common/src/main/resources/data/antiqueatlas/recipes/empty_atlas.json diff --git a/src/main/resources/data/antiqueatlas/recipes/empty_atlas_new.json b/common/src/main/resources/data/antiqueatlas/recipes/empty_atlas_new.json similarity index 100% rename from src/main/resources/data/antiqueatlas/recipes/empty_atlas_new.json rename to common/src/main/resources/data/antiqueatlas/recipes/empty_atlas_new.json diff --git a/fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasClientModFabric.java b/fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasClientModFabric.java new file mode 100644 index 000000000..3ca1c6a65 --- /dev/null +++ b/fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasClientModFabric.java @@ -0,0 +1,12 @@ +package hunternif.mc.impl.atlas; + +import net.fabricmc.api.ClientModInitializer; + +public class AntiqueAtlasClientModFabric implements ClientModInitializer +{ + @Override + public void onInitializeClient() + { + AntiqueAtlasModClient.init(); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModFabric.java b/fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModFabric.java new file mode 100644 index 000000000..40ab6ea02 --- /dev/null +++ b/fabric/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModFabric.java @@ -0,0 +1,12 @@ +package hunternif.mc.impl.atlas; + +import net.fabricmc.api.ModInitializer; + +public class AntiqueAtlasModFabric implements ModInitializer +{ + @Override + public void onInitialize() + { + AntiqueAtlasMod.init(); + } +} \ No newline at end of file diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java b/fabric/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java similarity index 100% rename from src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java rename to fabric/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java diff --git a/fabric/src/main/java/hunternif/mc/impl/atlas/mixin/fabric/VolatileMixinPluginImpl.java b/fabric/src/main/java/hunternif/mc/impl/atlas/mixin/fabric/VolatileMixinPluginImpl.java new file mode 100644 index 000000000..52ab452d1 --- /dev/null +++ b/fabric/src/main/java/hunternif/mc/impl/atlas/mixin/fabric/VolatileMixinPluginImpl.java @@ -0,0 +1,10 @@ +package hunternif.mc.impl.atlas.mixin.fabric; + +import net.fabricmc.loader.api.FabricLoader; + +public class VolatileMixinPluginImpl +{ + public static boolean isDevelopmentEnvironment() { + return FabricLoader.getInstance().isDevelopmentEnvironment(); + } +} \ No newline at end of file diff --git a/fabric/src/main/resources/antiqueatlas.mixins.json b/fabric/src/main/resources/antiqueatlas.mixins.json new file mode 100644 index 000000000..6d8e3fec1 --- /dev/null +++ b/fabric/src/main/resources/antiqueatlas.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "hunternif.mc.impl.atlas.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json similarity index 73% rename from src/main/resources/fabric.mod.json rename to fabric/src/main/resources/fabric.mod.json index 53ff1242c..61ef975b0 100644 --- a/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -4,14 +4,14 @@ "name": "Antique Atlas", "description": "Antique Atlas is a book that acts like a map featuring infinite scrolling, zoom and custom labeled markers. The map is generated around the player by calculating the average biome in each 16x16 chunk.", "version": "${version}", - "authors": ["Hunternif"], - "contributors": ["coolAlias", "Kenkron", "TheCodeWarrior", "Localizations by crafteverywhere", "CapoFantasma97", "Mazdallier", "mankra", "Zerotiger", "tyra314"], + "authors": ["Hunternif", "tyra314"], + "contributors": ["coolAlias", "Kenkron", "TheCodeWarrior", "Localizations by crafteverywhere", "CapoFantasma97", "Mazdallier", "mankra", "Zerotiger"], "entrypoints": { "main": [ - "hunternif.mc.impl.atlas.AntiqueAtlasMod" + "hunternif.mc.impl.atlas.AntiqueAtlasModFabric" ], "client": [ - "hunternif.mc.impl.atlas.AntiqueAtlasModClient" + "hunternif.mc.impl.atlas.AntiqueAtlasClientModFabric" ], "modmenu": [ "hunternif.mc.impl.atlas.client.gui.AntiqueAtlasModMenu" @@ -27,11 +27,12 @@ "depends": { "fabricloader": ">=0.10.8", "fabric": ">=0.28.0", - "minecraft": "~1.18", - "cloth-config2": [">=5.0.0", "<6.0.0"] + "minecraft": ">=1.18.2", + "cloth-config2": [">=6.2.62", "<7.0.0"], + "architectury": ">=4.9.83" }, - "accessWidener": "antiqueatlas.accesswidener", "mixins": [ - "antiqueatlas.mixins.json" + "antiqueatlas.mixins.json", + "antiqueatlas-common.mixins.json" ] } diff --git a/forge/gradle.properties b/forge/gradle.properties new file mode 100644 index 000000000..32f842a63 --- /dev/null +++ b/forge/gradle.properties @@ -0,0 +1 @@ +loom.platform=forge \ No newline at end of file diff --git a/forge/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModForge.java b/forge/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModForge.java new file mode 100644 index 000000000..2ba7924d0 --- /dev/null +++ b/forge/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasModForge.java @@ -0,0 +1,35 @@ +package hunternif.mc.impl.atlas; + +import dev.architectury.platform.forge.EventBuses; +import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; + +@Mod(AntiqueAtlasMod.ID) +public class AntiqueAtlasModForge +{ + public AntiqueAtlasModForge() + { + // Submit our event bus to let architectury register our content on the right time + EventBuses.registerModEventBus(AntiqueAtlasMod.ID, + FMLJavaModLoadingContext.get().getModEventBus()); + + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::initializeClient); + + MinecraftForge.EVENT_BUS.register(this); + AntiqueAtlasMod.init(); + } + + /** + * Despite what the events name might suggest, this event can be used for more than registering + * particle renders as it's called in the {@link net.minecraft.client.MinecraftClient} constructor. + * Thus, here we use it to do all client stuff + * + * @param event + */ + public void initializeClient(ParticleFactoryRegisterEvent event) + { + AntiqueAtlasModClient.init(); + } +} diff --git a/forge/src/main/java/hunternif/mc/impl/atlas/mixin/forge/VolatileMixinPluginImpl.java b/forge/src/main/java/hunternif/mc/impl/atlas/mixin/forge/VolatileMixinPluginImpl.java new file mode 100644 index 000000000..7e5d0e257 --- /dev/null +++ b/forge/src/main/java/hunternif/mc/impl/atlas/mixin/forge/VolatileMixinPluginImpl.java @@ -0,0 +1,10 @@ +package hunternif.mc.impl.atlas.mixin.forge; + +import net.minecraftforge.fml.loading.FMLEnvironment; + +public class VolatileMixinPluginImpl +{ + public static boolean isDevelopmentEnvironment() { + return !FMLEnvironment.production; + } +} \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 000000000..28916cf17 --- /dev/null +++ b/forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,44 @@ +modLoader="javafml" +loaderVersion="[40,)" +license="GNU GENERAL PUBLIC LICENSE" +issueTrackerURL="https://github.com/AntiqueAtlasTeam/AntiqueAtlas/issues" + +[[mods]] +modId="antiqueatlas" +version="${version}" +logoFile="antiqueatlas_icon.png" +displayName="Antique Atlas" +displayURL="https://www.curseforge.com/minecraft/mc-mods/antique-atlas" +credits="Hunternif, Kenkron, osipxd, thecodewarrior, TehNut, crafteverywhere, coolAlias, Ruukas97, Mazdallier, chesterccj305, asiekierka, sam-kirby, esotericist, dadodollabela, Yulife, Waterrail, The-Fireplace, TBM13, Rikshy, GirafiStudios, DrCopernicus, DBotThePony, AugiteSoul, Stereowalker" +authors="Hunternif, tyra314" +description=''' +Antique Atlas is a book that acts like a map featuring infinite scrolling, zoom and custom labeled markers. The map is generated around the player by calculating the average biome in each 16x16 chunk. +''' + +[[dependencies.antiqueatlas]] +modId="forge" +mandatory=true +versionRange="[40,)" +ordering="NONE" +side="BOTH" + +[[dependencies.antiqueatlas]] +modId="minecraft" +mandatory=true +versionRange="[1.18.2,)" +ordering="NONE" +side="BOTH" + +[[dependencies.antiqueatlas]] +modId="cloth-config" +mandatory=true +versionRange="[6.2.62,)" +ordering="NONE" +side="BOTH" + +[[dependencies.antiqueatlas]] +modId = "architectury" +mandatory = true +versionRange = "[4.9.83,)" +ordering = "AFTER" +side = "BOTH" diff --git a/forge/src/main/resources/antiqueatlas.mixins.json b/forge/src/main/resources/antiqueatlas.mixins.json new file mode 100644 index 000000000..6d8e3fec1 --- /dev/null +++ b/forge/src/main/resources/antiqueatlas.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "hunternif.mc.impl.atlas.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta new file mode 100644 index 000000000..ee944f39b --- /dev/null +++ b/forge/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "AntiqueAtlas", + "pack_format": 8 + } +} diff --git a/gradle.properties b/gradle.properties index 7fcd6b197..7e21f6371 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,17 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties minecraft_version = 1.18.2 yarn_mappings = 1.18.2+build.4 -loader_version = 0.14.9 +fabric_loader_version = 0.14.9 +forge_version = 1.18.2-40.1.0 +enabled_platforms = fabric,forge + # Mod Properties -mod_version = 6.2.0-fabric +mod_version = 7.0.0 maven_group = hunternif.mc.atlas archives_base_name = antiqueatlas # Dependencies +architectury_version = 4.9.83 cloth_config_version = 6.2.62 -fabric_version = 0.58.0+1.18.2 +fabric_api_version = 0.58.0+1.18.2 mod_menu_version = 3.2.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85fd..41dfb8790 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index f91a4fe7e..84b550ba8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,14 @@ pluginManagement { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + maven { url "https://maven.architectury.dev/" } + maven { url "https://files.minecraftforge.net/maven/" } gradlePluginPortal() } } + +include("common") +include("fabric") +include("forge") + +rootProject.name = "antiqueatlas" diff --git a/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java b/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java deleted file mode 100644 index 6c286d333..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/event/MarkerClickedCallback.java +++ /dev/null @@ -1,22 +0,0 @@ -package hunternif.mc.impl.atlas.event; - -import hunternif.mc.impl.atlas.marker.Marker; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.entity.player.PlayerEntity; - -@FunctionalInterface -public interface MarkerClickedCallback { - Event EVENT = EventFactory.createArrayBacked(MarkerClickedCallback.class, - (invokers) -> (player, marker, mouseState) -> { - for (MarkerClickedCallback callback : invokers) { - if (callback.onClicked(player, marker, mouseState)) { - return true; - } - } - - return false; - }); - - boolean onClicked(PlayerEntity player, Marker marker, int mouseState); -} diff --git a/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java b/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java deleted file mode 100644 index 6888547c2..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/event/MarkerHoveredCallback.java +++ /dev/null @@ -1,18 +0,0 @@ -package hunternif.mc.impl.atlas.event; - -import hunternif.mc.impl.atlas.marker.Marker; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.entity.player.PlayerEntity; - -@FunctionalInterface -public interface MarkerHoveredCallback { - Event EVENT = EventFactory.createArrayBacked(MarkerHoveredCallback.class, - (invokers) -> (player, marker) -> { - for (MarkerHoveredCallback callback : invokers) { - callback.onHovered(player, marker); - } - }); - - void onHovered(PlayerEntity player, Marker marker); -} diff --git a/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java b/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java deleted file mode 100644 index 2d500eb39..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/item/AntiqueAtlasItems.java +++ /dev/null @@ -1,31 +0,0 @@ -package hunternif.mc.impl.atlas.item; - -import hunternif.mc.impl.atlas.AntiqueAtlasMod; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -public class AntiqueAtlasItems { - public static final EmptyAtlasItem EMPTY_ATLAS = new EmptyAtlasItem(new Item.Settings().group(ItemGroup.MISC)); - public static final AtlasItem ATLAS = new AtlasItem(new Item.Settings().maxCount(1)); - - public static ItemStack getAtlasFromId(int atlasID) { - ItemStack atlas = new ItemStack(ATLAS); - atlas.getOrCreateNbt().putInt("atlasID", atlasID); - - return atlas; - } - - public static void register() { - if (AntiqueAtlasMod.CONFIG.itemNeeded) { - Registry.register(Registry.ITEM, new Identifier("antiqueatlas:empty_antique_atlas"), EMPTY_ATLAS); - Registry.register(Registry.ITEM, new Identifier("antiqueatlas:antique_atlas"), ATLAS); - - Registry.register(Registry.RECIPE_SERIALIZER, "antiqueatlas:atlas_clone", RecipeAtlasCloning.SERIALIZER); - Registry.register(Registry.RECIPE_SERIALIZER, "antiqueatlas:atlas_combine", RecipeAtlasCombining.SERIALIZER); - } - } -} diff --git a/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java b/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java deleted file mode 100644 index ed58c69fa..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewPlayerConnectionCallback.java +++ /dev/null @@ -1,17 +0,0 @@ -package hunternif.mc.impl.atlas.mixinhooks; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; - -@FunctionalInterface -public interface NewPlayerConnectionCallback { - Event EVENT = EventFactory.createArrayBacked(NewPlayerConnectionCallback.class, - (invokers) -> (isRemote) -> { - for (NewPlayerConnectionCallback callback : invokers) { - callback.onNewConnection(isRemote); - } - }); - - void onNewConnection(ServerPlayerEntity player); -} diff --git a/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java b/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java deleted file mode 100644 index 2c30a5b63..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/mixinhooks/NewServerConnectionCallback.java +++ /dev/null @@ -1,16 +0,0 @@ -package hunternif.mc.impl.atlas.mixinhooks; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; - -@FunctionalInterface -public interface NewServerConnectionCallback { - Event EVENT = EventFactory.createArrayBacked(NewServerConnectionCallback.class, - (invokers) -> (isRemote) -> { - for (NewServerConnectionCallback callback : invokers) { - callback.onNewConnection(isRemote); - } - }); - - void onNewConnection(boolean isRemote); -} diff --git a/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java b/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java deleted file mode 100644 index 2d98f0324..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/network/AntiqueAtlasNetworking.java +++ /dev/null @@ -1,29 +0,0 @@ -package hunternif.mc.impl.atlas.network; - -import hunternif.mc.impl.atlas.network.packet.c2s.play.*; -import hunternif.mc.impl.atlas.network.packet.s2c.play.*; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; - -public class AntiqueAtlasNetworking { - @Environment(EnvType.CLIENT) - public static void registerS2CListeners() { - ClientPlayNetworking.registerGlobalReceiver(PutGlobalTileS2CPacket.ID, PutGlobalTileS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(DeleteGlobalTileS2CPacket.ID, DeleteGlobalTileS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(DeleteMarkerS2CPacket.ID, DeleteMarkerS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(DimensionUpdateS2CPacket.ID, DimensionUpdateS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(MapDataS2CPacket.ID, MapDataS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(PutMarkersS2CPacket.ID, PutMarkersS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(PutTileS2CPacket.ID, PutTileS2CPacket::apply); - ClientPlayNetworking.registerGlobalReceiver(TileGroupsS2CPacket.ID, TileGroupsS2CPacket::apply); - } - - public static void registerC2SListeners() { - ServerPlayNetworking.registerGlobalReceiver(PutMarkerC2SPacket.ID, PutMarkerC2SPacket::apply); - ServerPlayNetworking.registerGlobalReceiver(PutBrowsingPositionC2SPacket.ID, PutBrowsingPositionC2SPacket::apply); - ServerPlayNetworking.registerGlobalReceiver(DeleteMarkerC2SPacket.ID, DeleteMarkerC2SPacket::apply); - ServerPlayNetworking.registerGlobalReceiver(PutTileC2SPacket.ID, PutTileC2SPacket::apply); - } -} diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java b/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java deleted file mode 100644 index 4a37d540f..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/structure/StructureAddedCallback.java +++ /dev/null @@ -1,18 +0,0 @@ -package hunternif.mc.impl.atlas.structure; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.structure.StructureStart; -import net.minecraft.world.World; - -public interface StructureAddedCallback { - Event EVENT = EventFactory.createArrayBacked(StructureAddedCallback.class, - (invokers) -> (structurePiece, world) -> { - for (StructureAddedCallback callback : invokers) { - callback.onStructureAdded(structurePiece, world); - } - }); - - void onStructureAdded(StructureStart structureStart, ServerWorld world); -} diff --git a/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java b/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java deleted file mode 100644 index a47c9230a..000000000 --- a/src/main/java/hunternif/mc/impl/atlas/structure/StructurePieceAddedCallback.java +++ /dev/null @@ -1,19 +0,0 @@ -package hunternif.mc.impl.atlas.structure; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.structure.StructurePiece; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; - -public interface StructurePieceAddedCallback { - Event EVENT = EventFactory.createArrayBacked(StructurePieceAddedCallback.class, - (invokers) -> (structurePiece, world) -> { - for (StructurePieceAddedCallback callback : invokers) { - callback.onStructurePieceAdded(structurePiece, world); - } - }); - - void onStructurePieceAdded(StructurePiece structurePiece, ServerWorld world); -}