diff --git a/README.md b/README.md index b002136..837faea 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,18 @@ -#Blood Arsenal [![](http://cf.way2muchnoise.eu/full_blood-arsenal_downloads.svg)](https://minecraft.curseforge.com/projects/blood-arsenal) +# Blood Arsenal Creative Commons Licence
Blood Arsenal by Arcaratus is licensed under a Creative Commons Attribution 4.0 International License. +## Dependencies +These mods are required: +* [Blood Magic](https://github.com/GTNewHorizons/BloodMagic) +* [Baubles](https://github.com/GTNewHorizons/Baubles-Expanded/) +* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib) + +Extra content is available with these mods: +* [Thaumcraft 4](http://www.minecraftforum.net/topic/2011841-) and [Forbidden Magic](https://github.com/GTNewHorizons/ForbiddenMagic/): New more powerful blood wand cores and caps +* [Tinkers' Construct](https://github.com/GTNewHorizons/TinkersConstruct/): New tool materials +* [GuideAPI](https://github.com/GTNewHorizons/Guide-API): The Blood Burned Tome, a guidebook explaining the mod's mechanics + ## Fork This mod was forked by the GT:NH Team to continue the development of the 1.7.10 Branch. diff --git a/dependencies.gradle b/dependencies.gradle index 2225db7..335fd4f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,16 +1,15 @@ // Add your dependencies here dependencies { - api 'com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev' - api 'com.github.GTNewHorizons:Mantle:0.5.1:dev' - api 'com.github.GTNewHorizons:BloodMagic:1.8.14:dev' - compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.34-GTNH:dev') - compileOnly('com.github.GTNewHorizons:AppleCore:3.3.9:dev') - compileOnlyApi 'com.github.GTNewHorizons:Guide-API:1.1.1:dev' - compileOnlyApi 'com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev' - compileOnlyApi 'com.github.GTNewHorizons:waila:1.19.22:api' + api("com.github.GTNewHorizons:Baubles-Expanded:2.2.14-GTNH:dev") + api("com.github.GTNewHorizons:BloodMagic:1.9.0:dev") + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.68-GTNH:dev") + compileOnly("com.github.GTNewHorizons:AppleCore:3.3.10:dev") + compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") + compileOnlyApi("com.github.GTNewHorizons:Guide-API:1.1.1:dev") - devOnlyNonPublishable 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev' - - runtimeOnlyNonPublishable 'com.github.GTNewHorizons:NotEnoughItems:2.8.74-GTNH:dev' + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.97-GTNH:dev") +// runtimeOnlyNonPublishable("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") +// runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForbiddenMagic:0.9.15-GTNH:dev") +// runtimeOnlyNonPublishable("com.github.GTNewHorizons:AspectRecipeIndex:1.0.16:dev") } diff --git a/gradle.properties b/gradle.properties index 7085833..03c3e02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ developmentEnvironmentUserName = Developer # - jabel: Jabel syntax-only support, compiles to J8 bytecode # - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs) # - modern: Native modern Java bytecode, no downgrading -enableModernJavaSyntax = jabel +enableModernJavaSyntax = jvmDowngrader # If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues, # and should *not* be used in most situations. -1 disables this. @@ -65,7 +65,7 @@ enableModernJavaSyntax = jabel # - external: Another dependency provides stubs (no constraint, no warning) # - (empty): Warning reminding you to configure stubs # Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md -# jvmDowngraderStubsProvider = +jvmDowngraderStubsProvider = gtnhlib # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 07062f1..fa4ed51 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/repositories.gradle b/repositories.gradle index e69de29..ddad94b 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -0,0 +1,3 @@ +repositories { + mavenLocal() +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 035355d..407aea2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.23' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java index 9c86955..d12c2cd 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java @@ -120,7 +120,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p float multiplier = 1; for (RitualComponent ritualComponent : ritualList) { - switch (ritualComponent.getStoneType()) { + switch (ritualComponent.stoneType()) { case 1, 2, 3, 4 -> multiplier *= 1.05F; case 5, 6 -> multiplier *= 1.075F; } @@ -224,14 +224,14 @@ private void compactRitual(TileEntity tileEntity) { for (RitualComponent ritualComponent : ritualList) { world.setBlockToAir( - x + ritualComponent.getX(direction), - y + ritualComponent.getY(), - z + ritualComponent.getZ(direction)); + x + ritualComponent.x(direction), + y + ritualComponent.y(), + z + ritualComponent.z(direction)); world.setBlockToAir(x, y, z); world.markBlockForUpdate( - x + ritualComponent.getX(direction), - y + ritualComponent.getY(), - z + ritualComponent.getZ(direction)); + x + ritualComponent.x(direction), + y + ritualComponent.y(), + z + ritualComponent.z(direction)); } world.setBlock(x, y, z, ModBlocks.compacted_mrs); @@ -316,11 +316,8 @@ private void compactAltar(TileEntity tileEntity) { if (altarComponents != null && !world.isRemote) { for (AltarComponent altarComponent : altarComponents) { - world.setBlockToAir(x + altarComponent.getX(), y + altarComponent.getY(), z + altarComponent.getZ()); - world.markBlockForUpdate( - x + altarComponent.getX(), - y + altarComponent.getY(), - z + altarComponent.getZ()); + world.setBlockToAir(x + altarComponent.x(), y + altarComponent.y(), z + altarComponent.z()); + world.markBlockForUpdate(x + altarComponent.x(), y + altarComponent.y(), z + altarComponent.z()); } }