Skip to content

Commit 082131a

Browse files
committed
Support minecolonies 1.1.1282-1.21.1-snapshot
1 parent 7a8443b commit 082131a

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ae2things_version=5637783
3131
appliedenergistics_version=19.2.13
3232
appliedmekanistics_version=5978711
3333
mekanism_version=1.21.1-10.7.15.81
34-
minecolonies_version=1.1.1230-1.21.1-snapshot
34+
minecolonies_version=1.1.1282-1.21.1-snapshot
3535
patchouli_version=1.21-88
3636
powah_version=6143661
3737
refinedstorage_mekanism_version=1.1.0
@@ -42,7 +42,7 @@ refinedstorage_version=2.0.0
4242
blockui_version=1.0.199-1.21.1-snapshot
4343
domumornamentum_version=1.0.223-snapshot
4444
multipiston_version=1.2.51-1.21.1-snapshot
45-
structurize_version=1.0.796-1.21.1-snapshot
45+
structurize_version=1.0.810-1.21.1-snapshot
4646
# powah
4747
cloth_config_version=15.0.127
4848

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public final Object getVisitors() throws LuaException {
187187
public final Object getBuildings() throws LuaException {
188188
IColony colony = getColony();
189189

190-
IRegisteredStructureManager manager = colony.getBuildingManager();
190+
IRegisteredStructureManager manager = colony.getServerBuildingManager();
191191
List<Object> buildingData = new ArrayList<>();
192192
for (Map.Entry<BlockPos, IBuilding> building : manager.getBuildings().entrySet()) {
193193
buildingData.add(MineColonies.buildingToObject(manager, building.getValue(), building.getKey()));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public static int getStorageSize(IBuilding building) {
236236

237237
public static int getAmountOfConstructionSites(IColony colony) {
238238
int constructionSites = 0;
239-
for (IBuilding building : colony.getBuildingManager().getBuildings().values()) {
239+
for (IBuilding building : colony.getServerBuildingManager().getBuildings().values()) {
240240
if (building.isPendingConstruction())
241241
constructionSites++;
242242
}
@@ -345,7 +345,7 @@ public static List<Object> getResearch(ResourceLocation branch, List<ResourceLoc
345345
* @return a map with all needed resources
346346
*/
347347
public static Object builderResourcesToObject(IColony colony, BlockPos pos) {
348-
IBuilding building = colony.getBuildingManager().getBuilding(pos);
348+
IBuilding building = colony.getServerBuildingManager().getBuilding(pos);
349349
if (!(building instanceof AbstractBuildingStructureBuilder builderBuilding))
350350
return null;
351351

@@ -361,7 +361,7 @@ public static Object builderResourcesToObject(IColony colony, BlockPos pos) {
361361
final List<Delivery> deliveries = new ArrayList<>();
362362

363363
if (colonyView != null) {
364-
final IBuildingView buildingView = colonyView.getBuilding(pos);
364+
final IBuildingView buildingView = colonyView.getClientBuildingManager().getBuilding(pos);
365365
if (buildingView instanceof BuildingBuilder.View builderBuildingView) {
366366
for (Map.Entry<Integer, Collection<IToken<?>>> entry : builderBuildingView.getOpenRequestsByCitizen().entrySet()) {
367367
addDeliveryRequestsToList(builderBuildingView, deliveries, ImmutableList.copyOf(entry.getValue()));

0 commit comments

Comments
 (0)