Skip to content

Commit

Permalink
Showing 14 changed files with 11 additions and 169 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [2.0.0-milestone.3.12] - 2024-06-16

### Removed

- The Trinkets integration has been removed and will be moved to an addon mod.

## [2.0.0-milestone.3.11] - 2024-06-16

### Removed
@@ -598,7 +604,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- The Grid can now use smooth scrolling.
- The Grid now has syntax highlighting for the search query.

[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.11...HEAD
[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.12...HEAD

[2.0.0-milestone.3.12]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.11...v2.0.0-milestone.3.12

[2.0.0-milestone.3.11]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.10...v2.0.0-milestone.3.11

2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
noIndiumVersion=1.1.0+1.20.4
trinketsVersion=3.8.0
cardinalComponentsVersion=5.4.0
# Gradle
org.gradle.jvmargs=-Xmx1G
Original file line number Diff line number Diff line change
@@ -197,7 +197,7 @@ protected final void initializePlatformApi() {
registerNetworkComponents();
registerWirelessTransmitterRangeModifiers();
registerPermissions();
registerSlotReferenceProviders();
registerSlotReferenceProvider();
}

private void registerStorageTypes() {
@@ -787,7 +787,7 @@ protected final void registerRecipeSerializers(final RegistryCallback<RecipeSeri
);
}

protected void registerSlotReferenceProviders() {
protected final void registerSlotReferenceProvider() {
PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register(
createIdentifier("inventory"),
InventorySlotReferenceFactory.INSTANCE
Original file line number Diff line number Diff line change
@@ -270,7 +270,6 @@
"key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory",
"key.refinedstorage2.open_wireless_grid": "Open Wireless Grid",
"refinedstorage2.subtitle.wrench": "Wrench used",
"trinkets.slot.refinedstorage2.wireless": "Refined Storage 2",
"permission.refinedstorage2.insert": "Insert",
"permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.",
"permission.refinedstorage2.extract": "Extract",
9 changes: 0 additions & 9 deletions refinedstorage2-platform-fabric/build.gradle
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@ repositories {
name = 'NoIndium'
url = 'https://maven.cafeteria.dev/releases/'
}
maven {
name = "Trinkets"
url = 'https://maven.ladysnake.org/releases'
}
}

fabricProject("refinedstorage2", project(":refinedstorage2-platform-common"), apis, compileApis)
@@ -36,11 +32,6 @@ dependencies {
include "me.luligabi:NoIndium:${noIndiumVersion}"

modApi libs.modmenu

// https://www.curseforge.com/minecraft/mc-mods/trinkets/files
modApi "dev.emi:trinkets:${trinketsVersion}"
modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${cardinalComponentsVersion}"
modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${cardinalComponentsVersion}"
}

enablePublishing()
Original file line number Diff line number Diff line change
@@ -52,8 +52,6 @@
import com.refinedmods.refinedstorage2.platform.fabric.storage.externalstorage.FabricStoragePlatformExternalStorageProviderFactory;
import com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid.FabricPortableGridBlockEntity;
import com.refinedmods.refinedstorage2.platform.fabric.support.energy.EnergyStorageAdapter;
import com.refinedmods.refinedstorage2.platform.fabric.support.network.bounditem.TrinketsSlotReferenceFactory;
import com.refinedmods.refinedstorage2.platform.fabric.support.network.bounditem.TrinketsSlotReferenceProvider;
import com.refinedmods.refinedstorage2.platform.fabric.support.resource.ResourceContainerFluidStorageAdapter;
import com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil;

@@ -432,18 +430,6 @@ private void registerTickHandler() {
ServerTickEvents.START_SERVER_TICK.register(server -> ServerEventQueue.runQueuedActions());
}

@Override
protected void registerSlotReferenceProviders() {
super.registerSlotReferenceProviders();
TrinketsSlotReferenceProvider.create().ifPresent(slotReferenceProvider -> {
PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register(
createIdentifier("trinkets"),
TrinketsSlotReferenceFactory.INSTANCE
);
PlatformApi.INSTANCE.addSlotReferenceProvider(slotReferenceProvider);
});
}

private void registerWrenchingEvent() {
UseBlockCallback.EVENT.register((player, level, hand, hitResult) -> {
final BlockState state = level.getBlockState(hitResult.getBlockPos());

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit bfc44ec

Please sign in to comment.