Merge pull request #84 from refinedmods/develop

v0.8.1
refinedmods · Dec 28, 2021 · 8020a32 · 8020a32
2 parents 40257b7 + 516c19a
commit 8020a32
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Refined Storage
+# Contributing to Refined Storage Addons
 
 ## Versioning
 

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+patreon: raoulvdberge
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### 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
+
 ### Added
 - Ported to Minecraft 1.18.1.
 

diff --git 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)
@@ -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/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/...efinedmods/refinedstorageaddons/apiimpl/network/item/WirelessCraftingGridNetworkItem.java b/...efinedmods/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;
         }

diff --git 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/...orageaddons/item/group/MainItemGroup.java → ...ddons/item/group/MainCreativeModeTab.java b/...orageaddons/item/group/MainItemGroup.java → ...ddons/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);
     }
 

diff --git a/src/main/resources/assets/refinedstorageaddons/lang/ko_kr.json 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": "개방형 무선 제작 그리드"
+}