Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 1.19.4 #198

Merged
merged 5 commits into from
Mar 16, 2023
Merged

Update to 1.19.4 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c30b5e
fabric: 1.19.4
Rakambda Mar 14, 2023
e6aa8e4
forge: 1.19.4
Rakambda Mar 15, 2023
689fe7f
Merge branch 'minecraft/1.19.4' into feat/next-version
Rakambda Mar 15, 2023
43feaf8
chore: bump cloth & components
Rakambda Mar 16, 2023
bfec4ea
fix: components
Rakambda Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions fabric/src/client/java/fr/rakambda/editsign/fabric/client/cloth/ClothConfigHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.contents.LiteralContents;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Optional;
Expand All @@ -26,7 +24,7 @@ public Function<Screen, Screen> load(){
return (screen) -> {
var builder = ConfigBuilder.create()
.setParentScreen(screen)
.setTitle(MutableComponent.create(new LiteralContents("EditSign")));
.setTitle(Component.literal("EditSign"));

var configuration = getMod().getConfiguration();
builder.setSavingRunnable(configuration::onUpdate);
Expand Down
5 changes: 2 additions & 3 deletions fabric/src/main/java/fr/rakambda/editsign/fabric/common/EditSignCommonsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import org.jetbrains.annotations.NotNull;
Expand All @@ -22,7 +21,7 @@ public class EditSignCommonsImpl extends EditSignCommon{
@Override
@NotNull
public IComponent translate(@NotNull String key, Object... objects){
return new ComponentWrapper(MutableComponent.create(new TranslatableContents(key, objects)));
return new ComponentWrapper(Component.translatable(key, objects));
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions forge/src/main/java/fr/rakambda/editsign/forge/ForgeEventSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package fr.rakambda.editsign.forge;

import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
Expand Down Expand Up @@ -29,7 +28,7 @@ public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event){
}
else{
if(player instanceof ServerPlayer serverPlayer){
serverPlayer.sendSystemMessage(MutableComponent.create(new TranslatableContents(EditSign.MOD_ID + ".action.not_editable")), false);
serverPlayer.sendSystemMessage(Component.translatable(EditSign.MOD_ID + ".action.not_editable"), false);
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions forge/src/main/java/fr/rakambda/editsign/forge/config/cloth/ClothConfigHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.gui.entries.StringListEntry;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.contents.LiteralContents;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.ConfigScreenHandler;
Expand Down Expand Up @@ -45,7 +42,7 @@ public void load(){
ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> {
ConfigBuilder builder = ConfigBuilder.create()
.setParentScreen(screen)
.setTitle(MutableComponent.create(new LiteralContents("EditSign")));
.setTitle(Component.literal("EditSign"));

fillConfigScreen(builder);

Expand All @@ -71,7 +68,7 @@ public void fillConfigScreen(ConfigBuilder builder){

@NotNull
private static Component translatable(@NotNull String key){
return MutableComponent.create(new TranslatableContents(key));
return Component.translatable(key);
}

private String getFieldName(String fieldName){
Expand Down
6 changes: 3 additions & 3 deletions forge/src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[44,)"
loaderVersion = "[45,)"
issueTrackerURL = "https://github.com/${repoUser}/${repoName}/issues"
license = "LGPL-3.0"

Expand All @@ -15,7 +15,7 @@ description = '''Allow you to edit signs without breaking them.'''
[[dependencies.editsign]]
modId = "forge"
mandatory = true
versionRange = "[44,)"
versionRange = "[45,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.editsign]]
Expand All @@ -27,6 +27,6 @@ side = "BOTH"
[[dependencies.editsign]]
modId = "cloth-config"
mandatory = false
versionRange = "[9.0.0,)"
versionRange = "[10.0.0,)"
ordering = "NONE"
side = "CLIENT"
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ jetbrains-annotations-version = "24.0.1"
gson-version = "2.10.1"
log4j2-version = "2.20.0"

minecraftVersion = "1.19.3"
fabric-loader-version = "0.14.12"
fabric-api-version = "0.72.0+1.19.3"
forge-version = "1.19.3-44.0.0"
minecraftVersion = "1.19.4"
fabric-loader-version = "0.14.17"
fabric-api-version = "0.75.3+1.19.4"
forge-version = "1.19.4-45.0.0"
forgeMappingsVersion = "1.19.3"

# Mod dependencies
modmenu-version = "5.0.2"
clothConfigVersion = "9.0.94"
modmenu-version = "6.1.0-rc.1"
clothConfigVersion = "10.0.96"

fabric-loom-version = "1.1.10"
forge-plugin-version = "5.1.68"
Expand Down