From 8ccdf7f3f1890bf931d60f77794125f757f543c1 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 15 Dec 2021 19:41:46 +0100 Subject: [PATCH 1/7] Bump version to v0.8.1 --- CHANGELOG.md | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adc8a85..6928594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v0.8.0] - 2021-12-15 + ### Added - Ported to Minecraft 1.18.1. diff --git a/build.gradle b/build.gradle index ccd53cb..f9143c7 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ apply plugin: 'maven-publish' group = 'com.refinedmods' archivesBaseName = 'refinedstorageaddons' -version = '0.8.0' +version = '0.8.1' if (System.getenv('GITHUB_SHA') != null) { version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) From 7794982c80a055d096e932f51a440347e8946f0f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 18 Dec 2021 14:19:38 +0100 Subject: [PATCH 2/7] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 048ef24..ff0454b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to Refined Storage +# Contributing to Refined Storage Addons ## Versioning From 841c1a2607fd4dea4946eef62a550527bd165e28 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 18 Dec 2021 16:48:41 +0100 Subject: [PATCH 3/7] Add FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..bc4961c --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +patreon: raoulvdberge \ No newline at end of file From 64f3662e5c460d3cfc8527a9982a6afdd8a04db7 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 18 Dec 2021 22:14:58 +0100 Subject: [PATCH 4/7] Rename MainItemGroup -> MainCreativeModeTab --- .../java/com/refinedmods/refinedstorageaddons/RSAddons.java | 4 ++-- .../refinedstorageaddons/item/WirelessCraftingGridItem.java | 2 +- .../group/{MainItemGroup.java => MainCreativeModeTab.java} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/com/refinedmods/refinedstorageaddons/item/group/{MainItemGroup.java => MainCreativeModeTab.java} (82%) diff --git a/src/main/java/com/refinedmods/refinedstorageaddons/RSAddons.java b/src/main/java/com/refinedmods/refinedstorageaddons/RSAddons.java index a97735d..098d680 100644 --- a/src/main/java/com/refinedmods/refinedstorageaddons/RSAddons.java +++ b/src/main/java/com/refinedmods/refinedstorageaddons/RSAddons.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.IRSAPI; import com.refinedmods.refinedstorage.api.RSAPIInject; import com.refinedmods.refinedstorageaddons.config.ServerConfig; -import com.refinedmods.refinedstorageaddons.item.group.MainItemGroup; +import com.refinedmods.refinedstorageaddons.item.group.MainCreativeModeTab; import com.refinedmods.refinedstorageaddons.setup.ClientSetup; import com.refinedmods.refinedstorageaddons.setup.CommonSetup; import net.minecraft.world.item.Item; @@ -22,7 +22,7 @@ public final class RSAddons { public static final String ID = "refinedstorageaddons"; public static final ServerConfig SERVER_CONFIG = new ServerConfig(); - public static final MainItemGroup MAIN_GROUP = new MainItemGroup(); + public static final MainCreativeModeTab CREATIVE_MODE_TAB = new MainCreativeModeTab(); public RSAddons() { DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> { diff --git a/src/main/java/com/refinedmods/refinedstorageaddons/item/WirelessCraftingGridItem.java b/src/main/java/com/refinedmods/refinedstorageaddons/item/WirelessCraftingGridItem.java index 5d8e988..9f58981 100644 --- a/src/main/java/com/refinedmods/refinedstorageaddons/item/WirelessCraftingGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorageaddons/item/WirelessCraftingGridItem.java @@ -22,7 +22,7 @@ public enum Type { public WirelessCraftingGridItem(Type type) { super( - new Item.Properties().tab(RSAddons.MAIN_GROUP).stacksTo(1), + new Item.Properties().tab(RSAddons.CREATIVE_MODE_TAB).stacksTo(1), type == Type.CREATIVE, () -> RSAddons.SERVER_CONFIG.getWirelessCraftingGrid().getCapacity() ); diff --git a/src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainItemGroup.java b/src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainCreativeModeTab.java similarity index 82% rename from src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainItemGroup.java rename to src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainCreativeModeTab.java index e547c72..0590fd9 100644 --- a/src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainItemGroup.java +++ b/src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainCreativeModeTab.java @@ -5,8 +5,8 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -public class MainItemGroup extends CreativeModeTab { - public MainItemGroup() { +public class MainCreativeModeTab extends CreativeModeTab { + public MainCreativeModeTab() { super(RSAddons.ID); } From 92db2d93b4d5f9e3cd5f707784a777f03df075f1 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 28 Dec 2021 22:39:00 +0100 Subject: [PATCH 5/7] Upgrade to latest RS --- CHANGELOG.md | 4 ++++ build.gradle | 4 ++-- .../apiimpl/network/item/WirelessCraftingGridNetworkItem.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6928594..e3561bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added + +- Added support for Refined Storage v1.10.0-beta.4. + ## [v0.8.0] - 2021-12-15 ### Added diff --git a/build.gradle b/build.gradle index f9143c7..4c16832 100644 --- a/build.gradle +++ b/build.gradle @@ -95,8 +95,8 @@ processResources { dependencies { minecraft 'net.minecraftforge:forge:1.18.1-39.0.0' - compileOnly "com.refinedmods:refinedstorage:1.10.0-beta.1" - runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.10.0-beta.1") { + compileOnly "com.refinedmods:refinedstorage:1.10.0-beta.4" + runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.10.0-beta.4") { transitive false } } diff --git a/src/main/java/com/refinedmods/refinedstorageaddons/apiimpl/network/item/WirelessCraftingGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorageaddons/apiimpl/network/item/WirelessCraftingGridNetworkItem.java index 2adf32f..8c8cda0 100644 --- a/src/main/java/com/refinedmods/refinedstorageaddons/apiimpl/network/item/WirelessCraftingGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorageaddons/apiimpl/network/item/WirelessCraftingGridNetworkItem.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import com.refinedmods.refinedstorageaddons.RSAddons; import com.refinedmods.refinedstorageaddons.apiimpl.network.grid.WirelessCraftingGridGridFactory; import com.refinedmods.refinedstorageaddons.item.WirelessCraftingGridItem; @@ -49,7 +49,7 @@ public boolean onOpen(INetwork network) { } if (!network.getSecurityManager().hasPermission(Permission.MODIFY, player)) { - WorldUtils.sendNoPermissionMessage(player); + LevelUtils.sendNoPermissionMessage(player); return false; } From 18887e07517954eca9386224e4b68ce443164d48 Mon Sep 17 00:00:00 2001 From: "E. Kim" Date: Mon, 27 Dec 2021 20:53:32 +0900 Subject: [PATCH 6/7] Create ko_kr.json --- .../resources/assets/refinedstorageaddons/lang/ko_kr.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/resources/assets/refinedstorageaddons/lang/ko_kr.json diff --git a/src/main/resources/assets/refinedstorageaddons/lang/ko_kr.json b/src/main/resources/assets/refinedstorageaddons/lang/ko_kr.json new file mode 100644 index 0000000..5cf4622 --- /dev/null +++ b/src/main/resources/assets/refinedstorageaddons/lang/ko_kr.json @@ -0,0 +1,6 @@ +{ + "itemGroup.refinedstorageaddons": "리파인드 스토리지 애드온", + "item.refinedstorageaddons.wireless_crafting_grid": "무선 제작 그리드", + "item.refinedstorageaddons.creative_wireless_crafting_grid": "크리에이티브 무선 제작 그리드", + "key.refinedstorageaddons.openWirelessCraftingGrid": "개방형 무선 제작 그리드" +} From 516c19a4158a2b225ee4bc651e9575a461813eb3 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 28 Dec 2021 22:40:21 +0100 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3561bd..c0e0ea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added - Added support for Refined Storage v1.10.0-beta.4. +- Added Korean translation by [@mindy15963](https://github.com/mindy15963). ## [v0.8.0] - 2021-12-15