Skip to content

Commit

Permalink
Merge pull request #10 from eclipseisoffline/1.21
Browse files Browse the repository at this point in the history
Update to 1.21
  • Loading branch information
Wesley1808 authored Jun 14, 2024
2 parents 9d064cc + 15acb39 commit 9b7182a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
org.gradle.jvmargs=-Xmx2G

# Fabric Properties
minecraft_version=1.20.5
loader_version=0.15.10
minecraft_version=1.21
loader_version=0.15.11

# Mod Properties
mod_version=1.5
mod_version=1.6
maven_group=me.wesley1808
archives_base_name=advancedchat

# API dependencies
fabric_version=0.97.6+1.20.5
placeholder_api_version=2.4.0-pre.1+1.20.5
playerdata_api_version=0.5.0+1.20.5
predicate_api_version=0.4.0+1.20.5
fabric_version=0.100.1+1.21
placeholder_api_version=2.4.0-pre.2+1.21
playerdata_api_version=0.6.0+1.21
predicate_api_version=0.5.1+1.21
permission_api_version=0.3.1

# Other dependencies
styledchat_version=2.5.0+1.20.5
vanish_version=1.5.3+1.20.5
styledchat_version=2.6.0+1.21
vanish_version=1.5.5+1.21
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

public class ChannelPredicate extends AbstractPredicate {
private static final String GLOBAL_CHANNEL = "global";
public static final ResourceLocation ID = new ResourceLocation("advancedchat", "channel");
public static final ResourceLocation ID = ResourceLocation.tryBuild("advancedchat", "channel");
public static final MapCodec<ChannelPredicate> CODEC = RecordCodecBuilder.mapCodec(instance -> instance
.group(Codec.STRING.fieldOf("channel").forGetter(ChannelPredicate::channel))
.apply(instance, ChannelPredicate::new)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.minecraft.world.phys.Vec3;

public class CustomDistancePredicate extends AbstractChatPredicate {
public static final ResourceLocation ID = new ResourceLocation("advancedchat", "distance");
public static final ResourceLocation ID = ResourceLocation.tryBuild("advancedchat", "distance");
public static final MapCodec<CustomDistancePredicate> CODEC = RecordCodecBuilder.mapCodec(instance -> instance
.group(DistancePredicate.CODEC.fieldOf("value").forGetter((inst) -> inst.predicate))
.apply(instance, CustomDistancePredicate::new)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static void register() {
}

private static void register(String name, PlaceholderHandler handler) {
Placeholders.register(new ResourceLocation("advancedchat", name), handler);
Placeholders.register(ResourceLocation.tryBuild("advancedchat", name), handler);
}
}

2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
],
"depends": {
"fabricloader": ">=0.15.0",
"minecraft": ">=1.20.5-"
"minecraft": ">=1.21-"
},
"suggests": {
"styledchat": "*"
Expand Down

0 comments on commit 9b7182a

Please # to comment.