From abcac85d0e064abbc3df4ebc70ac86dcded9978a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 24 Jun 2022 00:12:30 +0100 Subject: [PATCH] Cleanup modcompat code, initial build setup for JEI support. --- RebornCore/src/main/resources/fabric.mod.json | 2 +- build.gradle | 124 +++++++++++------- gradle.properties | 17 ++- .../DashDynamicBucketBakedModel.java | 50 ------- .../dashloader/DashDynamicCellBakedModel.java | 50 ------- .../client/compat/jei/TechRebornJEI.java | 5 + .../compat/rei/MachineRecipeDisplay.java | 0 .../client/compat/rei/ReiPlugin.java | 0 .../FluidGeneratorRecipeCategory.java | 0 .../FluidGeneratorRecipeDisplay.java | 0 .../FluidReplicatorRecipeCategory.java | 0 .../FluidReplicatorRecipeDisplay.java | 0 ...bstractEnergyConsumingMachineCategory.java | 0 .../rei/machine/AbstractMachineCategory.java | 0 .../machine/AssemblingMachineCategory.java | 0 .../rei/machine/BlastFurnaceCategory.java | 0 .../machine/DistillationTowerCategory.java | 0 .../rei/machine/ElectrolyzerCategory.java | 0 .../compat/rei/machine/GrinderCategory.java | 0 .../machine/ImplosionCompressorCategory.java | 0 .../machine/IndustrialCentrifugeCategory.java | 0 .../machine/OneInputOneOutputCategory.java | 0 .../compat/rei/machine/SawmillCategory.java | 0 .../TwoInputsCenterOutputCategory.java | 0 .../RollingMachineCategory.java | 0 .../rollingmachine/RollingMachineDisplay.java | 0 src/main/java/techreborn/TechReborn.java | 7 - .../techreborn/compat/trinkets/Trinkets.java | 40 ------ .../items/armor/QuantumSuitItem.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 30 files changed, 91 insertions(+), 208 deletions(-) delete mode 100644 src/client/java/techreborn/client/compat/dashloader/DashDynamicBucketBakedModel.java delete mode 100644 src/client/java/techreborn/client/compat/dashloader/DashDynamicCellBakedModel.java create mode 100644 src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java rename src/{client/java => compat/rei}/techreborn/client/compat/rei/MachineRecipeDisplay.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/ReiPlugin.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/AbstractMachineCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/DistillationTowerCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/GrinderCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/SawmillCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java (100%) rename src/{client/java => compat/rei}/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java (100%) delete mode 100644 src/main/java/techreborn/compat/trinkets/Trinkets.java diff --git a/RebornCore/src/main/resources/fabric.mod.json b/RebornCore/src/main/resources/fabric.mod.json index 8b3c72509..cc2487540 100644 --- a/RebornCore/src/main/resources/fabric.mod.json +++ b/RebornCore/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ } ], "depends": { - "fabricloader": ">=0.14.6", + "fabricloader": ">=0.14.8", "fabric": ">=0.55.1", "team_reborn_energy": ">=2.2.0", "fabric-biome-api-v1": ">=3.0.0", diff --git a/build.gradle b/build.gradle index c1ad253ab..ab01d7405 100644 --- a/build.gradle +++ b/build.gradle @@ -18,19 +18,6 @@ plugins { } repositories { - maven { - url = "https://www.cursemaven.com" - content { - includeGroup "curse.maven" - } - } - maven { - name "DashLoader" - url = "https://maven.oskarstrom.net" - content { - includeGroup "net.oskarstrom" - } - } maven { name "REI" url "https://maven.shedaniel.me/" @@ -40,18 +27,11 @@ repositories { includeGroup "dev.architectury" } } - maven { - url = 'https://ladysnake.jfrog.io/artifactory/mods' - content { - // Trinkets dependency - includeGroup "io.github.onyxstudios.Cardinal-Components-API" - } - } maven { - url = "https://jitpack.io" + name = "JEI" + url = "https://dvs1.progwml6.com/files/maven/" content { - // Trinkets API - includeGroup "com.github.emilyploszaj" + includeGroup "mezz.jei" } } } @@ -207,16 +187,9 @@ dependencies { include project(":RebornCore") - disabledOptionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" - disabledOptionalDependency "com.github.emilyploszaj:trinkets:${project.trinkets_version}" - disabledOptionalDependency "net.oskarstrom:DashLoader:${project.dashloader_version}" - - // REI's deps depend on the deprecated command module. - modRuntimeOnly "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fapi_version}" - // Use groovy for datagen/gametest, if you are copying this you prob dont want it. - gametestImplementation 'org.apache.groovy:groovy:4.0.1' - datagenImplementation 'org.apache.groovy:groovy:4.0.1' + gametestImplementation 'org.apache.groovy:groovy:4.0.3' + datagenImplementation 'org.apache.groovy:groovy:4.0.3' gametestImplementation ("com.google.truth:truth:1.1.3") { exclude module: "guava" @@ -224,27 +197,81 @@ dependencies { } } -def optionalDependency(String dep) { - def excludes = { - exclude group: "net.fabricmc.fabric-api" - exclude module: "nbt-crafting" - exclude module: "modmenu" - } +def modCompat(Map args) { + SourceSet compatSourceSet = sourceSets.create(args.name) { + compileClasspath += args.sourceSet.compileClasspath + runtimeClasspath += args.sourceSet.runtimeClasspath - dependencies.modLocalRuntime(dep, excludes) - dependencies.modCompileOnly(dep, excludes) + java { + srcDirs = ["src/compat/${args.name}"] + } + } + + jar { + from compatSourceSet.output.classesDirs + from compatSourceSet.output.resourcesDir + } + + sourcesJar { + from compatSourceSet.allSource + } + + def excludes = { + exclude group: "net.fabricmc.fabric-api" + exclude module: "nbt-crafting" + exclude module: "modmenu" + } + + // TODO use sourceset specific configurations with https://github.com/FabricMC/fabric-loom/pull/674 + dependencies { + args.dependencies.each { dependency -> + modLocalRuntime(dependency, excludes) + modCompileOnly(dependency, excludes) + } + args.compile.each { dependency -> + modCompileOnly(dependency, excludes) + } + args.runtime.each { dependency -> + modLocalRuntime(dependency, excludes) + } + } + + allprojects { + loom { + mods { + techreborn { + sourceSet compatSourceSet + } + } + } + } } -def disabledOptionalDependency(String dep) { - def excludes = { - exclude group: "net.fabricmc.fabric-api" - exclude module: "nbt-crafting" - exclude module: "modmenu" - } - - dependencies.modCompileOnly(dep, excludes) +configurations.each { + println it } +modCompat( + name: "rei", + dependencies: [ + "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" + ], + sourceSet: sourceSets.client, +) + +modCompat( + name: "jei", + runtime: [ + // Uncomment to enable JEI +// "mezz.jei:jei-1.19-fabric:${project.jei_version}" + ], + compile: [ + "mezz.jei:jei-1.19-common-api:${project.jei_version}", + "mezz.jei:jei-1.19-fabric-api:${project.jei_version}" + ], + sourceSet: sourceSets.client, +) + loom { runs { // Add a data gen run config @@ -276,7 +303,6 @@ loom { } } } -test.dependsOn runGametest runDatagen { // Doesn't re-run the task when its up-to date diff --git a/gradle.properties b/gradle.properties index e231ab2f0..9cee49d1a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,16 @@ org.gradle.jvmargs=-Xmx2G # Mod properties - mod_version=5.3.2 +mod_version=5.3.2 # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19 - yarn_version=1.19+build.1 - loader_version=0.14.6 - fapi_version=0.55.1+1.19 +minecraft_version=1.19 +yarn_version=1.19+build.4 +loader_version=0.14.8 +fapi_version=0.56.2+1.19 # Dependencies - energy_version=2.2.0 - rei_version=9.0.466 - trinkets_version=3.0.2 - dashloader_version=2.0 +energy_version=2.2.0 +rei_version=9.0.491 +jei_version=11.0.0.206 diff --git a/src/client/java/techreborn/client/compat/dashloader/DashDynamicBucketBakedModel.java b/src/client/java/techreborn/client/compat/dashloader/DashDynamicBucketBakedModel.java deleted file mode 100644 index 59adc2476..000000000 --- a/src/client/java/techreborn/client/compat/dashloader/DashDynamicBucketBakedModel.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2020 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.client.compat.dashloader; - -import net.oskarstrom.dashloader.DashRegistry; -import net.oskarstrom.dashloader.api.annotation.DashConstructor; -import net.oskarstrom.dashloader.api.annotation.DashObject; -import net.oskarstrom.dashloader.api.enums.ConstructorMode; -import net.oskarstrom.dashloader.model.DashModel; -import techreborn.client.render.DynamicBucketBakedModel; - -@DashObject(DynamicBucketBakedModel.class) -public class DashDynamicBucketBakedModel implements DashModel { - - @DashConstructor(ConstructorMode.EMPTY) - public DashDynamicBucketBakedModel() { - } - - @Override - public DynamicBucketBakedModel toUndash(DashRegistry registry) { - return new DynamicBucketBakedModel(); - } - - @Override - public int getStage() { - return 0; - } -} diff --git a/src/client/java/techreborn/client/compat/dashloader/DashDynamicCellBakedModel.java b/src/client/java/techreborn/client/compat/dashloader/DashDynamicCellBakedModel.java deleted file mode 100644 index 1001f676c..000000000 --- a/src/client/java/techreborn/client/compat/dashloader/DashDynamicCellBakedModel.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2020 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.client.compat.dashloader; - -import net.oskarstrom.dashloader.DashRegistry; -import net.oskarstrom.dashloader.api.annotation.DashConstructor; -import net.oskarstrom.dashloader.api.annotation.DashObject; -import net.oskarstrom.dashloader.api.enums.ConstructorMode; -import net.oskarstrom.dashloader.model.DashModel; -import techreborn.client.render.DynamicCellBakedModel; - -@DashObject(DynamicCellBakedModel.class) -public class DashDynamicCellBakedModel implements DashModel { - - @DashConstructor(ConstructorMode.EMPTY) - public DashDynamicCellBakedModel() { - } - - @Override - public DynamicCellBakedModel toUndash(DashRegistry registry) { - return new DynamicCellBakedModel(); - } - - @Override - public int getStage() { - return 0; - } -} diff --git a/src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java b/src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java new file mode 100644 index 000000000..8c86d5c8f --- /dev/null +++ b/src/compat/jei/techreborn/client/compat/jei/TechRebornJEI.java @@ -0,0 +1,5 @@ +package techreborn.client.compat.jei; + +public class TechRebornJEI { + // Hello o/ +} diff --git a/src/client/java/techreborn/client/compat/rei/MachineRecipeDisplay.java b/src/compat/rei/techreborn/client/compat/rei/MachineRecipeDisplay.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/MachineRecipeDisplay.java rename to src/compat/rei/techreborn/client/compat/rei/MachineRecipeDisplay.java diff --git a/src/client/java/techreborn/client/compat/rei/ReiPlugin.java b/src/compat/rei/techreborn/client/compat/rei/ReiPlugin.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/ReiPlugin.java rename to src/compat/rei/techreborn/client/compat/rei/ReiPlugin.java diff --git a/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java b/src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java rename to src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java b/src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java rename to src/compat/rei/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeDisplay.java diff --git a/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java b/src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java rename to src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java b/src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java rename to src/compat/rei/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/AbstractEnergyConsumingMachineCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/AbstractMachineCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/AbstractMachineCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/AbstractMachineCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/AbstractMachineCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/DistillationTowerCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/DistillationTowerCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/GrinderCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/GrinderCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/SawmillCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/SawmillCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java b/src/compat/rei/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java rename to src/compat/rei/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java b/src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java rename to src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineCategory.java diff --git a/src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java b/src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java similarity index 100% rename from src/client/java/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java rename to src/compat/rei/techreborn/client/compat/rei/rollingmachine/RollingMachineDisplay.java diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index ea9481bd6..1942d1ced 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -40,7 +40,6 @@ import reborncore.common.config.Configuration; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Torus; import techreborn.blockentity.GuiType; -import techreborn.compat.trinkets.Trinkets; import techreborn.config.TechRebornConfig; import techreborn.events.ApplyArmorToDamageHandler; import techreborn.events.OreDepthSyncHandler; @@ -64,8 +63,6 @@ public class TechReborn implements ModInitializer { new Identifier("techreborn", "item_group"), () -> new ItemStack(TRContent.NUKE)); - public static Predicate elytraPredicate = playerEntity -> false; - @Override public void onInitialize() { INSTANCE = this; @@ -110,10 +107,6 @@ public class TechReborn implements ModInitializer { ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(TRContent.Dusts.SAW.asItem(), 0.3F); ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(TRContent.SmallDusts.SAW.asItem(), 0.1F); - if (FabricLoader.getInstance().isModLoaded("trinkets")) { - elytraPredicate = Trinkets.isElytraEquipped(); - } - TechRebornTemplates.init(); LOGGER.info("TechReborn setup done!"); diff --git a/src/main/java/techreborn/compat/trinkets/Trinkets.java b/src/main/java/techreborn/compat/trinkets/Trinkets.java deleted file mode 100644 index d7cbf556a..000000000 --- a/src/main/java/techreborn/compat/trinkets/Trinkets.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2020 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.compat.trinkets; - -import dev.emi.trinkets.api.TrinketsApi; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Items; - -import java.util.function.Predicate; - -public class Trinkets { - - public static Predicate isElytraEquipped() { - return playerEntity -> TrinketsApi.getTrinketComponent(playerEntity) - .map(component -> component.isEquipped(Items.ELYTRA)) - .orElse(false); - } -} diff --git a/src/main/java/techreborn/items/armor/QuantumSuitItem.java b/src/main/java/techreborn/items/armor/QuantumSuitItem.java index 4533878f2..1d29d02f3 100644 --- a/src/main/java/techreborn/items/armor/QuantumSuitItem.java +++ b/src/main/java/techreborn/items/armor/QuantumSuitItem.java @@ -97,7 +97,7 @@ public class QuantumSuitItem extends TRArmourItem implements ArmorBlockEntityTic break; case CHEST: if (enableFlight){ - if (getStoredEnergy(stack) > flyCost && !TechReborn.elytraPredicate.test(playerEntity)) { + if (getStoredEnergy(stack) > flyCost) { playerEntity.getAbilities().allowFlying = true; if (playerEntity.getAbilities().flying) { tryUseEnergy(stack, flyCost); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 658292273..82237c7cc 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ ] }, "depends": { - "fabricloader": ">=0.14.6", + "fabricloader": ">=0.14.8", "fabric": ">=0.55.1", "reborncore": "*", "team_reborn_energy": ">=2.2.0",