add new feats to 1.18

.github/workflows/gradle.yml

@@ -30,7 +30,7 @@ jobs:
     if: endswith(github.ref_name, 'master') && github.ref_protected && github.ref_type == 'branch'
     runs-on: ubuntu-latest
     env:
-      APPVEYOR_BUILD_VERSION: '3.2.0'
+      APPVEYOR_BUILD_VERSION: '3.3.0'
       CURSETOKEN: ${{ secrets.CURSETOKEN }}
     steps:
     - uses: actions/checkout@v3

build.gradle

@@ -78,6 +78,7 @@ minecraft {
 dependencies {   
     minecraft 'net.minecraftforge:forge:1.18.2-40.1.86'
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 test {

changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.18.2 - 3.3.0]
+
+* feat: new SignalFile system (V2) now in world folder and migration from old system
+* feat: added train number system
+* feat: added train number changing block
+* fix: issue with reverse reset and rerequest of PW
+* fix: missing models
+* fix: scroll in Info&Help page
+* fix: issue with next PWs
+* fix: visual signal feedback in signalbox
+* fix: issue in UIPreview
+
+**When starting the world for the first time, the migration of the SignalFiles may take a moment.**
+
 ## [1.18.2 - 3.2.0]
 
 * feat: added customName to signalcontroller

src/main/java/com/troblecodings/signals/blocks/Signal.java

@@ -40,6 +40,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
@@ -370,8 +371,8 @@ public InteractionResult use(final BlockState blockstate, final Level level,
         }
         final SignalStateInfo stateInfo = new SignalStateInfo(level, blockPos, this);
         final boolean customname = canHaveCustomname(SignalStateHandler.getStates(stateInfo));
-        if (placer.getItemInHand(InteractionHand.MAIN_HAND).getItem().equals(OSItems.MANIPULATOR)
-                && (canBeLinked() || customname)) {
+        final Item item = placer.getItemInHand(InteractionHand.MAIN_HAND).getItem();
+        if (item.equals(OSItems.MANIPULATOR) && (canBeLinked() || customname)) {
             OpenSignalsMain.handler.invokeGui(Signal.class, placer, level, blockPos, "signal");
             return InteractionResult.SUCCESS;
         }

src/main/java/com/troblecodings/signals/blocks/TrainNumberBlock.java

@@ -0,0 +1,78 @@
+package com.troblecodings.signals.blocks;
+
+import java.util.Optional;
+
+import com.troblecodings.signals.OpenSignalsMain;
+import com.troblecodings.signals.core.TileEntitySupplierWrapper;
+import com.troblecodings.signals.init.OSItems;
+import com.troblecodings.signals.tileentitys.TrainNumberTileEntity;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition.Builder;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.phys.BlockHitResult;
+
+public class TrainNumberBlock extends BasicBlock {
+
+    public static final BooleanProperty POWERD = BooleanProperty.create("powerd");
+    public static final TileEntitySupplierWrapper WRAPPER = TrainNumberTileEntity::new;
+
+    public TrainNumberBlock() {
+        super(Properties.of(Material.STONE));
+    }
+
+    @Override
+    protected void createBlockStateDefinition(final Builder<Block, BlockState> builder) {
+        builder.add(POWERD);
+    }
+
+    @Override
+    public void neighborChanged(final BlockState state, final Level world, final BlockPos pos,
+            final Block block, final BlockPos toPos, final boolean moveing) {
+        if (world.isClientSide)
+            return;
+        if (world.hasNeighborSignal(pos)) {
+            if (!state.getValue(POWERD)) {
+                world.setBlockAndUpdate(pos, state.setValue(POWERD, true));
+                final BlockEntity entity = world.getBlockEntity(pos);
+                if (entity instanceof TrainNumberTileEntity) {
+                    ((TrainNumberTileEntity) entity).updateTrainNumberViaRedstone();
+                }
+            }
+        } else {
+            world.setBlockAndUpdate(pos, state.setValue(POWERD, false));
+        }
+    }
+
+    @Override
+    public InteractionResult use(final BlockState state, final Level world, final BlockPos pos,
+            final Player player, final InteractionHand hand, final BlockHitResult result) {
+        final Item item = player.getMainHandItem().getItem();
+        if (!(item.equals(OSItems.LINKING_TOOL) && item.equals(OSItems.MULTI_LINKING_TOOL))) {
+            OpenSignalsMain.handler.invokeGui(TrainNumberBlock.class, player, world, pos,
+                    "pathwayrequester");
+            return InteractionResult.SUCCESS;
+        }
+        return InteractionResult.FAIL;
+    }
+
+    @Override
+    public Optional<TileEntitySupplierWrapper> getSupplierWrapper() {
+        return Optional.of(WRAPPER);
+    }
+
+    @Override
+    public Optional<String> getSupplierWrapperName() {
+        return Optional.of("trainnumberchanger");
+    }
+
+}

src/main/java/com/troblecodings/signals/config/ConfigHandler.java

@@ -45,6 +45,7 @@ public static class Client {
         public final ConfigValue<Integer> signalboxSelectColor;
         public final ConfigValue<Integer> signalboxUsedColor;
         public final ConfigValue<Integer> signalboxPreparedColor;
+        public final ConfigValue<Integer> signalboxTrainNumberColor;
 
         public Client(final ForgeConfigSpec.Builder builder) {
             String desc;
@@ -68,6 +69,10 @@ public Client(final ForgeConfigSpec.Builder builder) {
             signalboxPreparedColor = builder.comment(desc).define("Signalbox prepared color",
                     0xffff00);
 
+            desc = "Change the color of the TrainNumber in the UI. Default: -1";
+            signalboxTrainNumberColor = builder.comment(desc).define("Signalbox TrainNumber color",
+                    0xFFFFFFFF);
+
             desc = "Change the color of a default text. Default: -16777216";
             GuiConfigHandler.basicTextColor = builder.comment(desc).define("Basic text color",
                     0xFF000000);

src/main/java/com/troblecodings/signals/core/PathGetter.java

@@ -0,0 +1,31 @@
+package com.troblecodings.signals.core;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.Level;
+
+public final class PathGetter {
+
+    private PathGetter() {
+
+    }
+
+    public static Path getNewPathForFiles(final Level world, final String subDirectory) {
+        final MinecraftServer server = world.getServer();
+        Path path = Paths.get("osfiles");
+        if (!world.isClientSide && server != null && server.isDedicatedServer()) {
+            path = Paths.get(world.getServer().getWorldData().getLevelName().replace("/", "_")
+                    .replace(".", "_") + "/osfiles/" + subDirectory + "/"
+                    + world.dimension().location().toString().replace(":", ""));
+        } else if (!world.isClientSide && (server == null || !server.isDedicatedServer())) {
+            path = Paths.get("saves/"
+                    + world.getServer().getWorldData().getLevelName().replace("/", "_").replace(".",
+                            "_")
+                    + "/osfiles/" + subDirectory + "/"
+                    + world.dimension().location().toString().replace(":", ""));
+        }
+        return path;
+    }
+}

src/main/java/com/troblecodings/signals/core/TrainNumber.java

@@ -0,0 +1,62 @@
+package com.troblecodings.signals.core;
+
+import java.util.Objects;
+
+import com.troblecodings.core.NBTWrapper;
+import com.troblecodings.core.ReadBuffer;
+import com.troblecodings.core.WriteBuffer;
+
+public class TrainNumber {
+
+    private static final String TRAIN_NUMBER = "trainNumber";
+    public static final TrainNumber DEFAULT = new TrainNumber();
+
+    public final String trainNumber;
+
+    private TrainNumber() {
+        this("");
+    }
+
+    public TrainNumber(final String trainNumber) {
+        this.trainNumber = trainNumber;
+    }
+
+    public static TrainNumber of(final ReadBuffer buffer) {
+        return new TrainNumber(buffer.getString());
+    }
+
+    public static TrainNumber of(final NBTWrapper wrapper) {
+        return new TrainNumber(wrapper.getString(TRAIN_NUMBER));
+    }
+
+    public void writeTag(final NBTWrapper wrapper) {
+        wrapper.putString(TRAIN_NUMBER, trainNumber);
+    }
+
+    public void writeNetwork(final WriteBuffer buffer) {
+        buffer.putString(trainNumber);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(trainNumber);
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final TrainNumber other = (TrainNumber) obj;
+        return Objects.equals(trainNumber, other.trainNumber);
+    }
+
+    @Override
+    public String toString() {
+        return trainNumber;
+    }
+
+}

src/main/java/com/troblecodings/signals/enums/EnumGuiMode.java

@@ -35,31 +35,31 @@ private EnumGuiMode(final int id, final boolean unused) {
         this((state) -> {
             switch (state) {
                 case GREEN: {
-                    return new UITexture(UISignalBoxTile.SIGNALS, id * 0.067f, 0,
-                            id * 0.067f + 0.06f, 1);
+                    return new UITexture(UISignalBoxTile.SIGNALS, id * 0.0667f, 0,
+                            id * 0.066667f + 0.06f, 1);
                 }
                 case RED: {
-                    return new UITexture(UISignalBoxTile.SIGNALS, id * 0.067f + 3 * 0.067f, 0,
-                            id * 0.067f + 3 * 0.067f + 0.06f, 1);
+                    return new UITexture(UISignalBoxTile.SIGNALS, id * 0.067f + 3 * 0.0666667f, 0,
+                            id * 0.066667f + 3 * 0.067f + 0.06f, 1);
                 }
                 case OFF: {
-                    return new UITexture(UISignalBoxTile.SIGNALS, id * 0.067f + 6 * 0.067f, 0,
-                            id * 0.067f + 6 * 0.067f + 0.06f, 1);
+                    return new UITexture(UISignalBoxTile.SIGNALS, id * 0.067f + 6 * 0.0666667f, 0,
+                            id * 0.066667f + 6 * 0.067f + 0.06f, 1);
                 }
                 case SUBSIDIARY_GREEN: {
                     final int factor = 9;
-                    return new UITexture(UISignalBoxTile.SIGNALS, (id + factor) * 0.067f, 0,
-                            id * 0.067f + factor * 0.067f + 0.06f, 1);
+                    return new UITexture(UISignalBoxTile.SIGNALS, (id + factor) * 0.0666667f, 0,
+                            id * 0.066667f + factor * 0.067f + 0.06f, 1);
                 }
                 case SUBSIDIARY_RED: {
                     final int factor = 10;
-                    return new UITexture(UISignalBoxTile.SIGNALS, (id + factor) * 0.067f, 0,
-                            (id + factor) * 0.067f + 0.06f, 1);
+                    return new UITexture(UISignalBoxTile.SIGNALS, (id + factor) * 0.0666667f, 0,
+                            (id + factor) * 0.066667f + 0.06f, 1);
                 }
                 case SUBSIDIARY_OFF: {
                     final int factor = 11;
-                    return new UITexture(UISignalBoxTile.SIGNALS, (id + factor) * 0.067f, 0,
-                            (id + factor) * 0.067f + 0.06f, 1);
+                    return new UITexture(UISignalBoxTile.SIGNALS, (id + factor) * 0.0666667f, 0,
+                            (id + factor) * 0.066667f + 0.06f, 1);
                 }
                 default:
                     return new UITexture(UISignalBoxTile.SIGNALS);

src/main/java/com/troblecodings/signals/enums/SignalBoxNetwork.java

@@ -6,6 +6,6 @@ public enum SignalBoxNetwork {
     SEND_PW_UPDATE, RESET_ALL_PW, SEND_CHANGED_MODES, REQUEST_LINKED_POS, NO_PW_FOUND,
     REQUEST_SUBSIDIARY, SEND_ZS2_ENTRY, UPDATE_RS_OUTPUT, OUTPUT_UPDATE, RESET_SUBSIDIARY,
     SET_AUTO_POINT, SEND_NAME, SEND_SIGNAL_REPEATER, ADDED_TO_SAVER, REMOVE_SAVEDPW,
-    SEND_POINT_ENTRY, SET_SIGNALS, SEND_COUNTER;
+    SEND_POINT_ENTRY, SET_SIGNALS, SEND_COUNTER, SEND_TRAIN_NUMBER;
 
 }