EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Removes unused frameTypes variable

Browse Source
This commit is contained in:
Kristian Knarvik
2023-03-24 23:46:21 +01:00
parent 454bac6f14
commit 10a16000c6
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/knarcraft/stargate/portal/property/gate/GateHandler.java
View File

@@ -11,11 +11,9 @@ import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
import static net.knarcraft.stargate.utility.GateReader.generateLayoutMatrix;
import static net.knarcraft.stargate.utility.GateReader.readGateConfig;
@@ -134,7 +132,6 @@ public class GateHandler {
Map<Character, Material> characterMaterialMap = new HashMap<>();
Map<Character, Tag<Material>> characterTagMap = new HashMap<>();
Map<String, String> config = new HashMap<>();
Set<Material> frameTypes = new HashSet<>();
//Initialize character to material map
characterMaterialMap.put(ENTRANCE, Material.AIR);
@@ -142,7 +139,7 @@ public class GateHandler {
characterMaterialMap.put(ANYTHING, Material.AIR);
//Read the file into appropriate lists and maps
int columns = readGateFile(scanner, characterMaterialMap, characterTagMap, fileName, design, frameTypes, config);
int columns = readGateFile(scanner, characterMaterialMap, characterTagMap, fileName, design, config);
if (columns < 0) {
return null;
}

11
src/main/java/net/knarcraft/stargate/utility/GateReader.java
View File

@@ -10,7 +10,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
/**
* Helper class for reading gate files
@@ -29,13 +28,12 @@ public final class GateReader {
* @param materialTagMap <p>The map of characters to store valid tag symbols in</p>
* @param fileName <p>The filename of the loaded gate config file</p>
* @param design <p>The list to store the loaded design/layout to</p>
* @param frameTypes <p>The set to store frame/border materials to</p>
* @param config <p>The map of config values to store to</p>
* @return <p>The column count/width of the loaded gate</p>
*/
public static int readGateFile(Scanner scanner, Map<Character, Material> characterMaterialMap,
Map<Character, Tag<Material>> materialTagMap, String fileName,
List<List<Character>> design, Set<Material> frameTypes, Map<String, String> config) {
List<List<Character>> design, Map<String, String> config) {
boolean designing = false;
int columns = 0;
try {
@@ -51,7 +49,7 @@ public final class GateReader {
} else {
if (!line.isEmpty() && !line.startsWith("#")) {
//Read a normal config value
readGateConfigValue(line, characterMaterialMap, materialTagMap, frameTypes, config);
readGateConfigValue(line, characterMaterialMap, materialTagMap, config);
} else if ((line.isEmpty()) || (!line.contains("=") && !line.startsWith("#"))) {
//An empty line marks the start of the gate's layout/design
designing = true;
@@ -115,12 +113,11 @@ public final class GateReader {
* @param line <p>The line to read</p>
* @param characterMaterialMap <p>The character to material map to store to</p>
* @param materialTagMap <p>The character to material tag map to store to</p>
* @param frameTypes <p>The set to store gate frame/border types to</p>
* @param config <p>The config value map to store to</p>
* @throws Exception <p>If an invalid material is encountered</p>
*/
private static void readGateConfigValue(String line, Map<Character, Material> characterMaterialMap,
Map<Character, Tag<Material>> materialTagMap, Set<Material> frameTypes,
Map<Character, Tag<Material>> materialTagMap,
Map<String, String> config) throws Exception {
String[] split = line.split("=");
String key = split[0].trim();
@@ -143,8 +140,6 @@ public final class GateReader {
if (material != null) {
//Register the map between the read symbol and the corresponding material
characterMaterialMap.put(symbol, material);
//Save the material as one of the frame materials used for this kind of gate
frameTypes.add(material);
return;
}
}