Skip to content

Commit 95755c9

Browse files
MichaelHillcoxMichaelHillcox
committed
chore: well it compiles again 21.11
1 parent 3bafdd0 commit 95755c9

File tree

86 files changed

+414
-759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+414
-759
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
4-
id "me.modmuss50.mod-publish-plugin" version "0.5.1"
3+
id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
4+
id "me.modmuss50.mod-publish-plugin" version "1.1.0"
55
}
66

77
apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'

‎common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import dev.ftb.mods.ftbchunks.client.map.color.CustomBlockColor;
1010
import dev.ftb.mods.ftblibrary.icon.Color4I;
1111
import net.minecraft.resources.ResourceKey;
12-
import net.minecraft.resources.ResourceLocation;
12+
import net.minecraft.resources.Identifier;
1313
import net.minecraft.server.packs.resources.Resource;
1414
import net.minecraft.server.packs.resources.ResourceManager;
1515
import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424

2525
public class ColorMapLoader extends SimplePreparableReloadListener<JsonObject> {
26-
private static final Map<ResourceLocation, BlockColor> BLOCK_ID_TO_COLOR_MAP = new HashMap<>();
26+
private static final Map<Identifier, BlockColor> BLOCK_ID_TO_COLOR_MAP = new HashMap<>();
2727

2828
@Override
2929
protected JsonObject prepare(ResourceManager resourceManager, ProfilerFiller profiler) {
@@ -32,7 +32,7 @@ protected JsonObject prepare(ResourceManager resourceManager, ProfilerFiller pro
3232

3333
for (String namespace : resourceManager.getNamespaces()) {
3434
try {
35-
for (Resource resource : resourceManager.getResourceStack(ResourceLocation.fromNamespaceAndPath(namespace, "ftbchunks_block_colors.json"))) {
35+
for (Resource resource : resourceManager.getResourceStack(Identifier.fromNamespaceAndPath(namespace, "ftbchunks_block_colors.json"))) {
3636
try (Reader reader = new InputStreamReader(resource.open(), StandardCharsets.UTF_8)) {
3737
for (Map.Entry<String, JsonElement> entry : gson.fromJson(reader, JsonObject.class).entrySet()) {
3838
if (entry.getKey().startsWith("#")) {
@@ -58,7 +58,7 @@ protected void apply(JsonObject object, ResourceManager resourceManager, Profile
5858

5959
for (Map.Entry<ResourceKey<Block>, Block> entry : FTBChunks.BLOCK_REGISTRY.entrySet()) {
6060
Block block = entry.getValue();
61-
ResourceLocation id = entry.getKey().location();
61+
Identifier id = entry.getKey().identifier();
6262

6363
if (id != null) {
6464
if (block instanceof AirBlock
@@ -92,15 +92,15 @@ protected void apply(JsonObject object, ResourceManager resourceManager, Profile
9292
BlockColor col = BlockColors.getFromType(entry.getValue().getAsString());
9393

9494
if (col != null) {
95-
BLOCK_ID_TO_COLOR_MAP.put(ResourceLocation.tryParse(entry.getKey()), col);
95+
BLOCK_ID_TO_COLOR_MAP.put(Identifier.tryParse(entry.getKey()), col);
9696
}
9797
}
9898
}
9999

100100
// Fire event Post
101101
}
102102

103-
public static BlockColor getBlockColor(ResourceLocation id) {
103+
public static BlockColor getBlockColor(Identifier id) {
104104
return BLOCK_ID_TO_COLOR_MAP.getOrDefault(id, BlockColors.IGNORED);
105105
}
106106
}

‎common/src/main/java/dev/ftb/mods/ftbchunks/EntityTypeBoolMapValue.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
1111
import dev.ftb.mods.ftblibrary.ui.Widget;
1212
import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
13-
import net.minecraft.ResourceLocationException;
13+
import net.minecraft.IdentifierException;
1414
import net.minecraft.core.registries.BuiltInRegistries;
1515
import net.minecraft.core.registries.Registries;
1616
import net.minecraft.network.chat.Component;
1717
import net.minecraft.resources.ResourceKey;
18-
import net.minecraft.resources.ResourceLocation;
18+
import net.minecraft.resources.Identifier;
1919
import net.minecraft.world.entity.EntityType;
2020
import org.apache.commons.lang3.mutable.MutableInt;
2121
import org.jetbrains.annotations.Nullable;
@@ -39,7 +39,7 @@ public void write(SNBTCompoundTag tag) {
3939
SNBTCompoundTag mapTag = new SNBTCompoundTag();
4040

4141
for (Map.Entry<ResourceKey<EntityType<?>>, Boolean> entry : map.entrySet()) {
42-
mapTag.putBoolean(entry.getKey().location().toString(), entry.getValue());
42+
mapTag.putBoolean(entry.getKey().identifier().toString(), entry.getValue());
4343
}
4444

4545
tag.put(key, mapTag);
@@ -52,9 +52,9 @@ public void read(SNBTCompoundTag tag) {
5252
tag.getCompound(key).ifPresent(compound -> {
5353
for (String key : compound.keySet()) {
5454
try {
55-
ResourceLocation parse = ResourceLocation.parse(key);
55+
Identifier parse = Identifier.parse(key);
5656
compound.getBoolean(key).ifPresent(c -> map.put(ResourceKey.create(Registries.ENTITY_TYPE, parse), c));
57-
} catch (ResourceLocationException e) {
57+
} catch (IdentifierException e) {
5858
LOGGER.error("Failed to parse {} skipping", key, e);
5959
}
6060
}

‎common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
2727
import dev.ftb.mods.ftbteams.api.event.*;
2828
import net.minecraft.ChatFormatting;
29-
import net.minecraft.Util;
29+
import net.minecraft.util.Util;
3030
import net.minecraft.commands.CommandSourceStack;
3131
import net.minecraft.core.BlockPos;
3232
import net.minecraft.core.Direction;
@@ -168,7 +168,7 @@ private boolean isPvPProtectedChunk(PvPMode mode, Player player) {
168168
}
169169

170170
private void playerTickPost(Player player) {
171-
if (player.level().isClientSide && player.level().getGameTime() % 20 == 0) {
171+
if (player.level().isClientSide() && player.level().getGameTime() % 20 == 0) {
172172
FTBChunksClient.INSTANCE.maybeClearDeathpoint(player);
173173
}
174174
}
@@ -177,7 +177,7 @@ private void serverLevelLoad(ServerLevel level) {
177177
if (ClaimedChunkManagerImpl.getInstance() != null) {
178178
ClaimedChunkManagerImpl.getInstance().initForceLoadedChunks(level);
179179
} else {
180-
FTBChunks.LOGGER.warn("Level {} loaded before FTB Chunks manager was initialized! Unable to force-load chunks", level.dimension().location() );
180+
FTBChunks.LOGGER.warn("Level {} loaded before FTB Chunks manager was initialized! Unable to force-load chunks", level.dimension().identifier() );
181181
}
182182
}
183183

@@ -253,7 +253,7 @@ public void loggedOut(ServerPlayer player) {
253253
data.updateChunkTickets(false);
254254
}
255255
} else {
256-
FTBChunks.LOGGER.warn("on player disconnect: player '{}' has no team?", player.getGameProfile().getName());
256+
FTBChunks.LOGGER.warn("on player disconnect: player '{}' has no team?", player.getGameProfile().name());
257257
}
258258
}
259259

@@ -585,7 +585,7 @@ private void playerAllianceChange(TeamAllyEvent event) {
585585
ChunkTeamDataImpl teamData = ClaimedChunkManagerImpl.getInstance().getOrCreateData(event.getTeam());
586586
List<ServerPlayer> players = new ArrayList<>();
587587
event.getPlayers().forEach(profile -> {
588-
ServerPlayer p = ClaimedChunkManagerImpl.getInstance().getMinecraftServer().getPlayerList().getPlayer(profile.getId());
588+
ServerPlayer p = ClaimedChunkManagerImpl.getInstance().getMinecraftServer().getPlayerList().getPlayer(profile.id());
589589
if (p != null) {
590590
teamData.syncChunksToPlayer(p);
591591
players.add(p);

‎common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksCommands.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@
4242
import net.minecraft.core.GlobalPos;
4343
import net.minecraft.network.chat.Component;
4444
import net.minecraft.resources.ResourceKey;
45-
import net.minecraft.resources.ResourceLocation;
45+
import net.minecraft.resources.Identifier;
4646
import net.minecraft.server.dedicated.DedicatedServer;
4747
import net.minecraft.server.level.ChunkHolder;
4848
import net.minecraft.server.level.ColumnPos;
4949
import net.minecraft.server.level.ServerLevel;
5050
import net.minecraft.server.level.ServerPlayer;
51+
import net.minecraft.server.permissions.Permissions;
5152
import net.minecraft.util.Mth;
5253
import net.minecraft.world.level.Level;
5354
import net.minecraft.world.phys.Vec3;
@@ -96,7 +97,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
9697
)
9798
)
9899
.then(Commands.literal("admin")
99-
.requires(source -> source.hasPermission(Commands.LEVEL_GAMEMASTERS))
100+
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
100101
.then(Commands.literal("bypass_protection")
101102
.executes(context -> bypassProtection(context.getSource()))
102103
)
@@ -416,7 +417,7 @@ private static int info(CommandSourceStack source, ChunkDimPos pos) throws Comma
416417

417418
ClaimedChunk chunk = claimManager().getChunk(pos);
418419

419-
boolean canKnowChunkStatus = source.hasPermission(Commands.LEVEL_GAMEMASTERS) || (source.isPlayer() || (chunk != null && chunk.getTeamData().canPlayerUse(source.getPlayerOrException(), FTBChunksProperties.CLAIM_VISIBILITY)));
420+
boolean canKnowChunkStatus = source.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER) || (source.isPlayer() || (chunk != null && chunk.getTeamData().canPlayerUse(source.getPlayerOrException(), FTBChunksProperties.CLAIM_VISIBILITY)));
420421

421422
if (canKnowChunkStatus) {
422423
if (chunk == null) {
@@ -426,7 +427,7 @@ private static int info(CommandSourceStack source, ChunkDimPos pos) throws Comma
426427

427428
source.sendSuccess(() -> {
428429
Component owner = chunk.getTeamData().getTeam().getColoredName().copy().append(" / " + UndashedUuid.toString(chunk.getTeamData().getTeam().getId()));
429-
String location = pos.dimension().location().toString() + " [" + pos.x() + ", " + pos.z() + "]";
430+
String location = pos.dimension().identifier().toString() + " [" + pos.x() + ", " + pos.z() + "]";
430431
return Component.translatable("ftbchunks.commands.location", location)
431432
.append(Component.literal("\n"))
432433
.append(Component.translatable("ftbchunks.commands.owner").append(owner.getString()))
@@ -593,7 +594,7 @@ private static ColumnPos getAnchorArg(CommandContext<CommandSourceStack> context
593594
return ColumnPosArgument.getColumnPos(context, "anchor");
594595
}
595596

596-
private static RequiredArgumentBuilder<CommandSourceStack, ResourceLocation> dimArg() {
597+
private static RequiredArgumentBuilder<CommandSourceStack, Identifier> dimArg() {
597598
return Commands.argument("dimension", DimensionArgument.dimension());
598599
}
599600

@@ -603,7 +604,7 @@ private static ServerLevel getDimArg(CommandContext<CommandSourceStack> context)
603604

604605
private static RequiredArgumentBuilder<CommandSourceStack, TeamArgumentProvider> forTeam(ToIntBiFunction<CommandSourceStack, Team> callback) {
605606
return Commands.argument("team", TeamArgument.create())
606-
.requires(source -> source.hasPermission(Commands.LEVEL_GAMEMASTERS))
607+
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
607608
.executes(context -> callback.applyAsInt(context.getSource(), TeamArgument.get(context, "team")));
608609
}
609610

‎common/src/main/java/dev/ftb/mods/ftbchunks/LongRangePlayerTracker.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void tick(MinecraftServer server) {
6262
public void stopTracking(ServerPlayer player) {
6363
// called when a player logs out or changes dimension
6464

65-
if (player.getServer() == null) return;
65+
if (player.level().getServer() == null) return;
6666

6767
Map<UUID,UUID> toRemove = new HashMap<>();
6868
for (UUID trackingId : trackingMap.rowKeySet()) {
@@ -72,7 +72,7 @@ public void stopTracking(ServerPlayer player) {
7272
}
7373

7474
toRemove.forEach((trackingId, disconnectedId) -> {
75-
ServerPlayer trackingPlayer = player.getServer().getPlayerList().getPlayer(trackingId);
75+
ServerPlayer trackingPlayer = player.level().getServer().getPlayerList().getPlayer(trackingId);
7676
if (trackingPlayer != null) {
7777
NetworkManager.sendToPlayer(trackingPlayer, SendPlayerPositionPacket.stopTracking(player));
7878
}

‎common/src/main/java/dev/ftb/mods/ftbchunks/api/FTBChunksAPI.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import dev.ftb.mods.ftblibrary.math.ChunkDimPos;
55
import dev.ftb.mods.ftbteams.api.event.TeamManagerEvent;
66
import net.minecraft.resources.ResourceKey;
7-
import net.minecraft.resources.ResourceLocation;
7+
import net.minecraft.resources.Identifier;
88
import net.minecraft.server.level.ServerPlayer;
99
import net.minecraft.world.level.ChunkPos;
1010
import net.minecraft.world.level.Level;
@@ -48,8 +48,8 @@ public static FTBChunksClientAPI clientApi() {
4848
* @param path the resource location path component
4949
* @return a new resource location
5050
*/
51-
public static ResourceLocation rl(String path) {
52-
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
51+
public static Identifier id(String path) {
52+
return Identifier.fromNamespaceAndPath(MOD_ID, path);
5353
}
5454

5555
/**

‎common/src/main/java/dev/ftb/mods/ftbchunks/api/FTBChunksProperties.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import dev.ftb.mods.ftbchunks.FTBChunksWorldConfig;
44
import dev.ftb.mods.ftbteams.api.property.BooleanProperty;
5-
import dev.ftb.mods.ftbteams.api.property.PrivacyMode;
65
import dev.ftb.mods.ftbteams.api.property.PrivacyProperty;
76
import dev.ftb.mods.ftbteams.api.property.StringListProperty;
87

@@ -13,34 +12,34 @@
1312
*/
1413
public class FTBChunksProperties {
1514
public static final BooleanProperty ALLOW_ALL_FAKE_PLAYERS
16-
= new BooleanProperty(FTBChunksAPI.rl("allow_fake_players"), FTBChunksWorldConfig.DEF_ALLOW_FAKE_PLAYERS::get);
15+
= new BooleanProperty(FTBChunksAPI.id("allow_fake_players"), FTBChunksWorldConfig.DEF_ALLOW_FAKE_PLAYERS::get);
1716
public static final StringListProperty ALLOW_NAMED_FAKE_PLAYERS
18-
= new StringListProperty(FTBChunksAPI.rl("allow_named_fake_players"), () -> new ArrayList<>(FTBChunksWorldConfig.DEF_ALLOW_NAMED_FAKE_PLAYERS.get()));
17+
= new StringListProperty(FTBChunksAPI.id("allow_named_fake_players"), () -> new ArrayList<>(FTBChunksWorldConfig.DEF_ALLOW_NAMED_FAKE_PLAYERS.get()));
1918
public static final BooleanProperty ALLOW_FAKE_PLAYERS_BY_ID
20-
= new BooleanProperty(FTBChunksAPI.rl("allow_fake_players_by_id"), FTBChunksWorldConfig.DEF_ALLOW_FAKE_PLAYER_IDS::get);
19+
= new BooleanProperty(FTBChunksAPI.id("allow_fake_players_by_id"), FTBChunksWorldConfig.DEF_ALLOW_FAKE_PLAYER_IDS::get);
2120
public static final PrivacyProperty ENTITY_INTERACT_MODE
22-
= new PrivacyProperty(FTBChunksAPI.rl("entity_interact_mode"), FTBChunksWorldConfig.DEF_ENTITY_INTERACT::get);
21+
= new PrivacyProperty(FTBChunksAPI.id("entity_interact_mode"), FTBChunksWorldConfig.DEF_ENTITY_INTERACT::get);
2322
public static final PrivacyProperty NONLIVING_ENTITY_ATTACK_MODE
24-
= new PrivacyProperty(FTBChunksAPI.rl("nonliving_entity_attack_mode"), FTBChunksWorldConfig.DEF_NONLIVING_ENTITY_ATTACK::get);
23+
= new PrivacyProperty(FTBChunksAPI.id("nonliving_entity_attack_mode"), FTBChunksWorldConfig.DEF_NONLIVING_ENTITY_ATTACK::get);
2524
public static final BooleanProperty ALLOW_EXPLOSIONS
26-
= new BooleanProperty(FTBChunksAPI.rl("allow_explosions"), FTBChunksWorldConfig.DEF_ALLOW_EXPLOSIONS::get);
25+
= new BooleanProperty(FTBChunksAPI.id("allow_explosions"), FTBChunksWorldConfig.DEF_ALLOW_EXPLOSIONS::get);
2726
public static final BooleanProperty ALLOW_MOB_GRIEFING
28-
= new BooleanProperty(FTBChunksAPI.rl("allow_mob_griefing"), FTBChunksWorldConfig.DEF_MOB_GRIEFING::get);
27+
= new BooleanProperty(FTBChunksAPI.id("allow_mob_griefing"), FTBChunksWorldConfig.DEF_MOB_GRIEFING::get);
2928
public static final PrivacyProperty CLAIM_VISIBILITY
30-
= new PrivacyProperty(FTBChunksAPI.rl("claim_visibility"), FTBChunksWorldConfig.DEF_CLAIM_VISIBILITY::get);
29+
= new PrivacyProperty(FTBChunksAPI.id("claim_visibility"), FTBChunksWorldConfig.DEF_CLAIM_VISIBILITY::get);
3130
public static final PrivacyProperty LOCATION_MODE
32-
= new PrivacyProperty(FTBChunksAPI.rl("location_mode"), FTBChunksWorldConfig.DEF_PLAYER_VISIBILITY::get);
31+
= new PrivacyProperty(FTBChunksAPI.id("location_mode"), FTBChunksWorldConfig.DEF_PLAYER_VISIBILITY::get);
3332
public static final BooleanProperty ALLOW_PVP
34-
= new BooleanProperty(FTBChunksAPI.rl("allow_pvp"), FTBChunksWorldConfig.DEF_PVP::get);
33+
= new BooleanProperty(FTBChunksAPI.id("allow_pvp"), FTBChunksWorldConfig.DEF_PVP::get);
3534

3635
// FTB Chunks on Forge adds two separate block edit & interact properties
3736
public static final PrivacyProperty BLOCK_EDIT_MODE
38-
= new PrivacyProperty(FTBChunksAPI.rl("block_edit_mode"), FTBChunksWorldConfig.DEF_BLOCK_EDIT::get);
37+
= new PrivacyProperty(FTBChunksAPI.id("block_edit_mode"), FTBChunksWorldConfig.DEF_BLOCK_EDIT::get);
3938
public static final PrivacyProperty BLOCK_INTERACT_MODE
40-
= new PrivacyProperty(FTBChunksAPI.rl("block_interact_mode"), FTBChunksWorldConfig.DEF_BLOCK_INTERACT::get);
39+
= new PrivacyProperty(FTBChunksAPI.id("block_interact_mode"), FTBChunksWorldConfig.DEF_BLOCK_INTERACT::get);
4140

4241
// FTB Chunks on Fabric adds a combined block edit & interact property
4342
public static final PrivacyProperty BLOCK_EDIT_AND_INTERACT_MODE
44-
= new PrivacyProperty(FTBChunksAPI.rl("block_edit_and_interact_mode"), FTBChunksWorldConfig.DEF_BLOCK_EDIT_INTERACT::get);
43+
= new PrivacyProperty(FTBChunksAPI.id("block_edit_and_interact_mode"), FTBChunksWorldConfig.DEF_BLOCK_EDIT_INTERACT::get);
4544

4645
}

‎common/src/main/java/dev/ftb/mods/ftbchunks/api/FTBChunksTags.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
public class FTBChunksTags {
1010
public static class Blocks {
1111
public static final TagKey<Block> EDIT_WHITELIST_TAG
12-
= TagKey.create(Registries.BLOCK, FTBChunksAPI.rl("edit_whitelist"));
12+
= TagKey.create(Registries.BLOCK, FTBChunksAPI.id("edit_whitelist"));
1313
public static final TagKey<Block> INTERACT_WHITELIST_TAG
14-
= TagKey.create(Registries.BLOCK, FTBChunksAPI.rl("interact_whitelist"));
14+
= TagKey.create(Registries.BLOCK, FTBChunksAPI.id("interact_whitelist"));
1515
}
1616

1717
public static class Items {
1818
public static final TagKey<Item> RIGHT_CLICK_BLACKLIST_TAG
19-
= TagKey.create(Registries.ITEM, FTBChunksAPI.rl("right_click_blacklist"));
19+
= TagKey.create(Registries.ITEM, FTBChunksAPI.id("right_click_blacklist"));
2020
public static final TagKey<Item> RIGHT_CLICK_WHITELIST_TAG
21-
= TagKey.create(Registries.ITEM, FTBChunksAPI.rl("right_click_whitelist"));
21+
= TagKey.create(Registries.ITEM, FTBChunksAPI.id("right_click_whitelist"));
2222
}
2323

2424
public static class Entities {
2525
public static final TagKey<EntityType<?>> ENTITY_INTERACT_WHITELIST_TAG
26-
= TagKey.create(Registries.ENTITY_TYPE, FTBChunksAPI.rl("entity_interact_whitelist"));
26+
= TagKey.create(Registries.ENTITY_TYPE, FTBChunksAPI.id("entity_interact_whitelist"));
2727
public static final TagKey<EntityType<?>> NONLIVING_ENTITY_ATTACK_WHITELIST_TAG
28-
= TagKey.create(Registries.ENTITY_TYPE, FTBChunksAPI.rl("nonliving_entity_attack_whitelist"));
28+
= TagKey.create(Registries.ENTITY_TYPE, FTBChunksAPI.id("nonliving_entity_attack_whitelist"));
2929
public static final TagKey<EntityType<?>> ENTITY_MOB_GRIEFING_BLACKLIST_TAG
30-
= TagKey.create(Registries.ENTITY_TYPE, FTBChunksAPI.rl("entity_mob_griefing_blacklist"));
30+
= TagKey.create(Registries.ENTITY_TYPE, FTBChunksAPI.id("entity_mob_griefing_blacklist"));
3131
}
3232
}

‎common/src/main/java/dev/ftb/mods/ftbchunks/api/client/icon/MapIcon.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.ftb.mods.ftbchunks.api.client.icon;
22

3+
import dev.ftb.mods.ftblibrary.client.icon.IconHelper;
34
import dev.ftb.mods.ftblibrary.icon.Color4I;
45
import dev.ftb.mods.ftblibrary.icon.Icon;
56
import dev.ftb.mods.ftblibrary.math.MathUtils;
@@ -151,7 +152,7 @@ public void setIcon(Icon icon) {
151152
@Override
152153
public void draw(MapType mapType, GuiGraphics graphics, int x, int y, int w, int h, boolean outsideVisibleArea, int iconAlpha) {
153154
if (!icon.isEmpty()) {
154-
icon.draw(graphics, x, y, w, h);
155+
IconHelper.renderIcon(icon, graphics, x, y, w, h);
155156
}
156157
}
157158

0 commit comments

Comments
 (0)