Skip to content

Commit

Permalink
1.19 Forge
Browse files Browse the repository at this point in the history
  • Loading branch information
Rakambda committed Jun 9, 2022
1 parent 0f71df9 commit 37be287
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 17 deletions.
13 changes: 13 additions & 0 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@ minecraft {
}
}

gameTestServer {
workingDirectory project.file("../run")
property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug'
property 'forge.enabledGameTestNamespaces', 'fallingtree'

mods {
editsign {
source sourceSets.main
}
}
}

data {
workingDirectory project.file("../run")
property "forge.logging.markers", "REGISTRIES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package fr.raksrinana.editsign.forge;

import net.minecraft.Util;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.EventPriority;
Expand All @@ -28,7 +30,9 @@ public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event){
player.openTextEdit(sign);
}
else{
player.sendMessage(new TranslatableComponent(EditSign.MOD_ID + ".action.not_editable"), Util.NIL_UUID);
if(player instanceof ServerPlayer serverPlayer){
serverPlayer.m_215098_(MutableComponent.m_237204_(new TranslatableContents(EditSign.MOD_ID + ".action.not_editable")), ChatType.f_130598_); //Send it directly to player?
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.gui.entries.StringListEntry;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
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.ConfigGuiHandler;
import net.minecraftforge.fml.ModLoadingContext;
import org.jetbrains.annotations.NotNull;
import java.util.LinkedList;
import java.util.Optional;
import java.util.function.Function;
Expand All @@ -33,7 +35,7 @@ public static Function<String, Optional<Component>> getMinecraftItemIdCellError(
}

if(!valid){
return Optional.of(new TranslatableComponent("text.autoconfig.editsign.error.invalidItemResourceLocation"));
return Optional.of(translatable("text.autoconfig.editsign.error.invalidItemResourceLocation"));
}
return Optional.empty();
};
Expand All @@ -43,7 +45,7 @@ public void load(){
ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class, () -> new ConfigGuiHandler.ConfigGuiFactory((minecraft, screen) -> {
ConfigBuilder builder = ConfigBuilder.create()
.setParentScreen(screen)
.setTitle(new TextComponent("EditSign"));
.setTitle(MutableComponent.m_237204_(new LiteralContents("EditSign")));

fillConfigScreen(builder);

Expand All @@ -56,17 +58,22 @@ public void fillConfigScreen(ConfigBuilder builder){
CommonConfig config = Config.COMMON;

StringListEntry reverseSneakingEntry = builder.entryBuilder()
.startStrField(new TranslatableComponent(getFieldName("requiredItemId")), config.getRequiredItemStr())
.startStrField(translatable(getFieldName("requiredItemId")), config.getRequiredItemStr())
.setDefaultValue("")
.setTooltip(getTooltips("requiredItemId", 4))
.setSaveConsumer(config::setRequiredItemId)
.setErrorSupplier(getMinecraftItemIdCellError())
.build();

ConfigCategory general = builder.getOrCreateCategory(new TranslatableComponent("text.autoconfig.editsign.category.default"));
ConfigCategory general = builder.getOrCreateCategory(translatable("text.autoconfig.editsign.category.default"));
general.addEntry(reverseSneakingEntry);
}

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

private String getFieldName(String fieldName){
return "text.autoconfig.editsign.option." + fieldName;
}
Expand All @@ -83,7 +90,7 @@ private Component[] getTooltips(String fieldName, int count){
}
}
return keys.stream()
.map(TextComponent::new)
.map(ClothConfigHook::translatable)
.toArray(Component[]::new);
}
}
6 changes: 3 additions & 3 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[40,)"
loaderVersion = "[41,)"
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 = "[40,)"
versionRange = "[41,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.editsign]]
Expand All @@ -27,6 +27,6 @@ side = "BOTH"
[[dependencies.editsign]]
modId = "cloth-config"
mandatory = false
versionRange = "[6.0.0,)"
versionRange = "[7.0.0,)"
ordering = "NONE"
side = "CLIENT"
4 changes: 3 additions & 1 deletion forge/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"pack": {
"description": "EditSign",
"pack_format": 9
"pack_format": 9,
"forge:resource_pack_format": 9,
"forge:data_pack_format": 10
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ modId=editsign
modName=EditSign
version=0.0.1-dev
includeFabric=true
includeForge=false
includeForge=true
# Repository
repoUser=RakSrinaNa
repoName=EditSign
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ log4j2-version = "2.17.2"
minecraftVersion = "1.19"
fabric-loader-version = "0.14.6"
fabric-api-version = "0.55.1+1.19"
forge-version = "1.18.2-40.0.13"
forge-version = "1.19-41.0.5"

# Mod dependencies
modmenu-version = "4.0.0-beta.4"
clothConfigVersion = "7.0.65"
clothConfigVersion = "7.0.69"

fabric-loom-version = "0.12.47"
forge-plugin-version = "5.1.27"
Expand Down

0 comments on commit 37be287

Please sign in to comment.