Skip to content

Commit

Permalink
updated 1.16.5 masa mod dependency versions, fix `copySignTextToClipB…
Browse files Browse the repository at this point in the history
…oard` crash the game with latest 1.16.4/5 litematica

1.16.5 version should use 1.16.5 mods
fixed #71
  • Loading branch information
Fallen-Breath committed Aug 4, 2024
1 parent 52bbb1b commit 7ff7504
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import fi.dy.masa.litematica.config.Configs;
import fi.dy.masa.litematica.util.RayTraceUtils;
import fi.dy.masa.litematica.world.SchematicWorldHandler;
import me.fallenbreath.tweakermore.TweakerMoreMod;
import me.fallenbreath.tweakermore.util.FabricUtil;
import me.fallenbreath.tweakermore.util.ModIds;
import net.minecraft.client.MinecraftClient;
Expand Down Expand Up @@ -66,18 +67,24 @@ public static BlockPos getSchematicWorldCrosshairTargetPos(Entity cameraEntity)
MinecraftClient mc = MinecraftClient.getInstance();
if (mc.world != null)
{
return Optional.ofNullable(RayTraceUtils.getGenericTrace(
mc.world, cameraEntity, 10, true
//#if MC >= 11600
//$$ , Configs.InfoOverlays.INFO_OVERLAYS_TARGET_FLUIDS.getBooleanValue()
//#endif
//#if MC >= 11700
//$$ , false // includeVerifier
//#endif
))
.map(RayTraceUtils.RayTraceWrapper::getBlockHitResult)
.map(BlockHitResult::getBlockPos)
.orElse(null);
try
{
return Optional.ofNullable(RayTraceUtils.getGenericTrace(
mc.world, cameraEntity, 10, true
//#if MC >= 11600
//$$ , Configs.InfoOverlays.INFO_OVERLAYS_TARGET_FLUIDS.getBooleanValue()
//$$ , false // includeVerifier
//#endif
))
.map(RayTraceUtils.RayTraceWrapper::getBlockHitResult)
.map(BlockHitResult::getBlockPos)
.orElse(null);
}
catch (NoSuchMethodError e)
{
TweakerMoreMod.LOGGER.warn("LitematicaUtils.getSchematicWorldCrosshairTargetPos failed: {}", e.toString());
return null;
}
}
}
return null;
Expand Down
16 changes: 8 additions & 8 deletions versions/1.16.5/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
malilib_version = malilib-fabric-1.16.5:0.10.0-dev.21+arne.8

# https://legacy.curseforge.com/minecraft/mc-mods/tweakeroo/files
# tweakeroo-fabric-1.16.4-0.10.0-dev.20210303.123654.jar
tweakeroo_file_id = 3224921
# tweakeroo-fabric-1.16.5-0.10.0-dev.20210917.191839.jar
tweakeroo_file_id = 3542587

# https://legacy.curseforge.com/minecraft/mc-mods/item-scroller/files
# itemscroller-fabric-1.16.4-0.15.0-dev.20210111.205029.jar
itemscroller_file_id = 3168057
# itemscroller-fabric-1.16.5-0.15.0-dev.20210917.191808.jar
itemscroller_file_id = 3542545

# https://legacy.curseforge.com/minecraft/mc-mods/litematica/files
# litematica-fabric-1.16.4-0.0.0-dev.20210612.170003.jar
litematica_file_id = 3349118
# litematica-fabric-1.16.5-0.0.0-dev.20210917.192300.jar
litematica_file_id = 3542567

# https://legacy.curseforge.com/minecraft/mc-mods/minihud/files
# minihud-fabric-1.16.4-0.19.0-dev.20201103.184029.jar
minihud_file_id = 3101187
# minihud-fabric-1.16.5-0.19.0-dev.20210917.191825.jar
minihud_file_id = 3542572

# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
mod_menu_version = 1.16.22

0 comments on commit 7ff7504

Please sign in to comment.