Added French translation

README.md

@@ -1,5 +1,5 @@
 # Create Railways Navigator (Minecraft Create Mod Addon)
-![Logo](https://github.com/MisterJulsen/Create-Train-Navigator/blob/1.18.2-Multiloader/icon_256px.png)
+![Logo](https://github.com/MisterJulsen/Create-Train-Navigator/blob/1.20.1/icon_256px.png)
 
 Get a list possible train connections in your world from one station to another using the Create Railways Navigator.
 
@@ -18,6 +18,7 @@ This mod adds a new item, the Create Railways Navigator, which is inspired by th
 - German (100%)
 - Dutch (100%) (by TheSatanicFlame)
 - Polish (100%) (by Slasherss)
+- French (100%) (by GeoffreyGx)
 
 ## **Please note!**
 To protect your world from damage, you should always create a backup of your world before installing an update of this mod. Alpha versions in particular may contain critical bugs!

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
 }
 
 architectury {
@@ -16,9 +16,11 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        // The following line declares the mojmap mappings, you may use other mappings as well
+
         mappings loom.layered() {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchmentmc_version}@zip")
+            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
         }
     }
 }
@@ -56,15 +58,45 @@ allprojects {
                 includeGroup "curse.maven"
             }
         }
-        maven { url "https://maven.parchmentmc.org/"}
+
+
+        maven { // Create Forge and Registrate Forge
+            url = "https://maven.tterrag.com/"
+            content {
+                includeGroup("com.tterrag.registrate")
+                includeGroup("com.simibubi.create")
+            }
+        }
+
+        maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI
+        maven { url = "https://maven.blamejared.com/" } // JEI
+        maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
+        maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings
+        maven { url = "https://api.modrinth.com/maven" } // LazyDFU
+        maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu
+        maven { url = "https://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate
+        maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port
+        maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
+        maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
+        maven { url = "https://maven.tterrag.com/" } // Flywheel
     }
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
         options.release = 17
     }
 
+publishing {
+    repositories {
+        maven {
+            name "GitHub"
+            url "file://${System.getProperty('user.home')}/.m2/github/modsrepo/maven"
+        }
+    }
+}
+
     java {
         withSourcesJar()
+        withJavadocJar()
     }
 }

common/build.gradle

@@ -6,25 +6,14 @@ loom {
     accessWidenerPath = file("src/main/resources/createrailwaysnavigator.accesswidener")
 }
 
-repositories {
-    maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI
-	maven { url = "https://maven.blamejared.com/" } // JEI
-	maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
-	maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings
-	maven { url = "https://api.modrinth.com/maven" } // LazyDFU
-	maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu
-	maven { url = "https://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate
-	maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port
-	maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
-	maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
-	maven { url = "https://maven.tterrag.com/" } // Flywheel
-}
-
 dependencies {
+    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+    // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi(include("de.mrjulsen.mcdragonlib:dragonlib-fabric:${rootProject.minecraft_version}-${rootProject.dragonlib_version}"))
-
+
+    modImplementation(include("de.mrjulsen.mcdragonlib:dragonlib-fabric:${rootProject.minecraft_version}-${rootProject.dragonlib_version}"))
     modCompileOnly("com.simibubi.create:create-fabric-${rootProject.minecraft_version}:${rootProject.create_fabric_version}")
+
 }
 
 publishing {
@@ -35,6 +24,8 @@ publishing {
         }
     }
 
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
+        // Add repositories to publish to here.
     }
 }

common/src/main/java/de/mrjulsen/crn/CreateRailwaysNavigator.java

@@ -30,6 +30,7 @@
 import de.mrjulsen.crn.network.packets.stc.TrainDataResponsePacket;
 import de.mrjulsen.crn.registry.ModBlockEntities;
 import de.mrjulsen.crn.registry.ModBlocks;
+import de.mrjulsen.crn.registry.ModCreativeModeTab;
 import de.mrjulsen.crn.registry.ModExtras;
 import de.mrjulsen.crn.registry.ModItems;
 import de.mrjulsen.mcdragonlib.net.NetworkManagerBase;
@@ -77,6 +78,7 @@ public static void load() {}
 
     public static void init() {
 
+        ModCreativeModeTab.setup();
         ModBlocks.register();
         ModItems.register();
         ModBlockEntities.register();        

common/src/main/java/de/mrjulsen/crn/block/AbstractAdvancedDisplayBlock.java

@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Random;
 
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
@@ -23,6 +22,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -211,7 +211,7 @@ public void updateNeighbours(BlockState pState, Level pLevel, BlockPos pPos) {
 	}
 
     @Override
-	public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, Random pRandom) {
+	public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSource pRandom) {
 		if (pState.getBlock() != this)
 			return;
 		BlockPos belowPos = pPos.relative(Direction.fromAxisAndDirection(getConnectionAxis(pState), AxisDirection.NEGATIVE));
@@ -307,7 +307,7 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
 			if (dye != null) {
 				pLevel.playSound(null, pPos, SoundEvents.DYE_USE, SoundSource.BLOCKS, 1.0F, 1.0F);
 				blockEntity.applyToAll(be -> {
-					be.setColor(dye == DyeColor.ORANGE ? 0xFF9900 : dye.getMaterialColor().col);				
+					be.setColor(dye == DyeColor.ORANGE ? 0xFF9900 : dye.getMapColor().col);				
 					be.notifyUpdate();
 				});
 

common/src/main/java/de/mrjulsen/crn/block/TrainStationClockBlock.java

@@ -62,7 +62,7 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
 			DyeColor dye = dyeItem.getDyeColor();        
 			if (dye != null) {
 				pLevel.playSound(null, pPos, SoundEvents.DYE_USE, SoundSource.BLOCKS, 1.0F, 1.0F);
-				blockEntity.setColor(dye == DyeColor.ORANGE ? 0xFF9900 : dye.getMaterialColor().col);
+				blockEntity.setColor(dye == DyeColor.ORANGE ? 0xFF9900 : dye.getMapColor().col);
 
 				if (pLevel.isClientSide) {
 					blockEntity.getRenderer().update(pLevel, pPos, pState, blockEntity, EUpdateReason.BLOCK_CHANGED);

common/src/main/java/de/mrjulsen/crn/client/ClientWrapper.java

@@ -16,14 +16,14 @@
 import de.mrjulsen.crn.data.GlobalSettingsManager;
 import de.mrjulsen.crn.network.packets.stc.ServerErrorPacket;
 import de.mrjulsen.mcdragonlib.client.gui.DLScreen;
+import de.mrjulsen.mcdragonlib.util.TextUtils;
 import dev.architectury.networking.NetworkManager.PacketContext;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.toasts.SystemToast;
 import net.minecraft.client.gui.components.toasts.SystemToast.SystemToastIds;
 import net.minecraft.client.resources.language.ClientLanguage;
 import net.minecraft.client.resources.language.LanguageInfo;
 import net.minecraft.locale.Language;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.level.Level;
 
 public class ClientWrapper {
@@ -45,7 +45,7 @@ public static void showRouteOverlaySettingsGui(RouteDetailsOverlayScreen overlay
     }
 
     public static void handleErrorMessagePacket(ServerErrorPacket packet, Supplier<PacketContext> ctx) {        
-        Minecraft.getInstance().getToasts().addToast(new SystemToast(SystemToastIds.PERIODIC_NOTIFICATION, Constants.TEXT_SERVER_ERROR, new TextComponent(packet.message)));   
+        Minecraft.getInstance().getToasts().addToast(new SystemToast(SystemToastIds.PERIODIC_NOTIFICATION, Constants.TEXT_SERVER_ERROR, TextUtils.text(packet.message)));   
     }
 
     public static void showAdvancedDisplaySettingsScreen(AdvancedDisplayBlockEntity blockEntity) {
@@ -59,11 +59,11 @@ public static void updateLanguage(ELanguage lang, boolean force) {
 
         LanguageInfo info = lang == ELanguage.DEFAULT ? null : Minecraft.getInstance().getLanguageManager().getLanguage(lang.getCode());
         if (info == null) {
-            info = Minecraft.getInstance().getLanguageManager().getSelected();
+            info = Minecraft.getInstance().getLanguageManager().getLanguage(Minecraft.getInstance().getLanguageManager().getSelected());
         }
         currentLanguage = lang;
-        currentClientLanguage = ClientLanguage.loadFrom(Minecraft.getInstance().getResourceManager(), List.of(info));
-        CreateRailwaysNavigator.LOGGER.info("Updated custom language to: " + (info == null ? null : info.getName()));
+        currentClientLanguage = ClientLanguage.loadFrom(Minecraft.getInstance().getResourceManager(), List.of(lang == ELanguage.DEFAULT ? Minecraft.getInstance().getLanguageManager().getSelected() : lang.getCode()), false);
+        CreateRailwaysNavigator.LOGGER.info("Updated custom language to: " + (info == null ? null : info.name()));
     }
 
     public static Language getCurrentClientLanguage() {

common/src/main/java/de/mrjulsen/crn/client/ber/AdvancedDisplayRenderInstance.java

@@ -8,7 +8,7 @@
 import java.util.function.Supplier;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
 
 import de.mrjulsen.crn.block.AbstractAdvancedDisplayBlock;
 import de.mrjulsen.crn.block.AbstractAdvancedSidedDisplayBlock;
@@ -115,22 +115,22 @@ public void render(BlockEntityRendererContext context, AdvancedDisplayBlockEntit
 
             pPoseStack.pushPose();
             pPoseStack.translate(offset.getFirst(), offset.getSecond(), zOffset.getFirst());
-            pPoseStack.mulPose(Vector3f.XP.rotationDegrees(rotation.getFirst()));
-            pPoseStack.mulPose(Vector3f.YP.rotationDegrees(rotation.getSecond()));
-            pPoseStack.mulPose(Vector3f.ZP.rotationDegrees(rotation.getThird()));
+            pPoseStack.mulPose(Axis.XP.rotationDegrees(rotation.getFirst()));
+            pPoseStack.mulPose(Axis.YP.rotationDegrees(rotation.getSecond()));
+            pPoseStack.mulPose(Axis.ZP.rotationDegrees(rotation.getThird()));
             pPoseStack.scale(scale, scale, 1);   
             renderSubtype.renderAdditional(context, pBlockEntity, this, pPartialTicks, pPoseStack, pBufferSource, light, pOverlay, false);
             labels.forEach(x -> x.render(pPoseStack, pBufferSource, light)); 
             pPoseStack.popPose();
 
             if (!(pBlockEntity.getBlockState().getBlock() instanceof AbstractAdvancedSidedDisplayBlock) || pBlockEntity.getBlockState().getValue(AbstractAdvancedSidedDisplayBlock.SIDE) == ESide.BOTH) {
                 pPoseStack.pushPose();
-                pPoseStack.mulPose(Vector3f.YP.rotationDegrees(180));
+                pPoseStack.mulPose(Axis.YP.rotationDegrees(180));
                 pPoseStack.translate(-pBlockEntity.getXSize() * 16, 0, -16);
                 pPoseStack.translate(offset.getFirst(), offset.getSecond(), zOffset.getSecond());
-                pPoseStack.mulPose(Vector3f.XP.rotationDegrees(rotation.getFirst()));
-                pPoseStack.mulPose(Vector3f.YP.rotationDegrees(rotation.getSecond()));
-                pPoseStack.mulPose(Vector3f.ZP.rotationDegrees(rotation.getThird()));
+                pPoseStack.mulPose(Axis.XP.rotationDegrees(rotation.getFirst()));
+                pPoseStack.mulPose(Axis.YP.rotationDegrees(rotation.getSecond()));
+                pPoseStack.mulPose(Axis.ZP.rotationDegrees(rotation.getThird()));
                 pPoseStack.scale(scale, scale, 1);
                 renderSubtype.renderAdditional(context, pBlockEntity, this, pPartialTicks, pPoseStack, pBufferSource, light, pOverlay, true);
                 labels.forEach(x -> x.render(pPoseStack, pBufferSource, light));

common/src/main/java/de/mrjulsen/crn/client/ber/TrainStationClockRenderer.java

@@ -1,7 +1,7 @@
 package de.mrjulsen.crn.client.ber;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
 
 import de.mrjulsen.crn.CreateRailwaysNavigator;
 import de.mrjulsen.crn.block.be.TrainStationClockBlockEntity;
@@ -32,30 +32,30 @@ public void render(BlockEntityRendererContext context, TrainStationClockBlockEnt
         context.renderUtils().renderTexture(DIAL_TEXTURE, pBufferSource, pBlockEntity, pPoseStack, !pBlockEntity.isGlowing(), -7, -7, -0.2f, 14, 14, 0, 0, 1, 1, pBlockEntity.getBlockState().getValue(HorizontalDirectionalBlock.FACING), (0xFF << 24) | (pBlockEntity.getColor()), pBlockEntity.isGlowing() ? LightTexture.FULL_BRIGHT : pPackedLight);
 
         pPoseStack.pushPose();
-        pPoseStack.mulPose(Vector3f.ZP.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 12000)));
+        pPoseStack.mulPose(Axis.ZP.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 12000)));
         context.renderUtils().fillColor(pBufferSource, pBlockEntity, 0xFF191919, pPoseStack, -0.5f, -0.5f, 0, 6, 1, pBlockEntity.getBlockState().getValue(HorizontalDirectionalBlock.FACING), pPackedLight);
         pPoseStack.popPose();
 
         pPoseStack.pushPose();
-        pPoseStack.mulPose(Vector3f.ZP.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 1000)));
+        pPoseStack.mulPose(Axis.ZP.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 1000)));
         context.renderUtils().fillColor(pBufferSource, pBlockEntity, 0xFF222222, pPoseStack, -0.5f, -0.5f, 0.1f, 7, 1, pBlockEntity.getBlockState().getValue(HorizontalDirectionalBlock.FACING), pPackedLight);
         pPoseStack.popPose();
 
         pPoseStack.translate(0, 0, -z * 2);
         pPoseStack.pushPose();
-        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(180));
+        pPoseStack.mulPose(Axis.YP.rotationDegrees(180));
         context.renderUtils().renderTexture(DIAL_TEXTURE, pBufferSource, pBlockEntity, pPoseStack, !pBlockEntity.isGlowing(), -7, -7, -0.2f, 14, 14, 0, 0, 1, 1, pBlockEntity.getBlockState().getValue(HorizontalDirectionalBlock.FACING).getOpposite(), (0xFF << 24) | (pBlockEntity.getColor()), pBlockEntity.isGlowing() ? LightTexture.FULL_BRIGHT : pPackedLight);
         pPoseStack.popPose();
 
         pPoseStack.pushPose();
-        pPoseStack.mulPose(Vector3f.ZN.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 12000)));
-        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(180));
+        pPoseStack.mulPose(Axis.ZN.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 12000)));
+        pPoseStack.mulPose(Axis.YP.rotationDegrees(180));
         context.renderUtils().fillColor(pBufferSource, pBlockEntity, 0xFF191919, pPoseStack, -0.5f, -0.5f, 0, 6, 1, pBlockEntity.getBlockState().getValue(HorizontalDirectionalBlock.FACING), pPackedLight);
         pPoseStack.popPose();
 
         pPoseStack.pushPose();
-        pPoseStack.mulPose(Vector3f.ZN.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 1000)));
-        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(180));
+        pPoseStack.mulPose(Axis.ZN.rotationDegrees(-90 + ModUtils.clockHandDegrees(pBlockEntity.getLevel().getDayTime() + DragonLib.DAYTIME_SHIFT, 1000)));
+        pPoseStack.mulPose(Axis.YP.rotationDegrees(180));
         context.renderUtils().fillColor(pBufferSource, pBlockEntity, 0xFF222222, pPoseStack, -0.5f, -0.5f, 0.1f, 7, 1, pBlockEntity.getBlockState().getValue(HorizontalDirectionalBlock.FACING), pPackedLight);
         pPoseStack.popPose();
     }

common/src/main/java/de/mrjulsen/crn/client/ber/base/BERText.java

@@ -253,7 +253,7 @@ private void renderTextInBounds(PoseStack pPoseStack, FontUtils fontUtils, Multi
 
         for (int i = 0; i < text.getString().length(); i++) {
             int charCode = text.getString().charAt(i);
-            GlyphInfo info = fontUtils.fontSet.getGlyphInfo(charCode);
+            GlyphInfo info = fontUtils.fontSet.getGlyphInfo(charCode, false);
             float glyphWidth = info.getAdvance(text.getStyle().isBold());
             float oldX = newX;
             newX += glyphWidth;

common/src/main/java/de/mrjulsen/crn/client/gui/ModGuiIcons.java

@@ -7,7 +7,7 @@
 
 import de.mrjulsen.crn.CreateRailwaysNavigator;
 import de.mrjulsen.mcdragonlib.client.util.Graphics;
-import de.mrjulsen.mcdragonlib.client.util.GuiUtils;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 
 public enum ModGuiIcons {
@@ -90,19 +90,29 @@ public AllIcons getAsCreateIcon() {
     }
 
     public void render(Graphics graphics, int x, int y) {
-        GuiUtils.drawTexture(ModGuiIcons.ICON_LOCATION, graphics, x, y, getU(), getV(), ICON_SIZE, ICON_SIZE);
+        graphics.graphics().blit(ModGuiIcons.ICON_LOCATION, x, y, getU(), getV(), ICON_SIZE, ICON_SIZE);
     }
 
     public static class ModAllIcons extends AllIcons {
 
+        int u, v;
+
         public ModAllIcons(int x, int y) {
             super(x, y);
+            this.u = x * ICON_SIZE;
+            this.v = y * ICON_SIZE;
+        }
+
+
+
+        @Override
+        public void render(GuiGraphics graphics, int x, int y) {
+            graphics.blit(ICON_LOCATION, x, y, 0, u, v, ICON_SIZE, ICON_SIZE, 256, 256);
         }
 
         @Override
         public void bind() {
             RenderSystem.setShaderTexture(0, ICON_LOCATION);
-        }
-
+        }        
     }
 }