Merge branch 'enh/35' into 1.16.x

Author: robotgryphon

.github/workflows/ci-tests-nightly.yml

@@ -2,6 +2,8 @@ name: Gradle Tests and Nightly (CI)
 
 on:
   push:
+    branches:
+      - '**'
     tags-ignore:
       - v*
     paths-ignore:

build.gradle

@@ -13,6 +13,7 @@ plugins {
     id "idea"
     id "eclipse"
     id "maven-publish"
+    id 'com.github.johnrengelman.shadow' version '7.1.0'
 }
 
 apply plugin: "net.minecraftforge.gradle"
@@ -29,6 +30,12 @@ println("Version: ${version}");
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
+configurations {
+    library
+    implementation.extendsFrom library
+    shade.extendsFrom library
+}
+
 sourceSets {
     api {
         java {
@@ -48,7 +55,8 @@ sourceSets {
             srcDir 'src/generated/resources'
         }
 
-        compileClasspath += compileClasspath += sourceSets.api.output
+        runtimeClasspath += sourceSets.api.output
+        compileClasspath += sourceSets.api.output
     }
 
     test {
@@ -64,12 +72,8 @@ sourceSets {
 }
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+
 minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
     mappings channel: 'official', version: minecraft_version
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     def resourcesDir = sourceSets.main.resources.srcDirs.first().absolutePath
@@ -81,6 +85,9 @@ minecraft {
         client {
             workingDirectory project.file('run/client')
 
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
             // Recommended logging data for a userdev environment
             property 'forge.logging.markers', '' // 'SCAN,REGISTRIES,REGISTRYDUMP'
 
@@ -243,9 +250,14 @@ dependencies {
 
     testImplementation fg.deobf("com.github.alcatrazEscapee:mcjunitlib:${mcunittest_version}")
 
+    library "io.reactivex.rxjava3:rxjava:3.1.1";
+
     // Deobfuscate each dev mod for runtime
     dev_mods.each { implementation fg.deobf(it) }
 
+    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3318114"))
+    runtimeOnly(fg.deobf("curse.maven:sues-407174:3188120"))
+
     // JEI
     compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
@@ -263,12 +275,39 @@ processTestResources {
     duplicatesStrategy = DuplicatesStrategy.WARN
 }
 
+assemble {
+    dependsOn shadowJar
+}
+
+reobf {
+    shadowJar {}
+}
+
+tasks.withType(Jar).configureEach {
+    destinationDir = file("$rootDir/build-out")
+}
+
+shadowJar {
+    classifier ""
+    from sourceSets.api.output
+    from sourceSets.main.output
+
+    configurations = [project.configurations.shade]
+    exclude "LICENSE*"
+    finalizedBy 'reobfShadowJar'
+    minimize()
+    relocate 'io.reactivex', 'dev.compactmods.crafting.lib.reactivex'
+    relocate 'org.reactivestreams', 'dev.compactmods.crafting.lib.reactivestreams'
+}
+
 jar {
+    classifier "slim"
+
     from sourceSets.api.output
     from sourceSets.main.output
 
-    destinationDir = file("$rootDir/build-out")
     finalizedBy('reobfJar')
+
     manifest {
         attributes([
                 "Specification-Title"     : "compactcrafting",
@@ -284,31 +323,28 @@ jar {
 task apiJar(type: Jar) {
     // Sources included because of MinecraftForge/ForgeGradle#369
     from sourceSets.api.output
-    destinationDirectory = file("$rootDir/build-out")
     classifier("api")
 }
 
 task testJar(type: Jar) {
     from sourceSets.api.output
     from sourceSets.main.output
     from sourceSets.test.output
-    destinationDirectory = file("$rootDir/build-out")
     classifier("tests")
 }
 
 artifacts {
-    archives jar, apiJar, testJar
+    archives jar, shadowJar, apiJar, testJar
 }
 
 publishing {
     publications {
         maven(MavenPublication) {
             artifactId = mod_id
             artifacts {
-                artifact jar
-                artifact(apiJar) {
-                    classifier = "api"
-                }
+                artifact(jar)
+                artifact(shadowJar)
+                artifact(apiJar)
                 artifact(testJar)
             }
         }
@@ -317,9 +353,8 @@ publishing {
             artifactId = mod_id
             artifacts {
                 artifact(jar)
-                artifact(apiJar) {
-                    classifier = "api"
-                }
+                artifact(shadowJar)
+                artifact(apiJar)
                 artifact(testJar)
             }
         }

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version=1.16.5
 forge_version=36.1.3
 
 mod_id=compactcrafting
-mod_version=1.0.0-beta.7
+mod_version=1.0.0
 
 # Dependencies and Libs
 jei_version=7.7.1.110
@@ -16,4 +16,4 @@ mcunittest_version=1.8.1-1.16.5
 
 # Curseforge
 cf_project=429735
-cf_release_type=beta
+cf_release_type=release

src/api/java/dev/compactmods/crafting/api/catalyst/CatalystType.java

@@ -0,0 +1,9 @@
+package dev.compactmods.crafting.api.catalyst;
+
+import com.mojang.serialization.Codec;
+import net.minecraftforge.registries.IForgeRegistryEntry;
+
+public interface CatalystType<Matcher extends ICatalystMatcher> extends IForgeRegistryEntry<CatalystType<?>> {
+
+    Codec<Matcher> getCodec();
+}

src/api/java/dev/compactmods/crafting/api/catalyst/ICatalystMatcher.java

@@ -0,0 +1,13 @@
+package dev.compactmods.crafting.api.catalyst;
+
+import java.util.Set;
+import net.minecraft.item.ItemStack;
+
+public interface ICatalystMatcher {
+
+    boolean matches(ItemStack stack);
+
+    CatalystType<?> getType();
+
+    Set<ItemStack> getPossible();
+}

src/api/java/dev/compactmods/crafting/api/field/IActiveWorldFields.java

@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 import java.util.stream.Stream;
+import net.minecraft.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
@@ -32,4 +33,6 @@ default void addFieldInstance(IMiniaturizationField field) {}
     boolean hasActiveField(BlockPos center);
 
     Stream<IMiniaturizationField> getFields(ChunkPos chunk);
+
+    RegistryKey<World> getLevel();
 }

src/api/java/dev/compactmods/crafting/api/field/IMiniaturizationField.java

@@ -13,6 +13,8 @@
 
 public interface IMiniaturizationField {
 
+    default void dispose() {}
+
     AxisAlignedBB getBounds();
 
     MiniaturizationFieldSize getFieldSize();
@@ -55,8 +57,6 @@ default CompoundNBT serverData() {
         return new CompoundNBT();
     }
 
-    default void loadServerData(CompoundNBT nbt) {}
-
     default CompoundNBT clientData() {
         CompoundNBT data = new CompoundNBT();
         data.putLong("center", getCenter().asLong());

src/api/java/dev/compactmods/crafting/api/recipe/IMiniaturizationRecipe.java

@@ -3,14 +3,15 @@
 import java.util.Collection;
 import java.util.Optional;
 import java.util.stream.Stream;
+import dev.compactmods.crafting.api.catalyst.ICatalystMatcher;
 import dev.compactmods.crafting.api.components.IRecipeComponents;
 import dev.compactmods.crafting.api.recipe.layers.IRecipeLayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 
 public interface IMiniaturizationRecipe {
-    ItemStack getCatalyst();
+    ICatalystMatcher getCatalyst();
 
     ItemStack[] getOutputs();
 

src/generated/resources/.cache/cache

@@ -17,6 +17,8 @@ a558989a04a5f19ef48638d1c8046fa657648b44 data/compactcrafting/advancements/recip
 45d2dbdc5645834115bb56999d16420aa9629948 data/compactcrafting/advancements/recipes/compactcrafting/projector_dish.json
 c1907f3b4dd836b38f84b64e45f2ff6cb691a8fd data/compactcrafting/advancements/recipes/compactcrafting/rescan_proxy.json
 665dc63cdbb86e785cf9171a63f83d034a3584ef data/compactcrafting/loot_tables/blocks/field_projector.json
+01706dcd83634eea9ad27be909b4a789cfc80d33 data/compactcrafting/loot_tables/blocks/match_proxy.json
+7114601a2207f87b722bef4b3bf2fbe11c975073 data/compactcrafting/loot_tables/blocks/rescan_proxy.json
 4afba1a945aad9b9fc0e748bf9ee46d7aeb01a70 data/compactcrafting/recipes/base.json
 b4bb22914fb3c6cbcef342b0f92a5148b35a0647 data/compactcrafting/recipes/field_projector.json
 e87defaaae5226e24b25a72934767c19208868c6 data/compactcrafting/recipes/match_proxy.json

src/generated/resources/data/compactcrafting/loot_tables/blocks/match_proxy.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "compactcrafting:match_proxy",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "compactcrafting:match_proxy"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}