Update mod to Forge 1.19-41.0.96

CHANGELOG.md

@@ -3,9 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
-## [1.18.2-1.1.1.1] - 2022-07-??
+## [1.19-1.2.0.0] - 2022-07-18
 ### Changed
-- Update mod to Forge 1.19-41.0.63
+- Update mod to Forge 1.19-41.0.96
 
 ## [1.18.2-1.1.1.1] - 2022-06-13
 ### Added

gradle.properties

@@ -6,10 +6,10 @@ org.gradle.daemon=false
 mod_id=solarcooker
 mod_version=1.2.0.0
 minecraft_version=1.19
-forge_version=41.0.63
+forge_version=41.0.96
 
 # jei
-jei_version=11.0.0.206
+jei_version=11.0.0.211
 
 #Curseforge
 curseforge_id=436874

src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java

@@ -1,6 +1,6 @@
 package cech12.solarcooker.block;
 
-import cech12.solarcooker.tileentity.AbstractSolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.AbstractSolarCookerBlockEntity;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.RenderShape;

src/main/java/cech12/solarcooker/block/SolarCookerBlock.java

@@ -1,8 +1,9 @@
 package cech12.solarcooker.block;
 
 import cech12.solarcooker.init.ModBlockEntityTypes;
-import cech12.solarcooker.tileentity.AbstractSolarCookerBlockEntity;
-import cech12.solarcooker.tileentity.SolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.AbstractSolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.SolarCookerBlockEntity;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -19,7 +20,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Random;
 
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraftforge.network.NetworkHooks;
@@ -50,16 +50,16 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(@Nonnull Level lev
     protected void interactWith(Level worldIn, @Nonnull BlockPos pos, @Nonnull Player player) {
         BlockEntity blockEntity = worldIn.getBlockEntity(pos);
         if (blockEntity instanceof SolarCookerBlockEntity && player instanceof ServerPlayer) {
-            //player.openContainer((SolarCookerTileEntity) tileentity);
-            NetworkHooks.openGui((ServerPlayer) player, (SolarCookerBlockEntity) blockEntity, pos);
+            NetworkHooks.openScreen((ServerPlayer) player, (SolarCookerBlockEntity) blockEntity, pos);
         }
     }
 
     /**
      * Called periodically clientside on blocks near the player to show effects (like furnace fire particles).
      */
+    @Override
     @OnlyIn(Dist.CLIENT)
-    public void animateTick(BlockState stateIn, @Nonnull Level worldIn, @Nonnull BlockPos pos, @Nonnull Random rand) {
+    public void animateTick(BlockState stateIn, @Nonnull Level worldIn, @Nonnull BlockPos pos, @Nonnull RandomSource rand) {
         if (stateIn.getValue(BURNING)) {
             double d0 = (double)pos.getX() + 0.5D;
             double d1 = pos.getY();

src/main/java/cech12/solarcooker/tileentity/AbstractSolarCookerBlockEntity.java → src/main/java/cech12/solarcooker/blockentity/AbstractSolarCookerBlockEntity.java

@@ -1,4 +1,4 @@
-package cech12.solarcooker.tileentity;
+package cech12.solarcooker.blockentity;
 
 import cech12.solarcooker.block.AbstractSolarCookerBlock;
 import cech12.solarcooker.block.ReflectorBlock;

src/main/java/cech12/solarcooker/tileentity/SolarCookerBlockEntity.java → src/main/java/cech12/solarcooker/blockentity/SolarCookerBlockEntity.java

@@ -1,4 +1,4 @@
-package cech12.solarcooker.tileentity;
+package cech12.solarcooker.blockentity;
 
 import cech12.solarcooker.init.ModBlockEntityTypes;
 import cech12.solarcooker.init.ModRecipeTypes;

src/main/java/cech12/solarcooker/client/SolarCookerBlockEntityRenderer.java

@@ -3,7 +3,7 @@
 import cech12.solarcooker.SolarCookerMod;
 import cech12.solarcooker.block.AbstractSolarCookerBlock;
 import cech12.solarcooker.init.ModBlocks;
-import cech12.solarcooker.tileentity.SolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.SolarCookerBlockEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.model.geom.ModelLayers;

src/main/java/cech12/solarcooker/init/ModBlockEntityTypes.java

@@ -1,7 +1,7 @@
 package cech12.solarcooker.init;
 
 import cech12.solarcooker.SolarCookerMod;
-import cech12.solarcooker.tileentity.SolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.SolarCookerBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.registries.DeferredRegister;
@@ -11,7 +11,7 @@
 @Mod.EventBusSubscriber(modid= SolarCookerMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public final class ModBlockEntityTypes {
 
-    public static DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, SolarCookerMod.MOD_ID);
+    public static DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, SolarCookerMod.MOD_ID);
     public static RegistryObject<BlockEntityType<SolarCookerBlockEntity>> SOLAR_COOKER = BLOCK_ENTITY_TYPES.register("solar_cooker", () -> BlockEntityType.Builder.of(SolarCookerBlockEntity::new, ModBlocks.SOLAR_COOKER.get()).build(null));
 
 }

src/main/java/cech12/solarcooker/init/ModItems.java

@@ -1,7 +1,7 @@
 package cech12.solarcooker.init;
 
 import cech12.solarcooker.SolarCookerMod;
-import cech12.solarcooker.tileentity.SolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.SolarCookerBlockEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
@@ -13,7 +13,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-import net.minecraftforge.client.IItemRenderProperties;
+import net.minecraftforge.client.extensions.common.IClientItemExtensions;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
@@ -36,8 +36,8 @@ private static RegistryObject<Item> fromBlock(RegistryObject<Block> block, Creat
     private static RegistryObject<Item> solarCookerItem() {
         return ITEMS.register(ModBlocks.SOLAR_COOKER.getId().getPath(), () -> new BlockItem(ModBlocks.SOLAR_COOKER.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)) {
             @Override
-            public void initializeClient(@Nonnull Consumer<IItemRenderProperties> consumer) {
-                consumer.accept(new IItemRenderProperties() {
+            public void initializeClient(@Nonnull Consumer<IClientItemExtensions> consumer) {
+                consumer.accept(new IClientItemExtensions() {
                     final BlockEntityWithoutLevelRenderer myRenderer = new BlockEntityWithoutLevelRenderer(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels()) {
                         private SolarCookerBlockEntity blockEntity;
 
@@ -51,7 +51,7 @@ public void renderByItem(@Nonnull ItemStack stack, @Nonnull ItemTransforms.Trans
                     };
 
                     @Override
-                    public BlockEntityWithoutLevelRenderer getItemStackRenderer() {
+                    public BlockEntityWithoutLevelRenderer getCustomRenderer() {
                         return myRenderer;
                     }
                 });

src/main/java/cech12/solarcooker/init/ModMenuTypes.java

@@ -12,7 +12,7 @@
 
 public class ModMenuTypes {
 
-    public static final DeferredRegister<MenuType<?>> MENU_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, SolarCookerMod.MOD_ID);
+    public static final DeferredRegister<MenuType<?>> MENU_TYPES = DeferredRegister.create(ForgeRegistries.MENU_TYPES, SolarCookerMod.MOD_ID);
 
     public static final RegistryObject<MenuType<? extends AbstractContainerMenu>> SOLAR_COOKER = MENU_TYPES.register("solarcooker", () -> IForgeMenuType.create((pWindowID, pInventory, pData) -> {
         BlockPos pos = pData.readBlockPos();

src/main/java/cech12/solarcooker/inventory/SolarCookerContainer.java

@@ -2,7 +2,7 @@
 
 import cech12.solarcooker.config.ServerConfig;
 import cech12.solarcooker.init.ModMenuTypes;
-import cech12.solarcooker.tileentity.AbstractSolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.AbstractSolarCookerBlockEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.SimpleContainer;

src/main/java/cech12/solarcooker/inventory/SolarCookerResultSlot.java

@@ -1,6 +1,6 @@
 package cech12.solarcooker.inventory;
 
-import cech12.solarcooker.tileentity.AbstractSolarCookerBlockEntity;
+import cech12.solarcooker.blockentity.AbstractSolarCookerBlockEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.FurnaceResultSlot;

src/main/resources/META-INF/mods.toml

@@ -15,7 +15,7 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
     modId="forge"
     mandatory=true
-    versionRange="[41.0.63,)"
+    versionRange="[41.0.96,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]
@@ -27,6 +27,6 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
    modId="jei"
    mandatory=false
-   versionRange="[11.0.0.206,)"
+   versionRange="[11.0.0.211,)"
    ordering="NONE"
    side="BOTH"