From f3177b691a457e2af76c6698cd5d623280496afe Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 27 Jun 2022 22:48:24 +0100 Subject: [PATCH] Revert buildscript changes, will bring back once 0.13 loom is ready. --- build.gradle | 9 +++++++-- .../client/compat/rei/MachineRecipeDisplay.java | 0 .../java}/techreborn/client/compat/rei/ReiPlugin.java | 0 .../rei/fluidgenerator/FluidGeneratorRecipeCategory.java | 0 .../rei/fluidgenerator/FluidGeneratorRecipeDisplay.java | 0 .../fluidreplicator/FluidReplicatorRecipeCategory.java | 0 .../fluidreplicator/FluidReplicatorRecipeDisplay.java | 0 .../machine/AbstractEnergyConsumingMachineCategory.java | 0 .../compat/rei/machine/AbstractMachineCategory.java | 0 .../compat/rei/machine/AssemblingMachineCategory.java | 0 .../client/compat/rei/machine/BlastFurnaceCategory.java | 0 .../compat/rei/machine/DistillationTowerCategory.java | 0 .../client/compat/rei/machine/ElectrolyzerCategory.java | 0 .../client/compat/rei/machine/GrinderCategory.java | 0 .../compat/rei/machine/ImplosionCompressorCategory.java | 0 .../compat/rei/machine/IndustrialCentrifugeCategory.java | 0 .../compat/rei/machine/OneInputOneOutputCategory.java | 0 .../client/compat/rei/machine/SawmillCategory.java | 0 .../rei/machine/TwoInputsCenterOutputCategory.java | 0 .../rei/rollingmachine/RollingMachineCategory.java | 0 .../compat/rei/rollingmachine/RollingMachineDisplay.java | 0 .../jei/techreborn/client/compat/jei/TechRebornJEI.java | 5 ----- 22 files changed, 7 insertions(+), 7 deletions(-) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/MachineRecipeDisplay.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/ReiPlugin.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/AbstractMachineCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/DistillationTowerCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/GrinderCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/SawmillCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java (100%) rename src/{compat/rei => client/java}/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java (100%) delete mode 100644 src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java diff --git a/build.gradle b/build.gradle index fd7272fb8..4afc21454 100644 --- a/build.gradle +++ b/build.gradle @@ -198,6 +198,7 @@ dependencies { } def modCompat(Map args) { + /* SourceSet compatSourceSet = sourceSets.create(args.name) { compileClasspath += args.sourceSet.compileClasspath runtimeClasspath += args.sourceSet.runtimeClasspath @@ -215,6 +216,7 @@ def modCompat(Map args) { sourcesJar { from compatSourceSet.allSource } + */ def excludes = { exclude group: "net.fabricmc.fabric-api" @@ -236,6 +238,7 @@ def modCompat(Map args) { } } + /* allprojects { loom { mods { @@ -245,6 +248,7 @@ def modCompat(Map args) { } } } + */ } modCompat( @@ -255,11 +259,11 @@ modCompat( sourceSet: sourceSets.client, ) +/* modCompat( name: "jei", runtime: [ - // Uncomment to enable JEI -// "mezz.jei:jei-1.19-fabric:${project.jei_version}" + "mezz.jei:jei-1.19-fabric:${project.jei_version}" ], compile: [ "mezz.jei:jei-1.19-common-api:${project.jei_version}", @@ -267,6 +271,7 @@ modCompat( ], sourceSet: sourceSets.client, ) +*/ loom { runs { diff --git a/src/compat/rei/techreborn/client/compat/rei/MachineRecipeDisplay.java b/src/client/java/techreborn/client/compat/rei/MachineRecipeDisplay.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/MachineRecipeDisplay.java rename to src/client/java/techreborn/client/compat/rei/MachineRecipeDisplay.java diff --git a/src/compat/rei/techreborn/client/compat/rei/ReiPlugin.java b/src/client/java/techreborn/client/compat/rei/ReiPlugin.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/ReiPlugin.java rename to src/client/java/techreborn/client/compat/rei/ReiPlugin.java diff --git a/src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java b/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java rename to src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java b/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java rename to src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java diff --git a/src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java b/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java rename to src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java b/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java rename to src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java b/src/client/java/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/AbstractMachineCategory.java b/src/client/java/techreborn/client/compat/rei/machine/AbstractMachineCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/AbstractMachineCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/AbstractMachineCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java b/src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java b/src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/DistillationTowerCategory.java b/src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/DistillationTowerCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java b/src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/GrinderCategory.java b/src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/GrinderCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java b/src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java b/src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java b/src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/SawmillCategory.java b/src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/SawmillCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java b/src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java rename to src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java b/src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java rename to src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java diff --git a/src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java b/src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java similarity index 100% rename from src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java rename to src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java diff --git a/src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java b/src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java deleted file mode 100644 index 8c86d5c8f..000000000 --- a/src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java +++ /dev/null @@ -1,5 +0,0 @@ -package techreborn.client.compat.jei; - -public class TechRebornJEI { - // Hello o/ -}