Merge pull request #95 from refinedmods/develop

v0.9.0

Author: raoulvdberge

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -36,7 +36,7 @@ body:
           If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue.
         options:
           - Minecraft 1.18.2
-          - Minecraft 1.16.5
+          - Minecraft 1.19.2
       validations:
         required: true
     - type: input

CHANGELOG.md

@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
+- Ported to Minecraft 1.19.2.
+
+## [v0.8.2] - 2022-03-26
+
 ### Added
 
 - French translation by [@dracnis](https://github.com/dracnis).

build.gradle

@@ -34,7 +34,7 @@ apply plugin: 'maven-publish'
 
 group = 'com.refinedmods'
 archivesBaseName = 'refinedstorageaddons'
-version = '0.8.2'
+version = '0.9.0'
 
 if (System.getenv('GITHUB_SHA') != null) {
     version += '+' + System.getenv('GITHUB_SHA').substring(0, 7)
@@ -47,7 +47,7 @@ if (System.getenv('RELEASE') != null) {
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-    mappings channel: 'official', version: '1.18.2'
+    mappings channel: 'official', version: '1.19.2'
 
     runs {
         client {
@@ -94,9 +94,9 @@ processResources {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.18.2-40.0.32'
-    compileOnly "com.refinedmods:refinedstorage:1.10.2"
-    runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.10.2") {
+    minecraft 'net.minecraftforge:forge:1.19.2-43.1.32'
+    compileOnly "com.refinedmods:refinedstorage:1.11.0"
+    runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.11.0") {
         transitive false
     }
 }
@@ -123,7 +123,7 @@ if (System.getenv("CURSEFORGE_TOKEN") != null) {
             changelog = System.getenv("CHANGELOG")
             changelogType = 'markdown'
             releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release')
-            addGameVersion "1.18.2"
+            addGameVersion "1.19.2"
             mainArtifact(jar) {
                 displayName = "v$project.version"
             }

src/main/java/com/refinedmods/refinedstorageaddons/RSAddons.java

@@ -6,7 +6,6 @@
 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;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.DistExecutor;
@@ -28,11 +27,13 @@ public RSAddons() {
         DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
             FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onClientSetup);
             MinecraftForge.EVENT_BUS.addListener(ClientSetup::onKeyInput);
+            FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::onRegisterKeymappings);
         });
 
+        RSAddonsItems.register();
+
         ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG.getSpec());
 
         FMLJavaModLoadingContext.get().getModEventBus().addListener(CommonSetup::onCommonSetup);
-        FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(Item.class, CommonSetup::onRegisterItems);
     }
 }

src/main/java/com/refinedmods/refinedstorageaddons/RSAddonsItems.java

@@ -1,11 +1,24 @@
 package com.refinedmods.refinedstorageaddons;
 
 import com.refinedmods.refinedstorageaddons.item.WirelessCraftingGridItem;
-import net.minecraftforge.registries.ObjectHolder;
+import net.minecraft.world.item.Item;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 public final class RSAddonsItems {
-    @ObjectHolder(RSAddons.ID + ":wireless_crafting_grid")
-    public static final WirelessCraftingGridItem WIRELESS_CRAFTING_GRID = null;
-    @ObjectHolder(RSAddons.ID + ":creative_wireless_crafting_grid")
-    public static final WirelessCraftingGridItem CREATIVE_WIRELESS_CRAFTING_GRID = null;
+    private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, RSAddons.ID);
+
+    static {
+        WIRELESS_CRAFTING_GRID = ITEMS.register("wireless_crafting_grid", () -> new WirelessCraftingGridItem(WirelessCraftingGridItem.Type.NORMAL));
+        CREATIVE_WIRELESS_CRAFTING_GRID = ITEMS.register("creative_wireless_crafting_grid", () -> new WirelessCraftingGridItem(WirelessCraftingGridItem.Type.CREATIVE));
+    }
+
+    public static final RegistryObject<WirelessCraftingGridItem> WIRELESS_CRAFTING_GRID;
+    public static final RegistryObject<WirelessCraftingGridItem> CREATIVE_WIRELESS_CRAFTING_GRID;
+
+    public static void register() {
+        ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
+    }
 }

src/main/java/com/refinedmods/refinedstorageaddons/apiimpl/network/item/WirelessCraftingGridNetworkItem.java

@@ -10,11 +10,11 @@
 import com.refinedmods.refinedstorageaddons.RSAddons;
 import com.refinedmods.refinedstorageaddons.apiimpl.network.grid.WirelessCraftingGridGridFactory;
 import com.refinedmods.refinedstorageaddons.item.WirelessCraftingGridItem;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.energy.CapabilityEnergy;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.energy.IEnergyStorage;
 
 public class WirelessCraftingGridNetworkItem implements INetworkItem {
@@ -37,7 +37,7 @@ public Player getPlayer() {
 
     @Override
     public boolean onOpen(INetwork network) {
-        IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null).orElse(null);
+        IEnergyStorage energy = stack.getCapability(ForgeCapabilities.ENERGY, null).orElse(null);
 
         if (RSAddons.SERVER_CONFIG.getWirelessCraftingGrid().getUseEnergy() &&
             ((WirelessCraftingGridItem) stack.getItem()).getType() != WirelessCraftingGridItem.Type.CREATIVE &&
@@ -64,7 +64,7 @@ public boolean onOpen(INetwork network) {
     @Override
     public void drainEnergy(int energy) {
         if (RSAddons.SERVER_CONFIG.getWirelessCraftingGrid().getUseEnergy() && ((WirelessCraftingGridItem) stack.getItem()).getType() != WirelessCraftingGridItem.Type.CREATIVE) {
-            stack.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyStorage -> {
+            stack.getCapability(ForgeCapabilities.ENERGY).ifPresent(energyStorage -> {
                 energyStorage.extractEnergy(energy, false);
 
                 if (energyStorage.getEnergyStored() <= 0) {
@@ -79,6 +79,6 @@ public void drainEnergy(int energy) {
     }
 
     private void sendOutOfEnergyMessage() {
-        player.sendMessage(new TranslatableComponent("misc.refinedstorage.network_item.out_of_energy", stack.getItem().getDescription()), player.getUUID());
+        player.sendSystemMessage(Component.translatable("misc.refinedstorage.network_item.out_of_energy", stack.getItem().getDescription()));
     }
 }

src/main/java/com/refinedmods/refinedstorageaddons/item/WirelessCraftingGrid.java

@@ -6,13 +6,12 @@
 import com.refinedmods.refinedstorage.api.network.security.Permission;
 import com.refinedmods.refinedstorage.api.util.Action;
 import com.refinedmods.refinedstorage.api.util.IStackList;
-import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
 import com.refinedmods.refinedstorage.blockentity.grid.WirelessGrid;
+import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
 import com.refinedmods.refinedstorage.util.StackUtils;
 import com.refinedmods.refinedstorageaddons.RSAddons;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.TickTask;
 import net.minecraft.world.Container;
@@ -42,6 +41,11 @@ public boolean stillValid(Player player) {
             return false;
         }
 
+        @Override
+        public ItemStack quickMoveStack(Player p_38941_, int p_38942_) {
+            return ItemStack.EMPTY;
+        }
+
         @Override
         public void slotsChanged(Container container) {
             if (server != null) {
@@ -82,7 +86,7 @@ public WirelessCraftingGrid(ItemStack stack, Level level, @Nullable MinecraftSer
 
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("gui.refinedstorage.crafting_grid");
+        return Component.translatable("gui.refinedstorage.crafting_grid");
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorageaddons/item/WirelessCraftingGridItem.java

@@ -28,8 +28,6 @@ public WirelessCraftingGridItem(Type type) {
         );
 
         this.type = type;
-
-        this.setRegistryName(RSAddons.ID, (type == Type.CREATIVE ? "creative_" : "") + "wireless_crafting_grid");
     }
 
     public Type getType() {

src/main/java/com/refinedmods/refinedstorageaddons/item/group/MainCreativeModeTab.java

@@ -12,6 +12,6 @@ public MainCreativeModeTab() {
 
     @Override
     public ItemStack makeIcon() {
-        return new ItemStack(RSAddonsItems.CREATIVE_WIRELESS_CRAFTING_GRID);
+        return new ItemStack(RSAddonsItems.CREATIVE_WIRELESS_CRAFTING_GRID.get());
     }
 }

src/main/java/com/refinedmods/refinedstorageaddons/setup/ClientSetup.java

@@ -7,8 +7,8 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.item.ItemProperties;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.client.ClientRegistry;
 import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
@@ -18,17 +18,23 @@ private ClientSetup() {
 
     @SubscribeEvent
     public static void onClientSetup(FMLClientSetupEvent e) {
-        ClientRegistry.registerKeyBinding(RSAddonsKeyBindings.OPEN_WIRELESS_CRAFTING_GRID);
+        // ItemProperties isn't thread safe
+        e.enqueueWork(() -> {
+            ItemProperties.register(RSAddonsItems.WIRELESS_CRAFTING_GRID.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+            ItemProperties.register(RSAddonsItems.CREATIVE_WIRELESS_CRAFTING_GRID.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        });
+    }
 
-        ItemProperties.register(RSAddonsItems.WIRELESS_CRAFTING_GRID, new ResourceLocation("connected"), new NetworkItemPropertyGetter());
-        ItemProperties.register(RSAddonsItems.CREATIVE_WIRELESS_CRAFTING_GRID, new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+    @SubscribeEvent
+    public static void onRegisterKeymappings(RegisterKeyMappingsEvent e) {
+        e.register(RSAddonsKeyBindings.OPEN_WIRELESS_CRAFTING_GRID);
     }
 
     @SubscribeEvent
-    public static void onKeyInput(InputEvent.KeyInputEvent e) {
+    public static void onKeyInput(InputEvent.Key e) {
         if (Minecraft.getInstance().player != null) {
             if (RSAddonsKeyBindings.OPEN_WIRELESS_CRAFTING_GRID.isDown()) {
-                KeyInputListener.findAndOpen(RSAddonsItems.WIRELESS_CRAFTING_GRID, RSAddonsItems.CREATIVE_WIRELESS_CRAFTING_GRID);
+                KeyInputListener.findAndOpen(RSAddonsItems.WIRELESS_CRAFTING_GRID.get(), RSAddonsItems.CREATIVE_WIRELESS_CRAFTING_GRID.get());
             }
         }
     }