diff --git a/dependencies.gradle b/dependencies.gradle index e1e34f9e8..b3a894f63 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,7 +49,7 @@ configurations { } dependencies { - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.31") + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.71") compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:0.4.0") { transitive = false } @@ -61,7 +61,7 @@ dependencies { // Iris Shaders compileOnly('org.jetbrains:annotations:24.0.1') - api("com.github.GTNewHorizons:GTNHLib:0.4.2:dev") + api("com.github.GTNewHorizons:GTNHLib:0.5.12:dev") shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0 implementation("io.github.douira:glsl-transformer:1.0.0") shadowImplementation("io.github.douira:glsl-transformer:1.0.0") { // glsl-transformer Noncommercial License 1.0.0 @@ -70,23 +70,20 @@ dependencies { compileOnly "org.apache.ant:ant:1.8.2" // Because who doesn't want NEI - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.9-GTNH:dev') - devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.2.0:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.39-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.3.7:dev') // Notfine Deps compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") devOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.4:dev") - compileOnly("com.github.GTNewHorizons:twilightforest:2.5.16:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.6.34:dev") { transitive = false } compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410')) - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.0-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Natura:2.6.1:dev") + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.10-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Natura:2.7.3:dev") - compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.1:dev") + compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.3:dev") - compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.0:dev") { transitive = false } - compileOnly(rfg.deobf('maven.modrinth:backhand:1.4.1')) { transitive = false } - - compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.1:dev") { transitive = false } compileOnly(rfg.deobf('maven.modrinth:backhand:1.4.1')) { transitive = false } compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.1:api") { transitive = false } @@ -97,7 +94,7 @@ dependencies { compileOnly("curse.maven:minefactory-reloaded-66672:2277486") - compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.0.3:dev") // Mixin Version + compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev") // Mixin Version compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675")) @@ -105,7 +102,7 @@ dependencies { compileOnly(rfg.deobf("curse.maven:journeymap-32274:2367915")) compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:5060684")) - compileOnly("com.github.GTNewHorizons:HoloInventory:2.4.4-GTNH:dev") + compileOnly("com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev") runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2")) diff --git a/gradle.properties b/gradle.properties index 6d58c1eda..e5b012671 100644 --- a/gradle.properties +++ b/gradle.properties @@ -122,9 +122,15 @@ minimizeShadowedDependencies = true # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = true -# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. +# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..09523c0e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 30468bce7..601e86bce 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,5 +16,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27' } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 4932eedad..db0e352de 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -131,11 +131,6 @@ public enum Mixins { ) ), - // Required for Sodium's FluidRenderer, so it treats vanilla liquids as IFluidBlocks - SODIUM_WISHLIST(new Builder("Sodiumer").addTargetedMod(TargetedMod.VANILLA).setSide(Side.BOTH) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodiumFluidRendering).addMixinClasses( - "sodium.MixinBlockLiquid")), - IRIS_RENDERING(new Builder("Iris Shaders").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses( "shaders.MixinEntityRenderer" diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java index 29faa2721..3e34f2bc9 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java @@ -1,6 +1,7 @@ package me.jellysquid.mods.sodium.client.render.chunk.tasks; import com.gtnewhorizon.gtnhlib.blockpos.BlockPos; +import com.gtnewhorizon.gtnhlib.client.renderer.util.WorldUtil; import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionDataBuilder; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache; @@ -32,7 +33,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.IFluidBlock; import org.joml.Vector3d; import java.util.concurrent.CompletableFuture; @@ -153,7 +153,7 @@ public class ChunkRenderRebuildTask extends ChunkR if (rendersOffThread(block)) { // Do regular block rendering for (BlockRenderPass pass : BlockRenderPass.VALUES) { - if (block.canRenderInPass(pass.ordinal()) && (!AngelicaConfig.enableSodiumFluidRendering || !(block instanceof IFluidBlock))) { + if (block.canRenderInPass(pass.ordinal()) && !shouldUseSodiumFluidRendering(block)) { ChunkRenderManager.setWorldRenderPass(pass); final long seed = MathUtil.hashPos(pos.x, pos.y, pos.z); if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE); @@ -169,7 +169,7 @@ public class ChunkRenderRebuildTask extends ChunkR } // Do fluid rendering without RenderBlocks - if (AngelicaConfig.enableSodiumFluidRendering && block instanceof IFluidBlock) { + if (shouldUseSodiumFluidRendering(block)) { for (BlockRenderPass pass : BlockRenderPass.VALUES) { if (block.canRenderInPass(pass.ordinal())) { ChunkRenderManager.setWorldRenderPass(pass); @@ -273,7 +273,7 @@ public class ChunkRenderRebuildTask extends ChunkR // Do regular block rendering for (BlockRenderPass pass : BlockRenderPass.VALUES) { - if (block.canRenderInPass(pass.ordinal()) && (!AngelicaConfig.enableSodiumFluidRendering || !(block instanceof IFluidBlock))) { + if (block.canRenderInPass(pass.ordinal()) && !shouldUseSodiumFluidRendering(block)) { ChunkRenderManager.setWorldRenderPass(pass); final long seed = MathUtil.hashPos(pos.x, pos.y, pos.z); if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE); @@ -306,4 +306,8 @@ public class ChunkRenderRebuildTask extends ChunkR + translucencySorting + '}'; } + + private static boolean shouldUseSodiumFluidRendering(Block block) { + return AngelicaConfig.enableSodiumFluidRendering && WorldUtil.isFluidBlock(block); + } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/FluidRenderer.java b/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/FluidRenderer.java index 2c41ba169..5b8a841cd 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/FluidRenderer.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/FluidRenderer.java @@ -27,7 +27,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.IFluidBlock; import org.joml.Vector3d; import java.util.Arrays; @@ -96,7 +95,8 @@ public class FluidRenderer { int posY = pos.y; int posZ = pos.z; - Fluid fluid = ((IFluidBlock) block).getFluid(); + + Fluid fluid = WorldUtil.getFluid(block); if (fluid == null) return false; // Check for occluded sides; if everything is occluded, don't render @@ -437,7 +437,7 @@ public class FluidRenderer { Block block = world.getBlock(x2, y + 1, z2); - if (block instanceof IFluidBlock && ((IFluidBlock) block).getFluid() == fluid) { + if (WorldUtil.getFluid(block) == fluid) { return 1.0F; } @@ -445,7 +445,7 @@ public class FluidRenderer { block = world.getBlock(pos.x, pos.y, pos.z); int meta = world.getBlockMetadata(pos.x, pos.y, pos.z); - Fluid fluid2 = block instanceof IFluidBlock ? ((IFluidBlock) world.getBlock(pos.x, pos.y, pos.z)).getFluid() : null; + Fluid fluid2 = WorldUtil.getFluid(block); if (fluid2 == fluid) { float height = WorldUtil.getFluidHeight(fluid2, meta); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBlockLiquid.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBlockLiquid.java deleted file mode 100644 index c7baa4eac..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBlockLiquid.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.sodium; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockLiquid; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.IFluidBlock; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(BlockLiquid.class) -public abstract class MixinBlockLiquid implements IFluidBlock { - - @Shadow - public abstract int getBlockColor(); - - @Override - public Fluid getFluid() { - return ((Block) (Object) this).getMaterial() == Material.water ? FluidRegistry.WATER : FluidRegistry.LAVA; - } - - @Override - public float getFilledPercentage(World world, int x, int y, int z) { - return getFluid() == null ? 0 : 1 - BlockLiquid.getLiquidHeightPercent(world.getBlockMetadata(x, y, z)); - } -}