Port to 1.18.2

Author: PlatinPython

build.gradle

@@ -19,11 +19,11 @@ version = "${minecraft_version}-${mod_version}"
 group = 'platinpython.rgbblocks'
 archivesBaseName = 'RGB Blocks'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    mappings channel: 'parchment', version: '2021.12.12-1.17.1'
+    mappings channel: 'parchment', version: '2022.03.13-1.18.2'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -89,13 +89,13 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.17.1-37.1.1'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.0.19'
 
-    //implementation fg.deobf("team.chisel.ctm:CTM:MC1.16.1-${ctm_version}")
+//    implementation fg.deobf("team.chisel.ctm:CTM:1.18-${ctm_version}")
 
-    //implementation fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
+//    implementation fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
 
-    implementation fg.deobf("curse.maven:top-245211:3430022")
+    implementation fg.deobf("curse.maven:top-245211:3671753")
 }
 
 sourceSets {

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 #version info
-minecraft_version=1.17.1
+minecraft_version=1.18.2
 mod_version=1.1.5.0
-ctm_version=1.1.2.6
+ctm_version=1.1.3+1
 top_version=1.16-3.1.4-22

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/platinpython/rgbblocks/block/RGBBlock.java

@@ -28,7 +28,7 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 }

src/main/java/platinpython/rgbblocks/block/RGBBlockUtils.java

@@ -29,12 +29,12 @@ public static BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
     public static void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEntity placer,
                                    ItemStack stack) {
         BlockEntity tileEntity = worldIn.getBlockEntity(pos);
-        if (stack.hasTag() == true && tileEntity instanceof RGBTileEntity) {
+        if (stack.hasTag() && tileEntity instanceof RGBTileEntity) {
             ((RGBTileEntity) tileEntity).setColor(stack.getTag().getInt("color"));
         }
     }
 
-    public static ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
+    public static ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
                                          Player player) {
         ItemStack stack = new ItemStack(state.getBlock().asItem());
         BlockEntity tileEntity = world.getBlockEntity(pos);

src/main/java/platinpython/rgbblocks/block/RGBCarpetBlock.java

@@ -30,7 +30,7 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 }

src/main/java/platinpython/rgbblocks/block/RGBConcretePowderBlock.java

@@ -36,8 +36,8 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 
     @Override

src/main/java/platinpython/rgbblocks/block/RGBIronBarsBlock.java

@@ -28,7 +28,7 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 }

src/main/java/platinpython/rgbblocks/block/RGBRedstoneLampBlock.java

@@ -30,7 +30,7 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 }

src/main/java/platinpython/rgbblocks/block/RGBSlabBlock.java

@@ -29,7 +29,7 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 }

src/main/java/platinpython/rgbblocks/block/RGBStairsBlock.java

@@ -30,7 +30,7 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
     }
 
     @Override
-    public ItemStack getPickBlock(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
-        return RGBBlockUtils.getPickBlock(state, target, world, pos, player);
+    public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
+        return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
     }
 }

src/main/java/platinpython/rgbblocks/data/ModLootTableProvider.java

@@ -33,7 +33,7 @@
 import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.util.RegistryHandler;
 import platinpython.rgbblocks.util.registries.BlockRegistry;

src/main/java/platinpython/rgbblocks/data/ModRecipeProvider.java

@@ -6,7 +6,7 @@
 import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
@@ -120,7 +120,7 @@ private void blockIItemProvider(Consumer<FinishedRecipe> consumer, Block result,
         block(consumer, result, Ingredient.of(provider));
     }
 
-    private void blockTag(Consumer<FinishedRecipe> consumer, Block result, Tag<Item> tag) {
+    private void blockTag(Consumer<FinishedRecipe> consumer, Block result, TagKey<Item> tag) {
         block(consumer, result, Ingredient.of(tag));
     }
 

src/main/java/platinpython/rgbblocks/data/ShapedNBTRecipeBuilder.java

@@ -1,20 +1,11 @@
 package platinpython.rgbblocks.data;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
-
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.advancements.CriterionTriggerInstance;
@@ -24,13 +15,20 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.registries.ForgeRegistries;
 
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Consumer;
+
 public class ShapedNBTRecipeBuilder {
     private final Item result;
     private final int count;
@@ -58,7 +56,7 @@ public static ShapedNBTRecipeBuilder shaped(ItemLike result, int count, Compound
         return new ShapedNBTRecipeBuilder(result, count, compound);
     }
 
-    public ShapedNBTRecipeBuilder define(Character symbol, Tag<Item> tag) {
+    public ShapedNBTRecipeBuilder define(Character symbol, TagKey<Item> tag) {
         return this.define(symbol, Ingredient.of(tag));
     }
 

src/main/java/platinpython/rgbblocks/data/ShapelessNBTRecipeBuilder.java

@@ -1,15 +1,9 @@
 package platinpython.rgbblocks.data;
 
-import java.util.List;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
-
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.advancements.CriterionTriggerInstance;
@@ -19,14 +13,18 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.registries.ForgeRegistries;
 import platinpython.rgbblocks.util.registries.RecipeSerializerRegistry;
 
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.function.Consumer;
+
 public class ShapelessNBTRecipeBuilder {
     private final Item result;
     private final int count;
@@ -54,7 +52,7 @@ public static ShapelessNBTRecipeBuilder shapeless(ItemLike result, int count, Co
         return new ShapelessNBTRecipeBuilder(result, count, compound);
     }
 
-    public ShapelessNBTRecipeBuilder requires(Tag<Item> tag) {
+    public ShapelessNBTRecipeBuilder requires(TagKey<Item> tag) {
         return this.requires(Ingredient.of(tag));
     }
 

src/main/java/platinpython/rgbblocks/dispenser/DispensePaintbucketBehaviour.java

@@ -1,13 +1,13 @@
 package platinpython.rgbblocks.dispenser;
 
-import net.minecraft.world.level.block.DispenserBlock;
-import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockSource;
+import net.minecraft.core.Direction;
+import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraftforge.common.util.Constants.BlockFlags;
 import platinpython.rgbblocks.tileentity.RGBTileEntity;
 
 public class DispensePaintbucketBehaviour extends DefaultDispenseItemBehavior {
@@ -22,7 +22,7 @@ protected ItemStack execute(BlockSource source, ItemStack itemStack) {
                   .sendBlockUpdated(blockPos,
                                     tileEntity.getBlockState(),
                                     tileEntity.getBlockState(),
-                                    BlockFlags.DEFAULT_AND_RERENDER);
+                                    Block.UPDATE_ALL_IMMEDIATE);
             return itemStack;
         } else {
             return super.execute(source, itemStack);

src/main/java/platinpython/rgbblocks/entity/RGBFallingBlockEntity.java

@@ -9,8 +9,8 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.fmllegacy.common.registry.IEntityAdditionalSpawnData;
-import net.minecraftforge.fmllegacy.network.NetworkHooks;
+import net.minecraftforge.entity.IEntityAdditionalSpawnData;
+import net.minecraftforge.network.NetworkHooks;
 import platinpython.rgbblocks.util.registries.EntityRegistry;
 
 public class RGBFallingBlockEntity extends FallingBlockEntity implements IEntityAdditionalSpawnData {

src/main/java/platinpython/rgbblocks/item/PaintBucketItem.java

@@ -1,7 +1,5 @@
 package platinpython.rgbblocks.item;
 
-import java.util.List;
-
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -19,14 +17,16 @@
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.util.Constants.BlockFlags;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.client.gui.screen.ColorSelectScreen;
 import platinpython.rgbblocks.tileentity.RGBTileEntity;
 import platinpython.rgbblocks.util.ClientUtils;
 import platinpython.rgbblocks.util.Color;
 
+import java.util.List;
+
 public class PaintBucketItem extends Item {
     public PaintBucketItem() {
         super(new Properties().tab(RGBBlocks.ITEM_GROUP_RGB).defaultDurability(500).setNoRepair());
@@ -115,7 +115,7 @@ public InteractionResult useOn(UseOnContext context) {
                        .sendBlockUpdated(context.getClickedPos(),
                                          tileEntity.getBlockState(),
                                          tileEntity.getBlockState(),
-                                         BlockFlags.DEFAULT_AND_RERENDER);
+                                         Block.UPDATE_ALL_IMMEDIATE);
             }
             return InteractionResult.SUCCESS;
         } else {

src/main/java/platinpython/rgbblocks/tileentity/RGBTileEntity.java

@@ -4,9 +4,9 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.common.util.Constants.BlockFlags;
 import platinpython.rgbblocks.util.Color;
 import platinpython.rgbblocks.util.registries.TileEntityRegistry;
 
@@ -27,9 +27,8 @@ public int getColor() {
     }
 
     @Override
-    public CompoundTag save(CompoundTag compound) {
+    public void saveAdditional(CompoundTag compound) {
         compound.putInt("color", getColor());
-        return super.save(compound);
     }
 
     @Override
@@ -53,13 +52,11 @@ public void handleUpdateTag(CompoundTag tag) {
 
     @Override
     public ClientboundBlockEntityDataPacket getUpdatePacket() {
-        CompoundTag compound = new CompoundTag();
-        compound.putInt("color", getColor());
-        return new ClientboundBlockEntityDataPacket(this.getBlockPos(), -1, compound);
+        return ClientboundBlockEntityDataPacket.create(this);
     }
 
     public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket packet) {
         setColor(packet.getTag().getInt("color"));
-        level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), BlockFlags.DEFAULT_AND_RERENDER);
+        level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), Block.UPDATE_ALL_IMMEDIATE);
     }
 }

src/main/java/platinpython/rgbblocks/util/ClientUtils.java

@@ -18,7 +18,7 @@
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.client.colorhandlers.PaintBucketItemColor;
 import platinpython.rgbblocks.client.colorhandlers.RGBBlockColor;

src/main/java/platinpython/rgbblocks/util/network/PacketHandler.java

@@ -1,8 +1,8 @@
 package platinpython.rgbblocks.util.network;
 
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.fmllegacy.network.NetworkRegistry;
-import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.simple.SimpleChannel;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.util.network.packets.PaintBucketSyncPKT;