maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Segmented Display crashing server

Browse Source
This commit is contained in:
Jesse
2025-08-16 12:15:56 +02:00
parent 0e25c65734
commit 65bb195487
3 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayBlockEntity.java
View File

@@ -72,11 +72,11 @@ public class SegmentedDisplayBlockEntity extends ElectricBlockEntity {
customText = Optional.empty();
}
public List<Integer> getSegments(){
List<Integer> segments = SegmentedDisplayRenderer.SYMBOLS_TO_SEGMENTS.get(getDisplayedStrings().get(true).toLowerCase());
List<Integer> segments = SegmentedDisplaySegments.SYMBOLS_TO_SEGMENTS.get(getDisplayedStrings().get(true).toLowerCase());
List<Integer> segments2 = SegmentedDisplayRenderer.SYMBOLS_TO_SEGMENTS.get(getDisplayedStrings().get(false).toLowerCase());
List<Integer> segments2 = SegmentedDisplaySegments.SYMBOLS_TO_SEGMENTS.get(getDisplayedStrings().get(false).toLowerCase());
if(segments2 == null)
segments2 = new ArrayList<>();

67
src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java
View File

@@ -60,74 +60,7 @@ public class SegmentedDisplayRenderer extends SafeBlockEntityRenderer<SegmentedD
}
public static Map<String, List<Integer>> SYMBOLS_TO_SEGMENTS= new HashMap<>();
static {
//
put(0,1,2,3,5,6,7);
put(1,1,2);
put(2,3,6,4,2,5);
put(3,3,4,5,6,7);
put(4,1,4,6,7);
put(5,1,3,4,5,7);
put(6,1,2,3,4,5,7);
put(7,7,6,3);
put(8,1,2,3,4,5,6,7);
put(9,1,3,4,6,7);
put(":",0);
put("a",1,2,3,4,6,7);
put("b",1,2,4,5,7);
put("c",1,2,3,5);
put("d",2,4,5,6,7);
put("e",1,2,3,4,5);
put("f",1,2,3,4);
put("g",1,2,3,5,7);
put("h",1,2,4,6,7);
put("i",1,2);
put("j",6,7,5,2);
put("k",1,2,9,10);
put("l",1,2,5);
put("m",1,2,6,7,8);
put("n",2,7,10);
put("o",1,2,6,7,3,5);
put("p",1,2,3,4,6);
put("q",1,3,4,6,7);
put("r",1,2,3,4,6,10);
put("s",1,3,4,5,7);
put("t",1,2,4,5);
put("u",2,5,7);
put("v",1,2,5,6,7);
put("w",1,2,4,5,6,7);
put("x",1,2,4,6,7);
put("y",1,4,6,7,5);
put("z",3,9,4);
}
public static void put(int number, Integer... segments){
put(String.valueOf(number),segments);
}
private static void put(String string, Integer... segments){
SYMBOLS_TO_SEGMENTS.put(string, Arrays.asList(segments));
List<Integer> segments2 = new ArrayList<>();
for (Integer segment : segments){
if(segment == 0)
break;
segments2.add(10+segment);
}
SYMBOLS_TO_SEGMENTS.put(string, segments2);
}
}

74
src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplaySegments.java Normal file
View File

@@ -0,0 +1,74 @@
package com.drmangotea.tfmg.content.electricity.utilities.segmented_display;
import java.util.*;
public class SegmentedDisplaySegments {
public static Map<String, List<Integer>> SYMBOLS_TO_SEGMENTS= new HashMap<>();
static {
//
put(0,1,2,3,5,6,7);
put(1,1,2);
put(2,3,6,4,2,5);
put(3,3,4,5,6,7);
put(4,1,4,6,7);
put(5,1,3,4,5,7);
put(6,1,2,3,4,5,7);
put(7,7,6,3);
put(8,1,2,3,4,5,6,7);
put(9,1,3,4,6,7);
put(":",0);
put("a",1,2,3,4,6,7);
put("b",1,2,4,5,7);
put("c",1,2,3,5);
put("d",2,4,5,6,7);
put("e",1,2,3,4,5);
put("f",1,2,3,4);
put("g",1,2,3,5,7);
put("h",1,2,4,6,7);
put("i",1,2);
put("j",6,7,5,2);
put("k",1,2,9,10);
put("l",1,2,5);
put("m",1,2,6,7,8);
put("n",2,7,10);
put("o",1,2,6,7,3,5);
put("p",1,2,3,4,6);
put("q",1,3,4,6,7);
put("r",1,2,3,4,6,10);
put("s",1,3,4,5,7);
put("t",1,2,4,5);
put("u",2,5,7);
put("v",1,2,5,6,7);
put("w",1,2,4,5,6,7);
put("x",1,2,4,6,7);
put("y",1,4,6,7,5);
put("z",3,9,4);
}
public static void put(int number, Integer... segments){
put(String.valueOf(number),segments);
}
private static void put(String string, Integer... segments){
SYMBOLS_TO_SEGMENTS.put(string, Arrays.asList(segments));
List<Integer> segments2 = new ArrayList<>();
for (Integer segment : segments){
if(segment == 0)
break;
segments2.add(10+segment);
}
SYMBOLS_TO_SEGMENTS.put(string, segments2);
}
}