Support minecolonies 1.20.1-1.1.1186-snapshot

Author: SirEndii

build.gradle

@@ -231,16 +231,6 @@ repositories {
             includeGroup("me.shedaniel.cloth")
         }
     }
-    maven {
-        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage")
-        credentials {
-            username = "anything"
-            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
-        }
-        content {
-            includeModule("com.refinedmods", "refinedstorage")
-        }
-    }
     maven {
         name = 'Kotlin for Forge'
         url = 'https://thedarkcolour.github.io/KotlinForForge/'
@@ -294,9 +284,8 @@ dependencies {
     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}")
 
     // Refined Storage
-    implementation fg.deobf("com.refinedmods:refinedstorage:${refinedstorage_version}") {
-        transitive false
-    }
+    compileOnly fg.deobf("curse.maven:refined-storage-243076:${refinedstorage_version}")
+    runtimeOnly fg.deobf("curse.maven:refined-storage-243076:${refinedstorage_version}")
 
     // AE2 Things
     compileOnly fg.deobf("curse.maven:ae2things-609977:${ae2things_version}-sources")

gradle.properties

@@ -28,10 +28,10 @@ ttoolkit_version=0.1.3
 # Mod dependencies
 cc_version=1.116.1
 curios_version=5.2.0+1.20.1
-minecolonies_version=1.20.1-1.1.897-snapshot
+minecolonies_version=1.20.1-1.1.1186-snapshot
 appliedenergistics_version=15.0.9-beta
 patchouli_version=1.20.1-84
-refinedstorage_version=1.12.3
+refinedstorage_version=4844585
 botania_version=1.20.1-443-FORGE
 create_version=6.0.4-96
 mekanism_version=1.20.1-10.4.2.16
@@ -43,10 +43,10 @@ appliedmekanistics_version=4842281
 
 # Mod dependencies which are needed for other mods
 # For minecolonies
-structurize_version=1.20.1-1.0.771-snapshot
+structurize_version=1.20.1-1.0.793-snapshot
 multipiston_version=1.20.1-1.2.30-ALPHA
 blockui_version=1.20.1-1.0.190-snapshot
-domumornamentum_version=1.20.1-1.0.184-BETA
+domumornamentum_version=1.20.1-1.0.288-snapshot
 
 # For Create
 flywheel_version=1.0.2

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java

@@ -184,7 +184,7 @@ public final Object getVisitors() throws LuaException {
     public final Object getBuildings() throws LuaException {
         IColony colony = getColony();
 
-        IRegisteredStructureManager manager = colony.getBuildingManager();
+        IRegisteredStructureManager manager = colony.getServerBuildingManager();
         List<Object> buildingData = new ArrayList<>();
         for (Map.Entry<BlockPos, IBuilding> building : manager.getBuildings().entrySet()) {
             buildingData.add(MineColonies.buildingToObject(manager, building.getValue(), building.getKey()));

src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java

@@ -210,7 +210,7 @@ public static Object buildingToObject(IRegisteredStructureManager buildingManage
         map.put("maxLevel", building.getMaxBuildingLevel());
         map.put("name", building.getBuildingDisplayName());
         map.put("built", building.isBuilt());
-        map.put("isWorkingOn", building.hasWorkOrder());
+        map.put("isWorkingOn", building.isPendingConstruction());
         map.put("priority", building.getPickUpPriority());
         map.put("structure", structureData);
         map.put("citizens", citizensData);
@@ -238,8 +238,8 @@ public static int getStorageSize(IBuilding building) {
 
     public static int getAmountOfConstructionSites(IColony colony) {
         int constructionSites = 0;
-        for (IBuilding building : colony.getBuildingManager().getBuildings().values()) {
-            if (building.hasWorkOrder())
+        for (IBuilding building : colony.getServerBuildingManager().getBuildings().values()) {
+            if (building.isPendingConstruction())
                 constructionSites++;
         }
 
@@ -349,7 +349,7 @@ public static List<Object> getResearch(ResourceLocation branch, List<ResourceLoc
      * @return a map with all needed resources
      */
     public static Object builderResourcesToObject(IColony colony, BlockPos pos) {
-        IBuilding building = colony.getBuildingManager().getBuilding(pos);
+        IBuilding building = colony.getServerBuildingManager().getBuilding(pos);
         if (!(building instanceof AbstractBuildingStructureBuilder builderBuilding))
             return null;
 
@@ -365,7 +365,7 @@ public static Object builderResourcesToObject(IColony colony, BlockPos pos) {
         final List<Delivery> deliveries = new ArrayList<>();
 
         if (colonyView != null) {
-            final IBuildingView buildingView = colonyView.getBuilding(pos);
+            final IBuildingView buildingView = colonyView.getClientBuildingManager().getBuilding(pos);
             if (buildingView instanceof BuildingBuilder.View builderBuildingView) {
                 for (Map.Entry<Integer, Collection<IToken<?>>> entry : builderBuildingView.getOpenRequestsByCitizen().entrySet()) {
                     addDeliveryRequestsToList(builderBuildingView, deliveries, ImmutableList.copyOf(entry.getValue()));