Merge pull request #295 from GTModpackTeam/fix-paper

Author: tier940

.github/workflows/build_and_test.yml

@@ -31,12 +31,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Apply patch to settings.gradle
-        run: |
-          if [ -f settings.gradle.patch ]; then
-            patch -p0 < settings.gradle.patch
-          fi
-
       - name: Apply patch to gradle.properties
         run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
 

.github/workflows/test_java.yml

@@ -22,12 +22,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Apply patch to settings.gradle
-        run: |
-          if [ -f settings.gradle.patch ]; then
-            patch -p0 < settings.gradle.patch
-          fi
-
       - name: Apply patch to build.gradle
         run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
 

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.2.14
+## Ender IO
+- Fix Black Paper
+
+## GregTech Food Options
+- Kitchen Recipe
+
+* * *
+
 # v2.2.13
 - Fix upgrade recipe to Nano Boots from Piston Boots.
 

build.gradle

@@ -1,8 +1,8 @@
-//version: 1723428048
+//version: 1725973221
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
- * Please check https://github.com/GregTechCEu/Buildscripts/blob/master/build.gradle for updates.
+ * Please check https://github.com/GTModpackTeam/Buildscripts/blob/master/build.gradle for updates.
  * You can also run ./gradlew updateBuildScript to update your buildscript.
  */
 
@@ -1423,11 +1423,11 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/build.gradle")
 }
 
 static URL availableSettingsGradleUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/settings.gradle")
+    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/settings.gradle")
 }
 
 boolean performBuildScriptUpdate() {
@@ -1476,8 +1476,8 @@ tasks.register('faq') {
                 "To add new repositories to your project, place them in 'repositories.gradle'.\n" +
                 "If you need additional gradle code to run, you can place it in a file named 'addon.gradle' (or either of the above, up to you for organization).\n\n" +
                 "If your build fails to recognize the syntax of newer Java versions, enable Jabel in your 'gradle.properties' under the option name 'enableModernJavaSyntax'.\n" +
-                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/jabel.md\n\n" +
-                "Report any issues or feature requests you have for this build script to https://github.com/GregTechCEu/Buildscripts/issues\n")
+                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/jabel.md\n\n" +
+                "Report any issues or feature requests you have for this build script to https://github.com/GTModpackTeam/Buildscripts/issues\n")
     }
 }
 
@@ -1495,7 +1495,7 @@ def getFile(String relativePath) {
 
 def checkPropertyExists(String propertyName) {
     if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GregTechCEu/Buildscripts/blob/main/gradle.properties")
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTModpackTeam/Buildscripts/blob/main/gradle.properties")
     }
 }
 

dependencies.gradle

@@ -21,7 +21,7 @@
  *
  *  - shadowapi("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
  *       Requires you to enable usesShadowedDependencies in gradle.properties
- *       For more info, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/shadow.md
+ *       For more info, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/shadow.md
  *
  * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
  * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gtexpert
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.2.13-beta
+modVersion = 2.2.13-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true
@@ -190,7 +190,7 @@ mavenArtifactGroup =
 
 # Enable spotless checks
 # Enforces code formatting on your source code
-# By default this will use the files found here: https://github.com/GregTechCEu/Buildscripts/tree/master/spotless
+# By default this will use the files found here: https://github.com/GTModpackTeam/Buildscripts/tree/master/spotless
 # to format your code. However, you can create your own version of these files and place them in your project's
 # root directory to apply your own formatting options instead.
 enableSpotless = true

settings.gradle

@@ -20,11 +20,22 @@ plugins {
     id 'com.diffplug.blowdryerSetup' version '1.7.0'
     // Automatic toolchain provisioning
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'com.gradle.enterprise' version '3.18.1'
+}
+
+gradleEnterprise {
+    if (System.getenv("CI") != null) {
+        buildScan {
+            publishAlways()
+            termsOfServiceUrl = "https://gradle.com/terms-of-service"
+            termsOfServiceAgree = "yes"
+        }
+    }
 }
 
 blowdryerSetup {
     repoSubfolder 'spotless'
-    github 'GregTechCEu/Buildscripts', 'tag', 'v1.0.7'
+    github 'GTModpackTeam/Buildscripts', 'tag', 'v1.0.1'
 }
 
 rootProject.name = rootProject.projectDir.getName()

settings.gradle.patch

@@ -24,6 +24,21 @@
 public class EIOItemsRecipe {
 
     public static void init() {
+        // Black Paper
+        ModHandler.removeRecipeByOutput(Mods.EnderIO.getItem("item_material", 1, 77));
+        RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
+                .input(Items.PAPER)
+                .input("dyeBlack")
+                .circuitMeta(2)
+                .outputs(Mods.EnderIO.getItem("item_material", 1, 77))
+                .duration(100).EUt(4).buildAndRegister();
+        RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
+                .input(Items.PAPER)
+                .fluidInputs(Materials.DyeBlack.getFluid(72))
+                .circuitMeta(2)
+                .outputs(Mods.EnderIO.getItem("item_material", 1, 77))
+                .duration(100).EUt(4).buildAndRegister();
+
         // Enderman Head
         RecipeMaps.LARGE_CHEMICAL_RECIPES.recipeBuilder()
                 .circuitMeta(5)

src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java

@@ -8,6 +8,7 @@
 import gtexpert.api.util.Mods;
 import gtexpert.integration.GTEIntegrationSubmodule;
 import gtexpert.integration.gtfo.recipes.GTFOChemicalRecipe;
+import gtexpert.integration.gtfo.recipes.GTFOItemsRecipe;
 import gtexpert.integration.gtfo.recipes.GTFOWoodRecipe;
 import gtexpert.modules.GTEModules;
 
@@ -21,6 +22,7 @@ public class GTFOModule extends GTEIntegrationSubmodule {
 
     @Override
     public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+        GTFOItemsRecipe.init();
         GTFOWoodRecipe.init();
         GTFOChemicalRecipe.init();
     }