Skip to content

Commit c3efdcd

Browse files
MichaelHillcoxMichaelHillcox
committed
feat: it compiles (21.11 port)
1 parent 3c5f9d4 commit c3efdcd

File tree

75 files changed

+339
-334
lines changed

Some content is hidden

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

75 files changed

+339
-334
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.8.4"
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/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ dependencies {
77
exclude group: "dev.architectury"
88
}
99

10-
modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}") {
11-
exclude group: "dev.architectury"
12-
}
10+
// modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}") {
11+
// exclude group: "dev.architectury"
12+
// }
1313

1414
modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
15-
modCompileOnly("mezz.jei:jei-1.21.8-common-api:${jei_version}")
15+
modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
1616

1717
// modCompileOnly "dev.emi:emi-xplat-intermediary:${emi_version}+1.21.1:api"
1818
}

‎common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibrary.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.minecraft.network.chat.Component;
2424
import net.minecraft.network.chat.Style;
2525
import net.minecraft.network.chat.TextColor;
26-
import net.minecraft.resources.ResourceLocation;
26+
import net.minecraft.resources.Identifier;
2727
import net.minecraft.server.MinecraftServer;
2828
import net.minecraft.server.level.ServerPlayer;
2929
import net.minecraft.world.item.CreativeModeTab;
@@ -70,8 +70,8 @@ private void onSetup() {
7070
customColors.forEach(ExtendableTextColor::addCustomColor);
7171
}
7272

73-
public static ResourceLocation rl(String path) {
74-
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
73+
public static Identifier rl(String path) {
74+
return Identifier.fromNamespaceAndPath(MOD_ID, path);
7575
}
7676

7777
public static DeferredSupplier<CreativeModeTab> getCreativeModeTab() {

‎common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibraryCommands.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import net.minecraft.nbt.StringTag;
3333
import net.minecraft.network.chat.Component;
3434
import net.minecraft.network.chat.ComponentSerialization;
35+
import net.minecraft.server.permissions.Permissions;
3536
import net.minecraft.util.ProblemReporter;
3637
import net.minecraft.world.Nameable;
3738
import net.minecraft.world.entity.player.Player;
@@ -53,7 +54,7 @@ public class FTBLibraryCommands {
5354
public static void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext ignoredCtx, Commands.CommandSelection ignoredType) {
5455
var command = literal(FTBLibrary.MOD_ID)
5556
.then(literal("gamemode")
56-
.requires(commandSource -> commandSource.hasPermission(Commands.LEVEL_GAMEMASTERS))
57+
.requires(commandSource -> commandSource.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
5758
.executes(context -> {
5859
if (!context.getSource().getPlayerOrException().isCreative()) {
5960
context.getSource().getPlayerOrException().setGameMode(GameType.CREATIVE);
@@ -65,7 +66,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
6566
})
6667
)
6768
.then(literal("rain")
68-
.requires(commandSource -> commandSource.hasPermission(Commands.LEVEL_GAMEMASTERS))
69+
.requires(commandSource -> commandSource.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
6970
.executes(context -> {
7071
//Use overworld as that controls the weather for the whole server
7172
if (context.getSource().getServer().overworld().isRaining()) {
@@ -77,7 +78,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
7778
})
7879
)
7980
.then(literal("day")
80-
.requires(commandSource -> commandSource.hasPermission(Commands.LEVEL_GAMEMASTERS))
81+
.requires(commandSource -> commandSource.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
8182
.executes(context -> {
8283
for (var world : context.getSource().getServer().getAllLevels()) {
8384
world.setDayTime(6000L);
@@ -87,7 +88,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
8788
})
8889
)
8990
.then(literal("night")
90-
.requires(commandSource -> commandSource.hasPermission(Commands.LEVEL_GAMEMASTERS))
91+
.requires(commandSource -> commandSource.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
9192
.executes(context -> {
9293
for (var world : context.getSource().getServer().getAllLevels()) {
9394
world.setDayTime(18000L);
@@ -97,7 +98,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
9798
})
9899
)
99100
.then(literal("nbtedit")
100-
.requires(commandSource -> commandSource.hasPermission(Commands.LEVEL_GAMEMASTERS))
101+
.requires(commandSource -> commandSource.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
101102
.then(literal("block")
102103
.then(Commands.argument("pos", BlockPosArgument.blockPos())
103104
.executes(context -> editNBT(context, (info, tag) -> editBlockNBT(context, info, tag)))
@@ -137,7 +138,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
137138
})
138139
);
139140
command.then(literal("serverconfig")
140-
.requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS))
141+
.requires(cs -> cs.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
141142
.executes(context -> {
142143
NetworkManager.sendToPlayer(context.getSource().getPlayerOrException(), new EditConfigPacket(FTBLibraryServerConfig.KEY));
143144
return Command.SINGLE_SUCCESS;
@@ -199,7 +200,7 @@ private static void editPlayerNBT(CommandContext<CommandSourceStack> context, Co
199200
.add("Display Name", player.getDisplayName())
200201
.add("UUID", Component.literal(player.getUUID().toString()))
201202
.build());
202-
info.putString("title", player.getGameProfile().getName());
203+
info.putString("title", player.getGameProfile().name());
203204
}
204205

205206
private static void editEntityNBT(CommandContext<CommandSourceStack> context, CompoundTag info, CompoundTag tag) throws CommandSyntaxException {

‎common/src/main/java/dev/ftb/mods/ftblibrary/api/sidebar/SidebarButton.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.ftb.mods.ftblibrary.api.sidebar;
22

33
import net.minecraft.network.chat.Component;
4-
import net.minecraft.resources.ResourceLocation;
4+
import net.minecraft.resources.Identifier;
55

66
import java.util.List;
77
import java.util.function.BooleanSupplier;
@@ -12,7 +12,7 @@ public interface SidebarButton {
1212
/**
1313
* @return the id of the button used for saving config data created from the location button in resource path
1414
*/
15-
ResourceLocation getId();
15+
Identifier getId();
1616

1717
/**
1818
* Register a condition that must be met for the button to be visible

‎common/src/main/java/dev/ftb/mods/ftblibrary/config/ConfigGroup.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
99
import net.minecraft.client.resources.language.I18n;
1010
import net.minecraft.network.chat.Component;
11-
import net.minecraft.resources.ResourceLocation;
11+
import net.minecraft.resources.Identifier;
1212
import net.minecraft.world.entity.EntityType;
1313
import net.minecraft.world.item.ItemStack;
1414
import org.jetbrains.annotations.NotNull;
@@ -410,7 +410,7 @@ public FluidConfig addFluidStack(String id, FluidStack value, Consumer<FluidStac
410410
}
411411

412412
/**
413-
* Add a new image config item to this group (note: this is in effect a ResourceLocation referring to an image known
413+
* Add a new image config item to this group (note: this is in effect a Identifier referring to an image known
414414
* to the client's resource manager).
415415
*
416416
* @param id a unique id for this config item
@@ -419,7 +419,7 @@ public FluidConfig addFluidStack(String id, FluidStack value, Consumer<FluidStac
419419
* @param def the default value
420420
* @return the {@link ImageResourceConfig} just added
421421
*/
422-
public ImageResourceConfig addImage(String id, ResourceLocation value, Consumer<ResourceLocation> setter, ResourceLocation def) {
422+
public ImageResourceConfig addImage(String id, Identifier value, Consumer<Identifier> setter, Identifier def) {
423423
return add(id, new ImageResourceConfig(), value, setter, def);
424424
}
425425

‎common/src/main/java/dev/ftb/mods/ftblibrary/config/ImageResourceConfig.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import dev.ftb.mods.ftblibrary.util.TooltipList;
1212
import net.minecraft.ChatFormatting;
1313
import net.minecraft.network.chat.Component;
14-
import net.minecraft.resources.ResourceLocation;
14+
import net.minecraft.resources.Identifier;
1515

1616
import java.util.OptionalLong;
1717

18-
public class ImageResourceConfig extends ResourceConfigValue<ResourceLocation> {
19-
public static final ResourceLocation NONE = FTBLibrary.rl("none");
18+
public class ImageResourceConfig extends ResourceConfigValue<Identifier> {
19+
public static final Identifier NONE = FTBLibrary.rl("none");
2020

2121
public ImageResourceConfig() {
2222
value = NONE;
2323
}
2424

25-
public static ResourceLocation getResourceLocation(Icon icon) {
26-
return icon instanceof IResourceIcon i ? i.getResourceLocation() : NONE;
25+
public static Identifier getIdentifier(Icon icon) {
26+
return icon instanceof IResourceIcon i ? i.getIdentifier() : NONE;
2727
}
2828

2929
@Override
@@ -42,12 +42,12 @@ public boolean isEmpty() {
4242
}
4343

4444
@Override
45-
public SelectableResource<ResourceLocation> getResource() {
45+
public SelectableResource<Identifier> getResource() {
4646
return new ImageResource(getValue());
4747
}
4848

4949
@Override
50-
public boolean setResource(SelectableResource<ResourceLocation> selectable) {
50+
public boolean setResource(SelectableResource<Identifier> selectable) {
5151
return setCurrentValue(selectable.resource());
5252
}
5353

‎common/src/main/java/dev/ftb/mods/ftblibrary/config/ResourceConfigValue.java‎

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

33
import dev.ftb.mods.ftblibrary.FTBLibrary;
44
import dev.ftb.mods.ftblibrary.config.ui.resource.SelectableResource;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66

77
import java.util.OptionalLong;
88
import java.util.function.Predicate;
@@ -48,7 +48,7 @@ public boolean allowResource(T resource) {
4848
}
4949

5050
public static abstract class Image<T> extends ResourceConfigValue<T> {
51-
public static final ResourceLocation NONE = FTBLibrary.rl("none");
51+
public static final Identifier NONE = FTBLibrary.rl("none");
5252

5353
@Override
5454
public boolean canHaveNBT() {

‎common/src/main/java/dev/ftb/mods/ftblibrary/config/manager/ConfigManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
1212
import dev.ftb.mods.ftblibrary.util.BooleanConsumer;
1313
import dev.ftb.mods.ftblibrary.util.NetworkHelper;
14-
import net.minecraft.Util;
14+
import net.minecraft.util.Util;
1515
import net.minecraft.nbt.CompoundTag;
1616
import net.minecraft.server.MinecraftServer;
1717
import net.minecraft.server.level.ServerPlayer;

‎common/src/main/java/dev/ftb/mods/ftblibrary/config/ui/resource/EntityFaceResource.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import net.minecraft.ChatFormatting;
77
import net.minecraft.core.registries.BuiltInRegistries;
88
import net.minecraft.network.chat.Component;
9-
import net.minecraft.resources.ResourceLocation;
9+
import net.minecraft.resources.Identifier;
1010
import net.minecraft.world.entity.EntityType;
1111
import org.jetbrains.annotations.NotNull;
1212

1313
public class EntityFaceResource implements SelectableResource<EntityType<?>>, Comparable<EntityFaceResource> {
1414
public static final EntityFaceResource NONE = new EntityFaceResource(EntityFaceConfig.NONE);
1515

1616
private final EntityType<?> type;
17-
private final ResourceLocation location;
17+
private final Identifier location;
1818
private final Component name;
1919
private final Icon icon;
2020

@@ -28,7 +28,7 @@ public EntityFaceResource(EntityType<?> type) {
2828
icon = type == EntityFaceConfig.NONE ? Icon.empty() : EntityIconLoader.getIcon(type);
2929
}
3030

31-
public ResourceLocation getLocation() {
31+
public Identifier getLocation() {
3232
return location;
3333
}
3434

0 commit comments

Comments
 (0)