Skip to content

Commit 4382669

Browse files
committed
Updated to 1.16.2.
1 parent d2f685c commit 4382669

File tree

4 files changed

+23
-33
lines changed

4 files changed

+23
-33
lines changed

build.gradle

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ version = project.mod_version
1111
group = project.maven_group
1212

1313
repositories {
14-
mavenLocal()
15-
maven {
16-
url = "https://www.cursemaven.com"
17-
}
18-
maven {
19-
url "https://dl.bintray.com/ladysnake/libs"
20-
}
2114
maven {
2215
url "https://hephaestus.dev/release"
2316
}
@@ -31,17 +24,15 @@ dependencies {
3124
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
3225
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
3326

34-
modImplementation "io.github.onyxstudios:Cardinal-Components-API:${project.cardinal_version}"
35-
include "io.github.onyxstudios:Cardinal-Components-API:${project.cardinal_version}"
36-
37-
modImplementation "dev.hephaestus:FibLib:${project.fiblib_version}"
38-
include "dev.hephaestus:FibLib:${project.fiblib_version}"
39-
40-
modRuntime "curse.maven:phosphor:2987621"
41-
modRuntime "curse.maven:lithium:2996131"
27+
modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") {
28+
exclude group: "net.fabricmc.fabric-api"
29+
}
4230

31+
modImplementation ("dev.hephaestus:FibLib:${project.fiblib_version}") {
32+
exclude group: "me.jellysquid.mods"
33+
}
4334

44-
// modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
35+
include "dev.hephaestus:FibLib:${project.fiblib_version}"
4536
}
4637

4738
processResources {

gradle.properties

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
5-
minecraft_version=1.16.1
6-
yarn_mappings=1.16.1+build.20
7-
loader_version=0.8.9+build.203
5+
minecraft_version = 1.16.2
6+
yarn_mappings = 1.16.2+build.43
7+
loader_version = 0.9.2+build.206
88

99
# Mod Properties
10-
mod_version=0.0.1
11-
maven_group=dev.hephaestus
12-
archives_base_name=sax
10+
mod_version = 0.0.2
11+
maven_group = dev.hephaestus
12+
archives_base_name = sax
1313

1414
# Dependencies
15-
cardinal_version=2.4.1
16-
fabric_version=0.14.1+build.372-1.16
17-
fiblib_version=0.1.3-1.16.1
15+
fabric_version = fabric-api:0.19.0+build.398-1.16
16+
fiblib_version = 0.1.5-1.16.2
17+
mod_menu_version = 1.14.6+build.31

src/main/java/dev/hephaestus/sax/server/DeObfuscator.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dev.hephaestus.sax.server;
22

3-
import dev.hephaestus.sax.SAX;
43
import net.minecraft.block.BlockState;
54
import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
65
import net.minecraft.server.network.ServerPlayerEntity;
@@ -11,7 +10,7 @@
1110
import net.minecraft.util.math.Vec3i;
1211
import net.minecraft.util.shape.VoxelShape;
1312
import net.minecraft.world.BlockView;
14-
import net.minecraft.world.RayTraceContext;
13+
import net.minecraft.world.RaycastContext;
1514

1615
import java.util.HashSet;
1716
import java.util.function.Consumer;
@@ -74,10 +73,10 @@ private boolean traceForBlock(ServerPlayerEntity player, Vec3i target) {
7473
for (byte dY = 0; dY <= 1; ++dY) {
7574
for (byte dZ = 0; dZ <= 1; ++dZ) {
7675
Vec3d pos = new Vec3d(target.getX() + dX, target.getY() + dY, target.getZ() + dZ);
77-
RayTraceContext context = new RayTraceContext(
76+
RaycastContext context = new RaycastContext(
7877
player.getCameraPosVec(1F),
7978
pos,
80-
RayTraceContext.ShapeType.VISUAL, RayTraceContext.FluidHandling.NONE, player
79+
RaycastContext.ShapeType.VISUAL, RaycastContext.FluidHandling.NONE, player
8180
);
8281

8382
BlockHitResult hitResult = rayTrace(context);
@@ -92,14 +91,14 @@ private boolean traceForBlock(ServerPlayerEntity player, Vec3i target) {
9291
return false;
9392
}
9493

95-
private BlockHitResult rayTrace(RayTraceContext context) {
94+
private BlockHitResult rayTrace(RaycastContext context) {
9695
BlockView blockView = this.player.world;
97-
return BlockView.rayTrace(context, (rayTraceContext, blockPos) -> {
96+
return BlockView.raycast(context, (rayTraceContext, blockPos) -> {
9897
BlockState blockState = blockView.getBlockState(blockPos);
9998
Vec3d vec3d = rayTraceContext.getStart();
10099
Vec3d vec3d2 = rayTraceContext.getEnd();
101100
VoxelShape voxelShape = rayTraceContext.getBlockShape(blockState, blockView, blockPos);
102-
return blockView.rayTraceBlock(vec3d, vec3d2, blockPos, voxelShape, blockState);
101+
return blockView.raycastBlock(vec3d, vec3d2, blockPos, voxelShape, blockState);
103102
}, (rayTraceContext) -> {
104103
Vec3d vec3d = rayTraceContext.getStart().subtract(rayTraceContext.getEnd());
105104
return BlockHitResult.createMissed(rayTraceContext.getEnd(), Direction.getFacing(vec3d.x, vec3d.y, vec3d.z), new BlockPos(rayTraceContext.getEnd()));

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
"depends": {
2222
"fabricloader": ">=0.8.9+build.203",
2323
"fabric": "*",
24-
"minecraft": "1.16.1"
24+
"minecraft": "1.16.2"
2525
}
2626
}

0 commit comments

Comments
 (0)