Skip to content

Commit da7eb29

Browse files
cev-apicev-api
committed
1.21.11 Changes
2 parents 771d20a + 2412238 commit da7eb29

29 files changed

+421
-680
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Seedmapper 2.17.x (MC1.21.10)- Modified by CevAPI
1+
# Seedmapper 2.18.x (MC1.21.11)- Modified by CevAPI
22

33
Original Repo: https://github.com/xpple/SeedMapper/
44

‎build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ dependencies {
5656
include modImplementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
5757
include modImplementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
5858

59-
modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
60-
exclude group: 'net.fabricmc', module: 'fabric-loader'
61-
}
62-
productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
63-
exclude group: 'net.fabricmc', module: 'fabric-loader'
64-
}
59+
// modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
60+
// exclude group: 'net.fabricmc', module: 'fabric-loader'
61+
// }
62+
// productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
63+
// exclude group: 'net.fabricmc', module: 'fabric-loader'
64+
// }
6565

6666
testImplementation platform("org.junit:junit-bom:${project.junit_version}")
6767
testImplementation 'org.junit.jupiter:junit-jupiter'

‎gradle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ org.gradle.jvmargs=-Xmx1G
33
org.gradle.parallel=true
44

55
# Mod Properties
6-
mod_version=CevAPI-2.17.0
6+
mod_version=2.18.0-CevAPI
77
maven_group=dev.xpple
88
archives_base_name=SeedMapper
99

1010
# Minecraft properties
11-
minecraft_version=1.21.10
12-
minecraft_version_dependency=>=1.21.10 <1.22
11+
minecraft_version=1.21.11
12+
minecraft_version_dependency=>=1.21.11 <1.22
1313

1414
# Fabric Properties
1515
# check these on https://fabricmc.net/develop
1616
# https://maven.parchmentmc.org/org/parchmentmc/data/
17-
fabric_api_version=0.138.3+1.21.10
17+
fabric_api_version=0.139.4+1.21.11
1818
parchment_mappings=parchment-1.21.9:2025.10.05@zip
19-
fabric_loader_version=0.17.3
20-
fabric_loom_version=1.13-SNAPSHOT
19+
fabric_loader_version=0.18.2
20+
fabric_loom_version=1.14-SNAPSHOT
2121

2222
# Library dependencies
2323
betterconfig_version=2.5.0
24-
clientarguments_version=1.11.5
25-
simplewaypoints_version=1.1.0
24+
clientarguments_version=1.11.6
25+
simplewaypoints_version=1.2.0
2626

2727
devauth_version=1.2.1
2828

‎includes.txt‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
--include-constant MC_1_21_5
123123
--include-constant MC_1_21_6
124124
--include-constant MC_1_21_9
125+
--include-constant MC_1_21_11
125126
--include-constant MC_1_21_WD
126127
--include-constant MC_1_2_5
127128
--include-constant MC_1_3
@@ -705,6 +706,7 @@
705706
--include-constant ITEM_COOKED_PORKCHOP
706707
--include-constant ITEM_COOKED_SALMON
707708
--include-constant ITEM_COPPER_HORSE_ARMOR
709+
--include-constant ITEM_COPPER_NAUTILUS_ARMOR
708710
--include-constant ITEM_CROSSBOW
709711
--include-constant ITEM_CRYING_OBSIDIAN
710712
--include-constant ITEM_DARK_OAK_LOG
@@ -714,8 +716,10 @@
714716
--include-constant ITEM_DIAMOND_HELMET
715717
--include-constant ITEM_DIAMOND_HORSE_ARMOR
716718
--include-constant ITEM_DIAMOND_LEGGINGS
719+
--include-constant ITEM_DIAMOND_NAUTILUS_ARMOR
717720
--include-constant ITEM_DIAMOND_PICKAXE
718721
--include-constant ITEM_DIAMOND_SHOVEL
722+
--include-constant ITEM_DIAMOND_SPEAR
719723
--include-constant ITEM_DIAMOND_SWORD
720724
--include-constant ITEM_DUNE_ARMOR_TRIM_SMITHING_TEMPLATE
721725
--include-constant ITEM_EMERALD
@@ -737,6 +741,7 @@
737741
--include-constant ITEM_GOLDEN_HOE
738742
--include-constant ITEM_GOLDEN_HORSE_ARMOR
739743
--include-constant ITEM_GOLDEN_LEGGINGS
744+
--include-constant ITEM_GOLDEN_NAUTILUS_ARMOR
740745
--include-constant ITEM_GOLDEN_PICKAXE
741746
--include-constant ITEM_GOLDEN_SHOVEL
742747
--include-constant ITEM_GOLDEN_SWORD
@@ -753,9 +758,11 @@
753758
--include-constant ITEM_IRON_HORSE_ARMOR
754759
--include-constant ITEM_IRON_INGOT
755760
--include-constant ITEM_IRON_LEGGINGS
761+
--include-constant ITEM_IRON_NAUTILUS_ARMOR
756762
--include-constant ITEM_IRON_NUGGET
757763
--include-constant ITEM_IRON_PICKAXE
758764
--include-constant ITEM_IRON_SHOVEL
765+
--include-constant ITEM_IRON_SPEAR
759766
--include-constant ITEM_IRON_SWORD
760767
--include-constant ITEM_LAPIS_LAZULI
761768
--include-constant ITEM_LEATHER
@@ -797,6 +804,7 @@
797804
--include-constant ITEM_UNKNOWN
798805
--include-constant ITEM_WHEAT
799806
--include-constant ITEM_WILD_ARMOR_TRIM_SMITHING_TEMPLATE
807+
--include-constant NUM_ITEMS
800808

801809
--include-struct EnchantInstance
802810
--include-struct ItemStack
@@ -873,15 +881,21 @@
873881
--include-constant UNBREAKING
874882
--include-constant WIND_BURST
875883

876-
--include-function free_loot_table_pools
884+
--include-function init_bastion_bridge
885+
--include-function init_bastion_other
877886
--include-function init_buried_treasure
878887
--include-function init_desert_pyramid
879888
--include-function init_end_city_treasure
880889
--include-function init_igloo_chest
890+
--include-function init_jungle_temple
891+
--include-function init_jungle_temple_dispenser
881892
--include-function init_loot_table_name
882893
--include-function init_nether_bridge
883894
--include-function init_pillager_outpost
884895
--include-function init_ruined_portal
896+
--include-function init_shipwreck_map
897+
--include-function init_shipwreck_supply
898+
--include-function init_shipwreck_treasure
885899

886900
--include-struct LootPool
887901
--include-struct LootTableContext

‎src/main/c/cubiomes‎

Submodule cubiomes updated 148 files

‎src/main/java/dev/xpple/seedmapper/SeedMapper.java‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import dev.xpple.seedmapper.config.Configs;
2222
import dev.xpple.seedmapper.config.MapFeatureAdapter;
2323
import dev.xpple.seedmapper.config.SeedResolutionAdapter;
24-
2524
import dev.xpple.seedmapper.render.RenderManager;
2625
import dev.xpple.seedmapper.seedmap.MapFeature;
2726
import dev.xpple.seedmapper.seedmap.SeedMapMinimapManager;
27+
import dev.xpple.seedmapper.util.CubiomesNative;
2828
import dev.xpple.seedmapper.util.SeedDatabaseHelper;
2929
import dev.xpple.seedmapper.world.WorldPresetManager;
3030
import dev.xpple.simplewaypoints.api.SimpleWaypointsAPI;
@@ -34,37 +34,22 @@
3434
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
3535
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
3636
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
37-
import net.fabricmc.loader.api.FabricLoader;
38-
import net.fabricmc.loader.api.ModContainer;
3937
import net.minecraft.client.KeyMapping;
4038
import net.minecraft.commands.CommandBuildContext;
39+
import net.fabricmc.loader.api.FabricLoader;
4140

42-
import java.io.IOException;
43-
import java.nio.file.Files;
4441
import java.nio.file.Path;
45-
import java.nio.file.StandardCopyOption;
4642

4743
public class SeedMapper implements ClientModInitializer {
4844

4945
public static final String MOD_ID = "seedmapper";
5046

5147
public static final Path modConfigPath = FabricLoader.getInstance().getConfigDir().resolve(MOD_ID);
5248

53-
static {
54-
String libraryName = System.mapLibraryName("cubiomes");
55-
ModContainer modContainer = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow();
56-
Path tempFile;
57-
try {
58-
tempFile = Files.createTempFile(libraryName, "");
59-
Files.copy(modContainer.findPath(libraryName).orElseThrow(), tempFile, StandardCopyOption.REPLACE_EXISTING);
60-
} catch (IOException e) {
61-
throw new RuntimeException(e);
62-
}
63-
System.load(tempFile.toAbsolutePath().toString());
64-
}
65-
6649
@Override
6750
public void onInitializeClient() {
51+
CubiomesNative.ensureLoaded();
52+
6853
new ModConfigBuilder<>(MOD_ID, Configs.class)
6954
.registerType(SeedResolutionArgument.SeedResolution.class, new SeedResolutionAdapter(), SeedResolutionArgument::seedResolution)
7055
.registerTypeHierarchy(MapFeature.class, new MapFeatureAdapter(), MapFeatureArgument::mapFeature)
@@ -117,7 +102,6 @@ private static void registerCommands(CommandDispatcher<FabricClientCommandSource
117102
DiscordCommand.register(dispatcher);
118103
SampleCommand.register(dispatcher);
119104
WorldPresetCommand.register(dispatcher);
120-
// Export loot command
121105
dev.xpple.seedmapper.command.commands.ExportLootCommand.register(dispatcher);
122106
}
123107
}

‎src/main/java/dev/xpple/seedmapper/command/CustomClientCommandSource.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
import net.minecraft.client.multiplayer.ClientSuggestionProvider;
1919
import net.minecraft.client.player.LocalPlayer;
2020
import net.minecraft.network.chat.Component;
21+
import net.minecraft.server.permissions.PermissionSet;
2122
import net.minecraft.world.entity.Entity;
2223
import net.minecraft.world.phys.Vec2;
2324
import net.minecraft.world.phys.Vec3;
25+
import org.jspecify.annotations.Nullable;
2426

2527
import java.util.HashMap;
2628
import java.util.Map;
@@ -36,8 +38,8 @@ public class CustomClientCommandSource extends ClientSuggestionProvider implemen
3638
private final ClientLevel world;
3739
private final Map<String, Object> meta;
3840

39-
public CustomClientCommandSource(ClientPacketListener listener, Minecraft minecraft, Entity entity, Vec3 position, Vec2 rotation, ClientLevel world, Map<String, Object> meta) {
40-
super(listener, minecraft, true);
41+
public CustomClientCommandSource(ClientPacketListener listener, Minecraft minecraft, Entity entity, Vec3 position, Vec2 rotation, ClientLevel world, PermissionSet permissionSet, Map<String, Object> meta) {
42+
super(listener, minecraft, permissionSet);
4143

4244
this.client = minecraft;
4345
this.entity = entity;
@@ -51,7 +53,7 @@ public static CustomClientCommandSource of(FabricClientCommandSource source) {
5153
if (source instanceof CustomClientCommandSource custom) {
5254
return custom;
5355
}
54-
return new CustomClientCommandSource(source.getClient().getConnection(), source.getClient(), source.getEntity(), source.getPosition(), source.getRotation(), source.getWorld(), new HashMap<>());
56+
return new CustomClientCommandSource(source.getClient().getConnection(), source.getClient(), source.getEntity(), source.getPosition(), source.getRotation(), source.getWorld(), source.permissions(), new HashMap<>());
5557
}
5658

5759
@Override
@@ -96,24 +98,24 @@ public ClientLevel getWorld() {
9698
}
9799

98100
@Override
99-
public Object getMeta(String key) {
101+
public @Nullable Object getMeta(String key) {
100102
return this.meta.get(key);
101103
}
102104

103105
public CustomClientCommandSource withEntity(Entity entity) {
104-
return new CustomClientCommandSource(this.client.getConnection(), this.client, entity, this.position, this.rotation, this.world, this.meta);
106+
return new CustomClientCommandSource(this.client.getConnection(), this.client, entity, this.position, this.rotation, this.world, this.permissions(), this.meta);
105107
}
106108

107109
public CustomClientCommandSource withPosition(Vec3 position) {
108-
return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, position, this.rotation, this.world, this.meta);
110+
return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, position, this.rotation, this.world, this.permissions(), this.meta);
109111
}
110112

111113
public CustomClientCommandSource withRotation(Vec2 rotation) {
112-
return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, rotation, this.world, this.meta);
114+
return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, rotation, this.world, this.permissions(), this.meta);
113115
}
114116

115117
public CustomClientCommandSource withWorld(ClientLevel world) {
116-
return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, this.rotation, world, this.meta);
118+
return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, this.rotation, world, this.permissions(), this.meta);
117119
}
118120

119121
public CustomClientCommandSource withMeta(String key, Object value) {
@@ -148,7 +150,7 @@ public int getDimension() throws CommandSyntaxException {
148150
if (dimensionMeta != null) {
149151
return (int) dimensionMeta;
150152
}
151-
return DimensionArgument.dimension().parse(new StringReader(this.getWorld().dimension().location().getPath()));
153+
return DimensionArgument.dimension().parse(new StringReader(this.getWorld().dimension().identifier().getPath()));
152154
}
153155

154156
public int getVersion() throws CommandSyntaxException {

0 commit comments

Comments
 (0)