Skip to content

Commit

Permalink
port to 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@19MisterX98
19MisterX98 committed Sep 28, 2023
1 parent 7b556ed commit e0e4a6d
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 deletions.
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

| Minecraft Version | SeedCrackerX version | Dependencies |
|-------------------|------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 1.20.x | [2.14.4](https://github.com/19MisterX98/SeedcrackerX/releases/download/prerelease/seedcrackerX-2.14.4.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.20.2+ | [2.14.5](https://github.com/19MisterX98/SeedcrackerX/releases/download/prerelease/seedcrackerX-2.14.5.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.20-1.20.1 | [2.14.4](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.14.4/seedcrackerX-2.14.4.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.19.4 | [2.14.2](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.14.2/seedcrackerX-2.14.2.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.19.3 | [2.13.1](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.13.1/seedcrackerX-2.13.1.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.19-1.19.2 | [2.13](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.13/seedcrackerX-2.13.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
Expand Down
3 changes: 2 additions & 1 deletion READMEru.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

| Версия Minecraft | Версия SeedCrackerX | Необходимые дополнения |
|------------------|------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 1.20 | [2.14.4](https://github.com/19MisterX98/SeedcrackerX/releases/download/prerelease/seedcrackerX-2.14.4.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.20.2+ | [2.14.5](https://github.com/19MisterX98/SeedcrackerX/releases/download/prerelease/seedcrackerX-2.14.5.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.20-1.20.1 | [2.14.4](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.14.4/seedcrackerX-2.14.4.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.19.4 | [2.14.2](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.14.2/seedcrackerX-2.14.2.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.19.3 | [2.13.1](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.13.1/seedcrackerX-2.13.1.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
| 1.19-1.19.2 | [2.13](https://github.com/19MisterX98/SeedcrackerX/releases/download/2.13/seedcrackerX-2.13.jar) | [Fabric mod loader 0.14.0+](https://fabricmc.net/use/) |
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dependencies {

implementation('com.seedfinding:mc_math:ffd2edcfcc0d18147549c88cc7d8ec6cf21b5b91') { transitive = false }
implementation('com.seedfinding:mc_seed:1ead6fcefe7e8de4b3d60cd6c4e993f1e8f33409') { transitive = false }
implementation('com.seedfinding:mc_core:d64d5f90be66300da41ef58f4f1736db2499784f') { transitive = false }
implementation('com.seedfinding:mc_core:144493514fc9bfb735ce21838e48426625f29e43') { transitive = false }
implementation('com.seedfinding:mc_noise:7e3ba65e181796c4a2a1c8881d840b2254b92962') { transitive = false }
implementation('com.seedfinding:mc_biome:41a42cb9019a552598f12089059538853e18ec78') { transitive = false }
implementation('com.seedfinding:mc_terrain:b4246cbd5880c4f8745ccb90e1b102bde3448126') { transitive = false }
Expand All @@ -67,7 +67,7 @@ dependencies {

include('com.seedfinding:mc_math:ffd2edcfcc0d18147549c88cc7d8ec6cf21b5b91') { transitive = false }
include('com.seedfinding:mc_seed:1ead6fcefe7e8de4b3d60cd6c4e993f1e8f33409') { transitive = false }
include('com.seedfinding:mc_core:d64d5f90be66300da41ef58f4f1736db2499784f') { transitive = false }
include('com.seedfinding:mc_core:144493514fc9bfb735ce21838e48426625f29e43') { transitive = false }
include('com.seedfinding:mc_noise:7e3ba65e181796c4a2a1c8881d840b2254b92962') { transitive = false }
include('com.seedfinding:mc_biome:41a42cb9019a552598f12089059538853e18ec78') { transitive = false }
include('com.seedfinding:mc_terrain:b4246cbd5880c4f8745ccb90e1b102bde3448126') { transitive = false }
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx2G
# Fabric Properties
# check these on https://fabricmc.net/use

minecraft_version=1.20
yarn_mappings=1.20+build.1
loader_version=0.14.21
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.1
loader_version=0.14.22

# Mod Properties
mod_version = 2.14.4
mod_version = 2.14.5
maven_group = kaptainwutax
archives_base_name = seedcrackerX

# Dependencies
fabric_version=0.83.0+1.20
fabric_api_base=0.4.29+b04edc7a27
command_api_version=2.2.11+b3afc78b27
resource_loader_version=0.11.7+f7923f6d27
modmenu_version=7.0.0
cloth_config_version=11.0.98
fabric_version=0.89.2+1.20.2
fabric_api_base=0.4.32+fce67b32a0
command_api_version=2.2.14+86b12645a0
resource_loader_version=0.11.10+86b12645a0
modmenu_version=8.0.0
cloth_config_version=12.0.109
4 changes: 2 additions & 2 deletions src/main/java/kaptainwutax/seedcrackerX/finder/structure/JunglePyramidFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import kaptainwutax.seedcrackerX.render.Color;
import kaptainwutax.seedcrackerX.util.BiomeFixer;
import net.minecraft.block.*;
import net.minecraft.block.enums.WallMountLocation;
import net.minecraft.block.enums.BlockFace;
import net.minecraft.block.enums.WireConnection;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
Expand Down Expand Up @@ -121,7 +121,7 @@ public void buildStructure(PieceFinder finder) {
finder.addBlock(Blocks.CHISELED_STONE_BRICKS.getDefaultState(), 8, -2, 11);
finder.addBlock(Blocks.CHISELED_STONE_BRICKS.getDefaultState(), 9, -2, 11);
finder.addBlock(Blocks.CHISELED_STONE_BRICKS.getDefaultState(), 10, -2, 11);
BlockState blockState_6 = (Blocks.LEVER.getDefaultState().with(LeverBlock.FACING, Direction.NORTH)).with(LeverBlock.FACE, WallMountLocation.WALL);
BlockState blockState_6 = (Blocks.LEVER.getDefaultState().with(LeverBlock.FACING, Direction.NORTH)).with(LeverBlock.FACE, BlockFace.WALL);
finder.addBlock(blockState_6, 8, -2, 12);
finder.addBlock(blockState_6, 9, -2, 12);
finder.addBlock(blockState_6, 10, -2, 12);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/kaptainwutax/seedcrackerX/mixin/ClientPlayNetworkHandlerMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ public abstract class ClientPlayNetworkHandlerMixin {

@Inject(method = "onChunkData", at = @At(value = "TAIL"))
private void onChunkData(ChunkDataS2CPacket packet, CallbackInfo ci) {
int chunkX = packet.getX();
int chunkZ = packet.getZ();
int chunkX = packet.getChunkX();
int chunkZ = packet.getChunkZ();
FinderQueue.get().onChunkData(this.world, new ChunkPos(chunkX, chunkZ));
}

@Inject(method = "onGameJoin", at = @At(value = "TAIL"))
public void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {
newDimension(new HashedSeedData(packet.sha256Seed()), false);
newDimension(new HashedSeedData(packet.commonPlayerSpawnInfo().seed()), false);
var preloaded = StructureSave.loadStructures();
if (!preloaded.isEmpty()) {
Log.warn("foundRestorableStructures", preloaded.size());
Expand All @@ -50,7 +50,7 @@ public void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {

@Inject(method = "onPlayerRespawn", at = @At(value = "TAIL"))
public void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {
newDimension(new HashedSeedData(packet.getSha256Seed()), true);
newDimension(new HashedSeedData(packet.commonPlayerSpawnInfo().seed()), true);
}

public void newDimension(HashedSeedData hashedSeedData, boolean dimensionChange) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kaptainwutax/seedcrackerX/util/Database.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class Database {
public static Text joinFakeServerForAuth() {
try {
MinecraftClient client = MinecraftClient.getInstance();
client.getSessionService().joinServer(client.getSession().getProfile(), client.getSession().getAccessToken(), "seedcrackerx");
client.getSessionService().joinServer(client.getSession().getUuidOrNull(), client.getSession().getAccessToken(), "seedcrackerx");
}
catch (AuthenticationUnavailableException authenticationUnavailableException) {
return Text.translatable("disconnect.loginFailedInfo", Text.translatable("disconnect.loginFailedInfo.serversUnavailable"));
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"depends": {
"fabricloader": ">=0.14.0",
"minecraft": ">=1.20"
"minecraft": ">=1.20.2"
},
"suggests": {
"flamingo": "*"
Expand Down

1 comment on commit e0e4a6d

@PokeDom
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't find the download button on my browser. Can you comment a direct .jar download link?

Please sign in to comment.