Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility with modern Expanded Storage #10

Open
wants to merge 3 commits into
base: 1.18.2
Choose a base branch
from
Open

Compatibility with modern Expanded Storage #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b9f8a
Compatibility with modern Expanded Storage
ThinkingBeanz Nov 9, 2023
660977a
Merge pull request #1 from ThinkingBeanz/ThinkingBeanz-patch-1
ThinkingBeanz Nov 9, 2023
b1f0a07
Update build.gradle
ThinkingBeanz Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mixin {
add sourceSets.main, "moremountedstorages.refmap.json"
}

version = '1.2.2'
version = '1.3.0'
group = 'com.juh9870.moremountedstorages' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'moremountedstorages'

Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ ironchests_versioncode = 3795374
storagedrawers_versioncode = 3807626
framedcompactingdrawers_versioncode = 3808242
immersiveengineering_versioncode = 3823066
expandedstorage_versioncode = 3818505
ninjaphenixs_container_library_versioncode = 3813786
expandedstorage_versioncode = 4541065
supermartijn642score_versioncode = 3863129
trashcans_versioncode = 3773710
shetiphiancore_versioncode = 3832652
Expand Down
10 changes: 5 additions & 5 deletions ...com/juh9870/moremountedstorages/integrations/expandedstorage/ExpandedStorageRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import net.minecraft.world.level.Level;
import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.items.IItemHandler;
import ellemes.expandedstorage.Common;
import ellemes.expandedstorage.common.CommonMain;
import ninjaphenix.expandedstorage.api.EsChestType;
import ninjaphenix.expandedstorage.api.ExpandedStorageAccessors;

Expand Down Expand Up @@ -60,10 +60,10 @@ public boolean canUseAsStorage(BlockEntity te) {
@Override
public BlockEntityType<?>[] affectedStorages() {
return new BlockEntityType<?>[]{
Common.getBarrelBlockEntityType(),
Common.getChestBlockEntityType(),
Common.getOldChestBlockEntityType(),
Common.getMiniChestBlockEntityType(),
CommonMain.getBarrelBlockEntityType(),
CommonMain.getChestBlockEntityType(),
CommonMain.getOldChestBlockEntityType(),
CommonMain.getMiniStorageBlockEntityType(),
};
}

Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/juh9870/moremountedstorages/mixin/expandedstorage/AbstractChestBlockMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.juh9870.moremountedstorages.mixin.expandedstorage;

import ellemes.expandedstorage.block.OpenableBlock;
import ellemes.expandedstorage.common.block.OpenableBlock;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
Expand All @@ -14,7 +14,7 @@ public class AbstractChestBlockMixin {
@Redirect(
at = @At(
value = "INVOKE",
target = "Lellemes/expandedstorage/block/OpenableBlock;rotate(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState;"
target = "Lellemes/expandedstorage/common/block/OpenableBlock;rotate(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState;"
),
method = "rotate",
remap = false
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Suppoted mods:
- Immersive Engineering https://www.curseforge.com/minecraft/mc-mods/immersive-engineering
- Industrial Foregoing https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing
- PneumaticCraft: Repressurized https://www.curseforge.com/minecraft/mc-mods/pneumaticcraft-repressurized
- Expanded Storage: https://www.curseforge.com/minecraft/mc-mods/expanded-storage-forge
- Expanded Storage: https://www.curseforge.com/minecraft/mc-mods/expanded-storage
- EnderChests: https://www.curseforge.com/minecraft/mc-mods/enderchests
- DimStorage: https://www.curseforge.com/minecraft/mc-mods/dimstorage'''
[[dependencies.moremountedstorages]] #optional
Expand Down Expand Up @@ -78,7 +78,7 @@ Suppoted mods:
[[dependencies.moremountedstorages]]
modId="expandedstorage"
mandatory=false
versionRange="[7.4.0-beta.4,)" #keep updated
versionRange="[8.3.3,)" #keep updated
ordering="AFTER"
side="BOTH"
[[dependencies.moremountedstorages]]
Expand Down