From 466abb37140112fffb8e66c31d3a0fade19917a3 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Mon, 1 Apr 2024 17:14:47 -0700 Subject: [PATCH] prep and cleanup --- build.gradle | 57 +++---------------- gradle.properties | 2 +- .../redstone/TileWirelessTransmit.java | 1 + .../cyclic/compat/botania/BotaniaWrapper.java | 3 +- .../com/lothrazar/cyclic/util/CharmUtil.java | 1 + 5 files changed, 11 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 2525e98a5b..7f7d408f89 100644 --- a/build.gradle +++ b/build.gradle @@ -94,57 +94,14 @@ dependencies { compileOnly fg.deobf("vazkii.botania:Botania:${botania_version}:api") runtimeOnly fg.deobf("vazkii.botania:Botania:${botania_version}") - +/* implementation fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}") - - - - // runtimeOnly fg.deobf("curse.maven:just-enough-effect-descriptions-jeed-532286:3541185") - runtimeOnly fg.deobf("curse.maven:liquid-blocks-301999:3323640") - runtimeOnly fg.deobf("curse.maven:caelus-308989:3522094") - runtimeOnly fg.deobf("curse.maven:elytra-slot-317716:3522097") - // implementation fg.deobf("curse.maven:openblocks-elevator-250832:3238352") - // implementation fg.deobf("curse.maven:mantle-74924:3482897") - // implementation fg.deobf("curse.maven:tinkers-construct-74072:3482903") - // implementation fg.deobf("curse.maven:construction-wand-399558:3499311") - // implementation fg.deobf("curse.maven:glass-cutter-368921:3185268") - // implementation fg.deobf("curse.maven:mob-grinding-utils-254241:3498537") - - // implementation fg.deobf("curse.maven:inspirations-284007:3414517") - // implementation fg.deobf("curse.maven:simple-storage-network-268495:3462942") - // implementation fg.deobf("curse.maven:valkyrielib-245480:3396151") - // implementation fg.deobf("curse.maven:simple-generators-246010:3464413") - // implementation fg.deobf("curse.maven:autoreglib-250363:3326041") - // implementation fg.deobf("curse.maven:quark-243121:3394265") - // implementation fg.deobf("curse.maven:titanium-287342:3346366") - // implementation fg.deobf("curse.maven:industrial-foregoing-266515:3446262") - // implementation fg.deobf("curse.maven:forcecraft-454802:3495606") - // implementation fg.deobf("curse.maven:plain-grinder-452000:3389092") - - // implementation fg.deobf("curse.maven:cofh-core-69162:3407019") - // implementation fg.deobf("curse.maven:thermal-foundation-222880:3412300") - // implementation fg.deobf("curse.maven:mekanism-268560:3206392") - // implementation fg.deobf("curse.maven:mekanism-generators-268566:3206395") - // implementation fg.deobf("curse.maven:mcjtylib-233105:3402861") - // implementation fg.deobf("curse.maven:rftools-base-326041:3380271") - // implementation fg.deobf("curse.maven:biomes-o-plenty-220318:3360574") - // implementation fg.deobf("curse.maven:aquaculture-60028:3401886") - // implementation fg.deobf("curse.maven:ensorcellation-349447:3407021") - // implementation fg.deobf("curse.maven:liquid-blocks-301999:3323640") - // implementation fg.deobf("curse.maven:gardening-tools-351990:3230668") - // implementation fg.deobf("curse.maven:cucumber-272335:3349690") - // implementation fg.deobf("curse.maven:mystical-agriculture-246640:3467262") - // implementation fg.deobf("curse.maven:refined-storage-243076:3157354") - // implementation fg.deobf("curse.maven:ex-nihilo-sequentia-400012:3060647") - // implementation fg.deobf("curse.maven:storage-drawers-223852:3180569") - // implementation fg.deobf("curse.maven:create-328085:328085") - - // implementation fg.deobf("curse.maven:selene-499980:3472679") - // implementation fg.deobf("curse.maven:supplementaries-412082:3466032") - // implementation fg.deobf("curse.maven:resourceful-bees-384508:3206649") - // implementation fg.deobf("curse.maven:architectury-forge-419699:3188530") - // implementation fg.deobf("curse.maven:rhino-416294:3187177") - // implementation fg.deobf("curse.maven:kubejs-238086:3137415") + implementation fg.deobf("curse.maven:mantle-74924:3482897") + implementation fg.deobf("curse.maven:tinkers-construct-74072:3482903") + implementation fg.deobf("curse.maven:cucumber-272335:3507886") + implementation fg.deobf("curse.maven:mystical-agriculture-246640:3562127") + implementation fg.deobf("curse.maven:chunknogobyebye-332695:3195333") +*/ // To use any mod in /libs/ folder, place it in and set the mod and version to match jar filename // runtimeOnly fg.deobf("libs:SimpleStorageNetwork:1.16.4-1.3.1") diff --git a/gradle.properties b/gradle.properties index 3360d19960..b8d718125e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false curse_id=239286 -mod_version=1.5.22 +mod_version=1.5.23-SNAPSHOT mc_version=1.16.5 forge_version=36.2.34 diff --git a/src/main/java/com/lothrazar/cyclic/block/wireless/redstone/TileWirelessTransmit.java b/src/main/java/com/lothrazar/cyclic/block/wireless/redstone/TileWirelessTransmit.java index 7befcce7e9..999cf21f40 100644 --- a/src/main/java/com/lothrazar/cyclic/block/wireless/redstone/TileWirelessTransmit.java +++ b/src/main/java/com/lothrazar/cyclic/block/wireless/redstone/TileWirelessTransmit.java @@ -95,6 +95,7 @@ public CompoundNBT write(CompoundNBT tag) { return super.write(tag); } + @SuppressWarnings("deprecation") private void toggleTarget(BlockPosDim dimPos) { if (world.isRemote) { return; diff --git a/src/main/java/com/lothrazar/cyclic/compat/botania/BotaniaWrapper.java b/src/main/java/com/lothrazar/cyclic/compat/botania/BotaniaWrapper.java index e9e6e6c849..3638790abc 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/botania/BotaniaWrapper.java +++ b/src/main/java/com/lothrazar/cyclic/compat/botania/BotaniaWrapper.java @@ -2,13 +2,12 @@ import net.minecraft.entity.LivingEntity; import net.minecraftforge.fml.ModList; -import vazkii.botania.api.BotaniaAPI; public class BotaniaWrapper { public static boolean hasSolegnoliaAround(LivingEntity entity) { try { - return ModList.get().isLoaded("botania") && BotaniaAPI.instance().hasSolegnoliaAround(entity); + return ModList.get().isLoaded("botania") && vazkii.botania.api.BotaniaAPI.instance().hasSolegnoliaAround(entity); } catch (Exception e) { //ive never seen an exception here yet, just being safe diff --git a/src/main/java/com/lothrazar/cyclic/util/CharmUtil.java b/src/main/java/com/lothrazar/cyclic/util/CharmUtil.java index 1328cd34d7..089e209f39 100644 --- a/src/main/java/com/lothrazar/cyclic/util/CharmUtil.java +++ b/src/main/java/com/lothrazar/cyclic/util/CharmUtil.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.tuple.Triple; import top.theillusivec4.curios.api.CuriosApi; +@SuppressWarnings("deprecation") public class CharmUtil { public static ItemStack getIfEnabled(PlayerEntity player, Item match) {