From b3758383a00df9229f8bd0eacea57771daccc985 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 11:13:16 +0200 Subject: [PATCH 1/5] fix: auto register the noop synchronizer This causes ordering issues with the recipe mod addons otherwise since the side button assumes the noop is always the first. --- .../platform/common/AbstractClientModInitializer.java | 8 -------- .../platform/common/PlatformApiImpl.java | 10 ++++++++-- .../resources/assets/refinedstorage2/lang/en_us.json | 1 - .../platform/fabric/ClientModInitializerImpl.java | 5 ----- .../platform/forge/ClientModInitializer.java | 5 ----- 5 files changed, 8 insertions(+), 21 deletions(-) diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java index e73ce9111..ad25bb221 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java @@ -10,7 +10,6 @@ import com.refinedmods.refinedstorage2.platform.common.detector.DetectorScreen; import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterScreen; import com.refinedmods.refinedstorage2.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.NoopGridSynchronizer; import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridContainerMenu; import com.refinedmods.refinedstorage2.platform.common.grid.screen.CraftingGridScreen; import com.refinedmods.refinedstorage2.platform.common.grid.screen.GridScreen; @@ -51,13 +50,6 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; public abstract class AbstractClientModInitializer { - protected static void registerBaseGridSynchronizer() { - PlatformApi.INSTANCE.getGridSynchronizerRegistry().register( - createIdentifier("off"), - NoopGridSynchronizer.INSTANCE - ); - } - protected static void registerScreens(final ScreenRegistration registration) { registration.register(Menus.INSTANCE.getDiskDrive(), DiskDriveScreen::new); registration.register(Menus.INSTANCE.getGrid(), GridScreen::new); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java index 14b6c9380..8591e8b07 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java @@ -50,6 +50,7 @@ import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.grid.NoopGridSynchronizer; import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.GridInsertionHintsImpl; import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.ItemGridInsertionHint; import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.SingleItemGridInsertionHint; @@ -88,7 +89,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.PriorityQueue; import java.util.Queue; @@ -116,7 +116,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.saveddata.SavedData; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static java.util.Objects.requireNonNull; public class PlatformApiImpl implements PlatformApi { private final StorageRepository clientStorageRepository = @@ -169,6 +171,10 @@ public class PlatformApiImpl implements PlatformApi { private final CompositeSlotReferenceProvider slotReferenceProvider = new CompositeSlotReferenceProvider(); private final PlatformRegistry permissionRegistry = new PlatformRegistryImpl<>(); + public PlatformApiImpl() { + gridSynchronizerRegistry.register(createIdentifier("off"), NoopGridSynchronizer.INSTANCE); + } + @Override public PlatformRegistry getStorageTypeRegistry() { return storageTypeRegistry; @@ -180,7 +186,7 @@ public StorageRepository getStorageRepository(final Level level) { if (level.getServer() == null) { return clientStorageRepository; } - final ServerLevel serverLevel = Objects.requireNonNull(level.getServer().getLevel(Level.OVERWORLD)); + final ServerLevel serverLevel = requireNonNull(level.getServer().getLevel(Level.OVERWORLD)); return serverLevel.getDataStorage().computeIfAbsent(new SavedData.Factory<>( this::createStorageRepository, this::createStorageRepository, diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json index d607aef97..4da3bef51 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json @@ -7,7 +7,6 @@ "block.refinedstorage2.grid": "Grid", "block.refinedstorage2.crafting_grid": "Crafting Grid", "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.controller.rei_fully_charged": "Fully charged Controller", "block.refinedstorage2.creative_controller": "Creative Controller", "block.refinedstorage2.1k_storage_block": "1K Storage Block", "block.refinedstorage2.4k_storage_block": "4K Storage Block", diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java index 495897fc5..99f2fcd81 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java @@ -63,15 +63,11 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Block; import org.lwjgl.glfw.GLFW; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationKey; public class ClientModInitializerImpl extends AbstractClientModInitializer implements ClientModInitializer { - private static final Logger LOGGER = LoggerFactory.getLogger(ClientModInitializerImpl.class); - @Override public void onInitializeClient() { setRenderLayers(); @@ -91,7 +87,6 @@ public > void }); registerKeyBindings(); registerModelPredicates(); - registerBaseGridSynchronizer(); registerResourceRendering(); registerAlternativeGridHints(); registerItemProperties(); diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java index 278e35236..1ec7e7b94 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java @@ -46,8 +46,6 @@ import net.neoforged.neoforge.client.settings.KeyModifier; import net.neoforged.neoforge.common.NeoForge; import org.lwjgl.glfw.GLFW; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DISK_DRIVE; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID; @@ -55,8 +53,6 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationKey; public final class ClientModInitializer extends AbstractClientModInitializer { - private static final Logger LOGGER = LoggerFactory.getLogger(ClientModInitializer.class); - private ClientModInitializer() { } @@ -66,7 +62,6 @@ public static void onClientSetup(final FMLClientSetupEvent e) { e.enqueueWork(ClientModInitializer::registerModelPredicates); e.enqueueWork(ClientModInitializer::registerItemProperties); registerBlockEntityRenderer(); - registerBaseGridSynchronizer(); registerResourceRendering(); registerAlternativeGridHints(); registerDiskModels(); From 7f7505e547769ee8163b0c51e5eec64292a553cc Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 11:15:06 +0200 Subject: [PATCH 2/5] fix: sonar issues --- .../network/impl/FakeConnectionProvider.java | 2 +- .../common/support/AbstractSafeSavedData.java | 23 ++++++++++++------- .../common/grid/GridSortingTypesTest.java | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java index e64f24b93..30635e346 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java +++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java @@ -78,6 +78,6 @@ public List sortDeterministically(final Set getModName(final String modId) { void setUp() { viewBuilder = new GridViewBuilderImpl( FACTORY, - (view) -> Comparator.comparing(GridResource::getName), - (view) -> Comparator.comparing(GridResource::getAmount) + view -> Comparator.comparing(GridResource::getName), + view -> Comparator.comparing(GridResource::getAmount) ); dirt = new ItemResource(Items.DIRT, null); stone = new ItemResource(Items.STONE, null); From 8969d3b872cb8a0a2af446aa680068ddb919e619 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 12:55:50 +0200 Subject: [PATCH 3/5] fix: tooltip rendering order ModernUI relies on the correct order. --- CHANGELOG.md | 4 ++++ .../platform/common/support/AbstractBaseScreen.java | 11 +++++++++++ .../support/widget/AbstractSideButtonWidget.java | 9 +++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a5258d74..e39f54ef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Side button tooltip rendering issue with ModernUI. + ## [2.0.0-milestone.3.8] - 2024-06-08 ### Removed diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java index cfc317897..b6950210c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java @@ -50,6 +50,9 @@ public abstract class AbstractBaseScreen extend private final List exclusionZones = new ArrayList<>(); private int sideButtonY; + @Nullable + private List deferredTooltip; + protected AbstractBaseScreen(final T menu, final Inventory playerInventory, final Component text) { super(menu, playerInventory, text); this.playerInventory = playerInventory; @@ -189,9 +192,17 @@ protected void renderTooltip(final GuiGraphics graphics, final int x, final int return; } } + if (deferredTooltip != null) { + Platform.INSTANCE.renderTooltip(graphics, deferredTooltip, x, y); + deferredTooltip = null; + } super.renderTooltip(graphics, x, y); } + public void setDeferredTooltip(@Nullable final List deferredTooltip) { + this.deferredTooltip = deferredTooltip; + } + private List getUpgradeTooltip(final ItemStack carried, final UpgradeSlot upgradeSlot) { if (!carried.isEmpty() || upgradeSlot.hasItem()) { return Collections.emptyList(); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java index 4aa279714..1cbd57728 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage2.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.support.tooltip.SmallTextClientTooltipComponent; @@ -11,8 +11,10 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -66,7 +68,10 @@ public void renderWidget(final GuiGraphics graphics, final int mouseX, final int graphics.blit(getTextureIdentifier(), getX(), getY(), 238, 54, WIDTH, HEIGHT); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.disableBlend(); - Platform.INSTANCE.renderTooltip(graphics, buildTooltip(), mouseX, mouseY); + final Screen screen = Minecraft.getInstance().screen; + if (screen instanceof AbstractBaseScreen baseScreen) { + baseScreen.setDeferredTooltip(buildTooltip()); + } } if (warning != null) { renderWarning(graphics); From 5a147866892015a2e31dea6aaa1a184c847eea35 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 10 Jun 2024 00:05:44 +0200 Subject: [PATCH 4/5] build: tweak gradle config Use api to expose to addons. Switch to new refined architect and specify versions in properties. --- gradle.properties | 4 +++ refinedstorage2-grid-api/build.gradle | 8 +++--- refinedstorage2-network-api/build.gradle | 8 +++--- refinedstorage2-network-test/build.gradle | 16 +++++++----- refinedstorage2-network/build.gradle | 14 +++++++---- refinedstorage2-platform-api/build.gradle | 10 ++++---- refinedstorage2-platform-common/build.gradle | 20 +++++++++------ refinedstorage2-platform-fabric/build.gradle | 26 ++++++++------------ refinedstorage2-platform-forge/build.gradle | 8 ++++-- refinedstorage2-query-parser/build.gradle | 6 ++++- refinedstorage2-resource-api/build.gradle | 2 +- refinedstorage2-storage-api/build.gradle | 4 +-- settings.gradle | 11 +-------- 13 files changed, 73 insertions(+), 64 deletions(-) diff --git a/gradle.properties b/gradle.properties index a8d260d7d..8d638ebd3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,6 @@ +noIndiumVersion=1.1.0+1.20.4 +trinketsVersion=3.8.0 +cardinalComponentsVersion=5.4.0 +curiosVersion=7.1.0+1.20.4 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage2-grid-api/build.gradle b/refinedstorage2-grid-api/build.gradle index 52de50795..76b4faa44 100644 --- a/refinedstorage2-grid-api/build.gradle +++ b/refinedstorage2-grid-api/build.gradle @@ -6,6 +6,10 @@ archivesBaseName = 'refinedstorage2-grid-api' dependencies { api libs.apiguardian + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-core-api') + api project(':refinedstorage2-storage-api') + api project(':refinedstorage2-query-parser') implementation libs.slf4j.api testImplementation libs.junit.api testImplementation libs.junit.params @@ -13,10 +17,6 @@ dependencies { testRuntimeOnly libs.slf4j.impl testImplementation libs.assertj testImplementation libs.mockito - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-core-api') - implementation project(':refinedstorage2-storage-api') - implementation project(':refinedstorage2-query-parser') } test { diff --git a/refinedstorage2-network-api/build.gradle b/refinedstorage2-network-api/build.gradle index 1190d4beb..af7d5aaa8 100644 --- a/refinedstorage2-network-api/build.gradle +++ b/refinedstorage2-network-api/build.gradle @@ -6,10 +6,10 @@ archivesBaseName = 'refinedstorage2-network-api' dependencies { api libs.apiguardian - implementation project(':refinedstorage2-core-api') - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-storage-api') - implementation project(':refinedstorage2-grid-api') + api project(':refinedstorage2-core-api') + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-storage-api') + api project(':refinedstorage2-grid-api') } enableJavadoc() diff --git a/refinedstorage2-network-test/build.gradle b/refinedstorage2-network-test/build.gradle index f5478bc64..fe53b5495 100644 --- a/refinedstorage2-network-test/build.gradle +++ b/refinedstorage2-network-test/build.gradle @@ -1,12 +1,16 @@ +plugins { + id 'java-library' +} + archivesBaseName = 'refinedstorage2-network-test' dependencies { - implementation project(':refinedstorage2-network-api') - implementation project(':refinedstorage2-network') - implementation project(':refinedstorage2-storage-api') - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-core-api') - implementation project(':refinedstorage2-grid-api') + api project(':refinedstorage2-network-api') + api project(':refinedstorage2-network') + api project(':refinedstorage2-storage-api') + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-core-api') + api project(':refinedstorage2-grid-api') implementation libs.junit.api testRuntimeOnly libs.junit.engine testImplementation libs.assertj diff --git a/refinedstorage2-network/build.gradle b/refinedstorage2-network/build.gradle index fccfeafa4..32cfed3fe 100644 --- a/refinedstorage2-network/build.gradle +++ b/refinedstorage2-network/build.gradle @@ -1,6 +1,15 @@ +plugins { + id 'java-library' +} + archivesBaseName = 'refinedstorage2-network' dependencies { + api project(':refinedstorage2-core-api') + api project(':refinedstorage2-network-api') + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-storage-api') + api project(':refinedstorage2-grid-api') implementation libs.slf4j.api testRuntimeOnly libs.slf4j.impl testImplementation libs.junit.api @@ -9,11 +18,6 @@ dependencies { testImplementation libs.assertj testImplementation libs.mockito testImplementation project(':refinedstorage2-network-test') - implementation project(':refinedstorage2-core-api') - implementation project(':refinedstorage2-network-api') - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-storage-api') - implementation project(':refinedstorage2-grid-api') } test { diff --git a/refinedstorage2-platform-api/build.gradle b/refinedstorage2-platform-api/build.gradle index e76ad2f82..dcec82b8e 100644 --- a/refinedstorage2-platform-api/build.gradle +++ b/refinedstorage2-platform-api/build.gradle @@ -8,11 +8,11 @@ archivesBaseName = 'refinedstorage2-platform-api' dependencies { api libs.apiguardian - implementation project(':refinedstorage2-core-api') - implementation project(':refinedstorage2-storage-api') - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-network-api') - implementation project(':refinedstorage2-grid-api') + api project(':refinedstorage2-core-api') + api project(':refinedstorage2-storage-api') + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-network-api') + api project(':refinedstorage2-grid-api') testImplementation libs.junit.api testImplementation libs.junit.params testRuntimeOnly libs.junit.engine diff --git a/refinedstorage2-platform-common/build.gradle b/refinedstorage2-platform-common/build.gradle index ef6c81907..12bcfbff5 100644 --- a/refinedstorage2-platform-common/build.gradle +++ b/refinedstorage2-platform-common/build.gradle @@ -1,16 +1,20 @@ +plugins { + id 'java-library' +} + archivesBaseName = 'refinedstorage2-platform-common' commonProject() dependencies { - implementation project(':refinedstorage2-platform-api') - implementation project(':refinedstorage2-core-api') - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-storage-api') - implementation project(':refinedstorage2-network-api') - implementation project(':refinedstorage2-network') - implementation project(':refinedstorage2-query-parser') - implementation project(':refinedstorage2-grid-api') + api project(':refinedstorage2-platform-api') + api project(':refinedstorage2-core-api') + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-storage-api') + api project(':refinedstorage2-network-api') + api project(':refinedstorage2-network') + api project(':refinedstorage2-query-parser') + api project(':refinedstorage2-grid-api') testImplementation libs.junit.api testImplementation libs.junit.params testRuntimeOnly libs.junit.engine diff --git a/refinedstorage2-platform-fabric/build.gradle b/refinedstorage2-platform-fabric/build.gradle index b2614b15f..3178da21a 100644 --- a/refinedstorage2-platform-fabric/build.gradle +++ b/refinedstorage2-platform-fabric/build.gradle @@ -9,10 +9,6 @@ repositories { name = 'Cloth Config' url 'https://maven.shedaniel.me/' } - maven { - name = 'wthit' - url "https://maven.bai.lol" - } maven { name = 'NoIndium' url = 'https://maven.cafeteria.dev/releases/' @@ -26,27 +22,25 @@ repositories { fabricProject("refinedstorage2", project(":refinedstorage2-platform-common"), apis, compileApis) dependencies { - modImplementation(fabric.cloth.config) { + modApi(libs.cloth.config) { exclude(group: 'net.fabricmc.fabric-api') } - include fabric.cloth.config + include libs.cloth.config - modImplementation(fabric.teamreborn.energy) { + modApi(libs.teamreborn.energy) { exclude(group: 'net.fabricmc.fabric-api') } - include fabric.teamreborn.energy - - modImplementation fabric.noIndium - include fabric.noIndium + include libs.teamreborn.energy - modImplementation fabric.modmenu + modApi "me.luligabi:NoIndium:${noIndiumVersion}" + include "me.luligabi:NoIndium:${noIndiumVersion}" - modRuntimeOnly fabric.wthit + modApi libs.modmenu // https://www.curseforge.com/minecraft/mc-mods/trinkets/files - modImplementation "dev.emi:trinkets:3.8.0" - modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.4.0" - modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.4.0" + 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() diff --git a/refinedstorage2-platform-forge/build.gradle b/refinedstorage2-platform-forge/build.gradle index 238158255..35d7fa24a 100644 --- a/refinedstorage2-platform-forge/build.gradle +++ b/refinedstorage2-platform-forge/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'java-library' +} + repositories { maven { name = 'Curios' @@ -10,8 +14,8 @@ forgeProject("refinedstorage2", project(":refinedstorage2-platform-common"), api archivesBaseName = 'refinedstorage2-platform-forge' dependencies { - runtimeOnly "top.theillusivec4.curios:curios-neoforge:7.1.0+1.20.4" - compileOnly "top.theillusivec4.curios:curios-neoforge:7.1.0+1.20.4:api" + runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curiosVersion}" + compileOnlyApi "top.theillusivec4.curios:curios-neoforge:${curiosVersion}:api" } enablePublishing() diff --git a/refinedstorage2-query-parser/build.gradle b/refinedstorage2-query-parser/build.gradle index 9e98f7269..5d6610f0e 100644 --- a/refinedstorage2-query-parser/build.gradle +++ b/refinedstorage2-query-parser/build.gradle @@ -1,11 +1,15 @@ +plugins { + id 'java-library' +} + archivesBaseName = 'refinedstorage2-query-parser' dependencies { + api project(':refinedstorage2-core-api') testImplementation libs.junit.api testImplementation libs.junit.params testRuntimeOnly libs.junit.engine testImplementation libs.assertj - implementation project(':refinedstorage2-core-api') } test { diff --git a/refinedstorage2-resource-api/build.gradle b/refinedstorage2-resource-api/build.gradle index 3fcf804f6..0ff1b7d23 100644 --- a/refinedstorage2-resource-api/build.gradle +++ b/refinedstorage2-resource-api/build.gradle @@ -6,10 +6,10 @@ archivesBaseName = 'refinedstorage2-resource-api' dependencies { api libs.apiguardian + api project(":refinedstorage2-core-api") testImplementation libs.junit.api testRuntimeOnly libs.junit.engine testImplementation libs.assertj - implementation project(":refinedstorage2-core-api") } test { diff --git a/refinedstorage2-storage-api/build.gradle b/refinedstorage2-storage-api/build.gradle index 8f937ee3b..aa004399e 100644 --- a/refinedstorage2-storage-api/build.gradle +++ b/refinedstorage2-storage-api/build.gradle @@ -6,6 +6,8 @@ archivesBaseName = 'refinedstorage2-storage-api' dependencies { api libs.apiguardian + api project(':refinedstorage2-resource-api') + api project(':refinedstorage2-core-api') implementation libs.slf4j.api testImplementation libs.junit.api testImplementation libs.junit.params @@ -13,8 +15,6 @@ dependencies { testRuntimeOnly libs.slf4j.impl testImplementation libs.assertj testImplementation libs.mockito - implementation project(':refinedstorage2-resource-api') - implementation project(':refinedstorage2-core-api') } test { diff --git a/settings.gradle b/settings.gradle index 90c2297da..f010629ad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.refinedArchitectVersion = "0.12.1" +gradle.ext.refinedArchitectVersion = "0.13.2" dependencyResolutionManagement { repositories { @@ -11,15 +11,6 @@ dependencyResolutionManagement { } } versionCatalogs { - create("common") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-common:${gradle.ext.refinedArchitectVersion}") - } - create("fabric") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-fabric:${gradle.ext.refinedArchitectVersion}") - } - create("forge") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-forge:${gradle.ext.refinedArchitectVersion}") - } create("libs") { from("com.refinedmods.refinedarchitect:refinedarchitect-catalog:${gradle.ext.refinedArchitectVersion}") } From d8db6711ff5c650ff86e03c0fe90795d85deb063 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 22:21:46 +0000 Subject: [PATCH 5/5] chore: prepare release v2.0.0-milestone.3.9 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e39f54ef6..906ae3b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [2.0.0-milestone.3.9] - 2024-06-09 + ### Fixed - Side button tooltip rendering issue with ModernUI. @@ -588,7 +590,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.8...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.9...HEAD + +[2.0.0-milestone.3.9]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.8...v2.0.0-milestone.3.9 [2.0.0-milestone.3.8]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.7...v2.0.0-milestone.3.8