port to Forge 1.18-38.0.6

- jei compatibility temporary deactivated

.github/workflows/build.yml

@@ -4,9 +4,9 @@ name: Build
 
 on:
   push:
-    branches: [ "1.17" ]
+    branches: [ "1.18" ]
   pull_request:
-    branches: [ "1.17" ]
+    branches: [ "1.18" ]
 
 jobs:
   build:
@@ -15,11 +15,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
-        distribution: 'adopt'
+        java-version: '17'
+        distribution: 'temurin'
     - uses: actions/cache@v2
       name: Cache MC Assets
       with:

.github/workflows/publish.yml

@@ -5,7 +5,7 @@ name: Publish
 on:
   push:
     tags:
-        - "1.17*"
+        - "1.18*"
 
 jobs:
   publish:
@@ -15,11 +15,11 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
-        distribution: 'adopt'
+        java-version: '17'
+        distribution: 'temurin'
     - uses: actions/cache@v2
       name: Cache MC Assets
       with:

CHANGELOG.md

@@ -3,6 +3,11 @@ 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-1.0.1.1] - 2021-12-04
+### Changed
+- port to Forge 1.18-38.0.6
+- jei compatibility temporary deactivated
+
 ## [1.17.1-1.0.1.1] - 2021-08-24
 ### Added
 - jei compatibility readded

build.gradle

@@ -21,8 +21,8 @@ version = "${minecraft_version}-${mod_version}"
 group = "cech12.${mod_id}" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "${mod_id}"
 
-// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
+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 {
@@ -114,10 +114,11 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
 
+    // TODO
     // compile against the JEI API but do not include it at runtime
-    compileOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
+    //compileOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
     // at runtime, use the full JEI jar
-    runtimeOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
+    //runtimeOnly fg.deobf("mezz.jei:jei-${project.jei_version}")
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..

gradle.properties

@@ -5,16 +5,17 @@ org.gradle.daemon=false
 
 mod_id=solarcooker
 mod_version=1.0.1.1
-minecraft_version=1.17.1
-forge_version=37.0.32
+minecraft_version=1.18
+forge_version=38.0.6
 
+# TODO
 # jei
-jei_version=1.17.1:8.0.0.12
+#jei_version=1.17.1:8.0.0.12
 
 # mcjunitlib
 # mcjunitlib_version=1.4.3-1.16.5
 
 #Curseforge
 curseforge_id=436874
 curseforge_release=beta
-curseforge_versions=1.17.1
+curseforge_versions=1.18

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/cech12/solarcooker/api/inventory/ContainerTypes.java

@@ -7,13 +7,13 @@
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.BlockPos;
-import net.minecraftforge.common.extensions.IForgeContainerType;
+import net.minecraftforge.common.extensions.IForgeMenuType;
 
 public class ContainerTypes {
 
     public final static ResourceLocation SOLAR_COOKER_ID = new ResourceLocation(SolarCookerMod.MOD_ID, "solarcooker");
 
-    public static MenuType<? extends AbstractContainerMenu> SOLAR_COOKER = IForgeContainerType.create((pWindowID, pInventory, pData) -> {
+    public static MenuType<? extends AbstractContainerMenu> SOLAR_COOKER = IForgeMenuType.create((pWindowID, pInventory, pData) -> {
         BlockPos pos = pData.readBlockPos();
         return new SolarCookerContainer(RecipeTypes.SOLAR_COOKING, pWindowID, pInventory, pos);
     }).setRegistryName(SOLAR_COOKER_ID);

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

@@ -22,7 +22,7 @@
 import java.util.Random;
 
 import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraftforge.fmllegacy.network.NetworkHooks;
+import net.minecraftforge.network.NetworkHooks;
 
 public class SolarCookerBlock extends AbstractSolarCookerBlock {
 

src/main/java/cech12/solarcooker/jei/SolarCookerJEIPlugin.java

@@ -1,5 +1,5 @@
 package cech12.solarcooker.jei;
-
+/*
 import cech12.solarcooker.SolarCookerMod;
 import cech12.solarcooker.api.block.SolarCookerBlocks;
 import cech12.solarcooker.api.crafting.RecipeTypes;
@@ -58,3 +58,4 @@ public void registerRecipeCatalysts(@Nonnull IRecipeCatalystRegistration registr
     }
 
 }
+ */

src/main/java/cech12/solarcooker/jei/SolarCookingCategory.java

@@ -1,5 +1,5 @@
 package cech12.solarcooker.jei;
-
+/*
 import cech12.solarcooker.api.block.SolarCookerBlocks;
 import cech12.solarcooker.api.crafting.RecipeTypes;
 import cech12.solarcooker.config.ServerConfig;
@@ -28,3 +28,4 @@ public Class<? extends SolarCookingRecipe> getRecipeClass() {
         return SolarCookingRecipe.class;
     }
 }
+ */

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

@@ -133,25 +133,23 @@ public void load(@Nonnull CompoundTag nbtIn) {
     }
 
     @Override
-    @Nonnull
-    public CompoundTag save(@Nonnull CompoundTag compound) {
-        super.save(compound);
+    protected void saveAdditional(@Nonnull CompoundTag compound) {
+        super.saveAdditional(compound);
         compound.putInt("CookTime", this.cookTime);
         compound.putInt("CookTimeTotal", this.cookTimeTotal);
         ContainerHelper.saveAllItems(compound, this.items);
-        return compound;
     }
 
     @Override
     @Nonnull
     public CompoundTag getUpdateTag() {
-        return this.save(new CompoundTag());
+        return this.saveWithoutMetadata();
     }
 
     @Nullable
     @Override
     public ClientboundBlockEntityDataPacket getUpdatePacket() {
-        return new ClientboundBlockEntityDataPacket(this.worldPosition, 0, this.getUpdateTag());
+        return ClientboundBlockEntityDataPacket.create(this);
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[37,)"
+loaderVersion="[38,)"
 issueTrackerURL="https://github.com/cech12/BrickShears/issues"
 license="The MIT License (MIT)"
 [[mods]]
@@ -15,13 +15,13 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
     modId="forge"
     mandatory=true
-    versionRange="[37.0.32,)"
+    versionRange="[38.0.6,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.17.1,)"
+    versionRange="[1.18,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Solar Cooker resources",
-        "pack_format": 7
+        "pack_format": 8
     }
 }