Moved to Neoforge, updated several deps

Fixed crash with Immersive Engineering on 1.20.1

Changelog.md

@@ -6,6 +6,26 @@ Changes are in reverse chronological order; newest changes at the top.
 
 # Minecraft 1.20.1
 
+## [6.0.2]
+
+### New
+* As of PNC:R 6.0.2, the mod is built with [Neoforge](https://neoforged.net/)
+  * While PNC:R is likely to remain compatible with [Forge](https://files.minecraftforge.net/) for now, future compatibility is not guaranteed in any way
+
+### Added
+* Pressure gauge display can now be toggled between visual dial and simple text display by right-clicking with a wrench
+* Added some new entity filter modifiers
+  * "aquatic", "undead", "arthropod", "illager": all yes/no, e.g. "@living(aquatic=yes)"
+  * "type_tag" to check for entity type tags as defined in datapacks, e.g. "@mob(type_tag=minecraft:skeletons)"
+  * "entity_tag" to check for entity tags as added with the /tag command, e.g. "@player(entity_tag=marked_player)"
+* Added a couple of methods to prevent Aerial Interface usage by dimension or player
+  * Configurable dimension blacklist: `aerial_interface_dimension_blacklist` in pneumaticcraft-common.toml
+  * Check for an entity tag (see /tag command) on the player of `pneumaticcraft:no_aerial_interface`
+
+### Fixed
+* Fixed a fluid dupe with fluid tanks
+* Fixed crash with Immersive Engineering installed
+
 ## [6.0.1]
 
 ### New

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-	repositories {
-		maven { url = 'https://files.minecraftforge.net/maven' }
-		maven { url = 'https://maven.parchmentmc.org' }
-		mavenCentral()
-	}
+//	repositories {
+//		maven { url = 'https://files.minecraftforge.net/maven' }
+//		maven { url = 'https://maven.parchmentmc.org' }
+//		mavenCentral()
+//	}
 	dependencies {
-		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+//		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
 		classpath 'org.parchmentmc:librarian:1.+'
 		classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4+"
 		classpath 'org.spongepowered:mixingradle:0.7.+'
@@ -19,7 +19,7 @@ plugins {
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
-	id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+	id('net.neoforged.gradle') version '[6.0.13, 6.2)'
 }
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: "com.jfrog.artifactory"
@@ -124,11 +124,12 @@ repositories {
 }
 
 dependencies {
-	minecraft([
-			group  : "net.minecraftforge",
-			name   : 'forge',
-			version: "${project.mc_version}-${project.forge_version}"
-	])
+	minecraft "net.neoforged:forge:${mc_version}-${forge_version}"
+//	minecraft([
+//			group  : "net.neoforged",
+//			name   : 'forge',
+//			version: "${project.mc_version}-${project.forge_version}"
+//	])
 
 	annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
@@ -146,16 +147,16 @@ dependencies {
 	runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
 //	compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api")
 	implementation fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}")
-	compileOnly fg.deobf("vazkii.botania:Botania:${botania_version}-FORGE:api")
+	compileOnly fg.deobf("vazkii.botania:Botania:${botania_version}:api")
 	//runtimeOnly fg.deobf("vazkii.botania:Botania:${botania_version}-FORGE")
 	compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")
 	runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
 	compileOnly fg.deobf("org.squiddev:cc-tweaked-1.19.2:${cc_tweaked_version}")
-	compileOnly fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:${immersive_engineering_version}")
+	implementation fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:${immersive_engineering_version}")
 	compileOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:api")
 	//runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}")
-	compileOnly fg.deobf("com.simibubi.create:create-1.19.2:${create_version}:slim") { transitive = false }
-	compileOnly fg.deobf("com.jozufozu.flywheel:flywheel-forge-1.19.2:${flywheel_version}")
+	compileOnly fg.deobf("com.simibubi.create:create-1.20.1:${create_version}:slim") { transitive = false }
+	compileOnly fg.deobf("com.jozufozu.flywheel:flywheel-forge-1.20.1:${flywheel_version}")
 	compileOnly fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
 //	implementation fg.deobf("curse.maven:create-328085:${create_curse_id}")
 	implementation fg.deobf("curse.maven:jade-324717:${jade_curse_id}")

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.daemon=false
 # Minecraft versions
 #########################################################
 mc_version=1.20.1
-forge_version=47.1.0
+forge_version=47.1.65
 mappings_version=1.20.1-2023.06.26
 forge_version_range=[47.1.0,)
 minecraft_version_range=[1.20.1,)
@@ -19,21 +19,21 @@ minecraft_version_range=[1.20.1,)
 mod_id=pneumaticcraft
 mod_version_massive=6
 mod_version_major=0
-mod_version_minor=1
+mod_version_minor=2
 curse_project_id=281849
 modrinth_project_id=ncAcdgk7
 
 #########################################################
 # API versions
 #########################################################
-jei_version=15.0.0.15
+jei_version=15.2.0.25
 curios_version=5.2.0-beta.3+1.20.1
 top_version=1.20.0-9.0.0-1
 crafttweaker_version=10.0.14
 patchouli_version=1.20.1-80-FORGE
-botania_version=1.19.2-436
+botania_version=1.20.1-441-FORGE-SNAPSHOT
 cc_tweaked_version=1.100.10
-immersive_engineering_version=1.19.4-9.3.0-163.4
+immersive_engineering_version=1.20.1-9.4.0-166.39
 ctm_version=1.1.2.6
 mekanism_version=1.19.2-10.3.5.474
 cofh_core_curse_id=4202944
@@ -43,11 +43,9 @@ thermal_foundation_curse_id=4112137
 thermal_innovation_curse_id=4112132
 thermal_locomotion_curse_id=4112134
 jade_curse_id = 4573193
-# 0.5.0f
-create_curse_id = 4011414
-create_version = 0.5.0.f-15
-flywheel_version = 0.6.7-9
-registrate_version = MC1.19-1.1.5
+create_version = 0.5.1.d-11
+flywheel_version = 0.6.9-5
+registrate_version = MC1.20-1.3.3
 #ae2_version=10.0.0
 gamestages_version = 13.0.1
 

settings.gradle

@@ -2,9 +2,10 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
+            name = 'NeoForged'
+            url = 'https://maven.neoforged.net/releases'
         }
+        maven { url = 'https://maven.parchmentmc.org' }
     }
 }
 

src/main/java/me/desht/pneumaticcraft/common/thirdparty/create/BeltWrenchBehaviour.java

@@ -1,8 +1,8 @@
 package me.desht.pneumaticcraft.common.thirdparty.create;
 
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlicer;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltSlicer;
 import me.desht.pneumaticcraft.common.util.PneumaticCraftUtils;
 import me.desht.pneumaticcraft.common.util.RayTraceUtils;
 import net.minecraft.world.InteractionResult;

src/main/java/me/desht/pneumaticcraft/common/thirdparty/immersiveengineering/ElectricAttackHandler.java

@@ -42,7 +42,7 @@ public class ElectricAttackHandler {
 
     @SubscribeEvent
     public static void onElectricalAttack(LivingHurtEvent event) {
-        if (!event.getSource().getMsgId().equals(Lib.DMG_WireShock)) return;
+        if (!event.getSource().is(Lib.DamageTypes.WIRE_SHOCK)) return;
 
         if (event.getEntity() instanceof DroneEntity drone) {
             if (drone.getUpgrades(ModUpgrades.SECURITY.get()) > 0) {

src/main/java/me/desht/pneumaticcraft/common/thirdparty/jei/AbstractPNCCategory.java

@@ -63,16 +63,6 @@ public RecipeType<T> getRecipeType() {
         return type;
     }
 
-//    @Override
-//    public ResourceLocation getUid() {
-//        return type.getUid();
-//    }
-//
-//    @Override
-//    public Class<? extends T> getRecipeClass() {
-//        return type.getRecipeClass();
-//    }
-
     static IGuiHelper guiHelper() {
         return JEIPlugin.jeiHelpers.getGuiHelper();
     }