Merge branch 'gametest-pr' into 1.18.x

Author: robotgryphon

1.16.5-test/java/dev/compactmods/machines/tests/minecraft/ExampleTest.java

@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
+        mavenLocal()
     }
 
     dependencies {
@@ -52,6 +53,14 @@ sourceSets {
         compileClasspath += sourceSets.api.output
         runtimeClasspath += sourceSets.api.output
     }
+
+    test {
+        java { srcDir "src/test/java" }
+        resources { srcDir "src/test/resources" }
+
+        compileClasspath += sourceSets.api.output
+        runtimeClasspath += sourceSets.api.output
+    }
 }
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
@@ -132,10 +141,42 @@ minecraft {
                 }
             }
         }
+
+        gametestserver {
+            workingDirectory project.file('run/gametest')
+
+            // Recommended logging data for a userdev environment
+            // The markers can be added/remove as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            property 'forge.logging.console.level', 'debug'
+
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
+            // Only runs gametests which use "examplemod" as the namespace
+            args '--enableNamespace', mod_id
+
+            mods {
+                compactmachines {
+                    source sourceSets.api
+                    source sourceSets.main
+                    source sourceSets.test
+                }
+            }
+        }
     }
 }
 
 repositories {
+    mavenLocal()
+
     maven {
         url "https://www.cursemaven.com"
         content {
@@ -188,7 +229,7 @@ dependencies {
     runtimeOnly(fg.deobf("curse.maven:create-328085:3556823"))
     runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
     runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
-    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3569563"))
+    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))
 
     // Mekanism + Mek Generators - Tunnel testing
 //    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3206392"))
@@ -199,6 +240,10 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
+processTestResources {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+}
+
 jar {
     from sourceSets.main.output
     from sourceSets.api.output

1.16.5-test/java/dev/compactmods/machines/tests/nbt/MachineExternalDataTests.java

@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.18.1
-forge_version=39.0.75
+forge_version=39.0.97-gametest-1.18.x
 
 mod_id=compactmachines
-mod_version=4.0.0-beta.6
+mod_version=4.0.0-beta.7
 
 # Dependencies and Libs
 jei_mc_version=1.18.1

build.gradle

@@ -1,18 +1,13 @@
 package dev.compactmods.machines.data.codec;
 
+import java.util.UUID;
+import java.util.stream.DoubleStream;
+import java.util.stream.IntStream;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.Util;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.Level;
-
-import java.util.UUID;
-import java.util.stream.DoubleStream;
-import java.util.stream.IntStream;
 
 public abstract class CodecExtensions {
     public static final Codec<UUID> UUID_CODEC = Codec.STRING
@@ -24,9 +19,6 @@ public abstract class CodecExtensions {
                 }
             }, UUID::toString).stable();
 
-    public static final Codec<ResourceKey<Level>> WORLD_REGISTRY_KEY = ResourceLocation.CODEC
-            .xmap(ResourceKey.elementKey(Registry.DIMENSION_REGISTRY), ResourceKey::location);
-
     public static final Codec<Vec3> VECTOR3D = DoubleStreamExtensions.CODEC
             .comapFlatMap(i -> DoubleStreamExtensions.fixedDoubleSize(i, 3)
                     .map(out -> new Vec3(out[0], out[1], out[2])), vec -> DoubleStream.of(vec.x, vec.y, vec.z));

gradle.properties

@@ -12,6 +12,7 @@
 import dev.compactmods.machines.util.LocationUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
@@ -35,7 +36,7 @@ public class DimensionalPosition implements INBTSerializable<CompoundTag>, IDime
      of initialization, making it impossible to unit test without booting a whole server up.
     */
     public static final Codec<DimensionalPosition> CODEC = RecordCodecBuilder.create(i -> i.group(
-            CodecExtensions.WORLD_REGISTRY_KEY.fieldOf("dim").forGetter(DimensionalPosition::getDimension),
+            ResourceKey.codec(Registry.DIMENSION_REGISTRY).fieldOf("dim").forGetter(DimensionalPosition::getDimension),
             CodecExtensions.VECTOR3D.fieldOf("pos").forGetter(DimensionalPosition::getPosition),
             CodecExtensions.VECTOR3D.optionalFieldOf("rot", Vec3.ZERO).forGetter(DimensionalPosition::getRotation)
     ).apply(i, DimensionalPosition::new));
@@ -136,12 +137,20 @@ public BlockPos getBlockPosition() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+
+        if (o == null || getClass() != o.getClass())
+            return false;
+
         DimensionalPosition that = (DimensionalPosition) o;
-        return Objects.equals(dimension, that.dimension) &&
-                Objects.equals(position, that.position) &&
-                Objects.equals(rotation, rotation);
+        if (!dimension.equals(that.dimension))
+            return false;
+
+        if (!position.equals(that.position))
+            return false;
+
+        return rotation.equals(that.rotation);
     }
 
     @Override

src/main/java/dev/compactmods/machines/data/codec/CodecExtensions.java

@@ -0,0 +1,16 @@
+package dev.compactmods.machines.test;
+
+import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.test.data.MachineExternalDataTests;
+import net.minecraftforge.event.RegisterGameTestsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class GameTestsMain {
+
+    @SubscribeEvent
+    public static void registerTests(final RegisterGameTestsEvent game) {
+        game.register(MachineExternalDataTests.class);
+    }
+}