+3 -1

src/main/java/app/Directories.java

reviewed

··· 159 159 } 160 160 161 161 public static String getDumpPath() 162 162 - { return dumpPath; } 162 162 + { 163 163 + return dumpPath; 164 164 + } 163 165 164 166 public static void setProjectDirectory(String path) 165 167 {

+3 -1

src/main/java/app/Resource.java

reviewed

··· 42 42 } 43 43 44 44 private String getPath() 45 45 - { return path; } 45 45 + { 46 46 + return path; 47 47 + } 46 48 } 47 49 48 50 private static InputStream resolveResourceToStream(ResourceType type, String resourceName)

+1 -1

src/main/java/app/RomValidator.java

reviewed

··· 91 91 /* 92 92 String extension = path.substring(path.lastIndexOf(".")); 93 93 path = path.substring(0, path.lastIndexOf(".")); 94 94 - 94 94 + 95 95 if(extension.equals("n64")) 96 96 swapped = new File(path + ".z64"); 97 97 else

+6 -2

src/main/java/app/Themes.java

reviewed

··· 43 43 } 44 44 45 45 public static String getCurrentThemeKey() 46 46 - { return currentTheme.key; } 46 46 + { 47 47 + return currentTheme.key; 48 48 + } 47 49 48 50 public static String getCurrentThemeName() 49 49 - { return currentTheme.name; } 51 51 + { 52 52 + return currentTheme.name; 53 53 + } 50 54 51 55 public static List<String> getThemeNames() 52 56 {

+6 -2

src/main/java/app/input/AnonymousSource.java

reviewed

··· 19 19 20 20 @Override 21 21 public File getFile() 22 22 - { return null; } 22 22 + { 23 23 + return null; 24 24 + } 23 25 24 26 @Override 25 27 public String getName() 26 26 - { return "Anonymous"; } 28 28 + { 29 29 + return "Anonymous"; 30 30 + } 27 31 }

+6 -2

src/main/java/app/input/DummySource.java

reviewed

··· 13 13 14 14 @Override 15 15 public File getFile() 16 16 - { return null; } 16 16 + { 17 17 + return null; 18 18 + } 17 19 18 20 @Override 19 21 public String getName() 20 20 - { return name; } 22 22 + { 23 23 + return name; 24 24 + } 21 25 }

+6 -2

src/main/java/app/input/FileSource.java

reviewed

··· 13 13 14 14 @Override 15 15 public String getName() 16 16 - { return (file == null) ? "null" : file.getName(); } 16 16 + { 17 17 + return (file == null) ? "null" : file.getName(); 18 18 + } 17 19 18 20 @Override 19 21 public File getFile() 20 20 - { return file; } 22 22 + { 23 23 + return file; 24 24 + } 21 25 }

+3 -1

src/main/java/app/input/InputFileException.java

reviewed

··· 145 145 } 146 146 147 147 public File getSourceFile() 148 148 - { return source; } 148 148 + { 149 149 + return source; 150 150 + } 149 151 }

+3 -1

src/main/java/app/input/PatchFileParser.java

reviewed

··· 67 67 int parenDepth = 0; 68 68 69 69 private List<PatchUnit> getResults() 70 70 - { return units; } 70 70 + { 71 71 + return units; 72 72 + } 71 73 72 74 private PatchFileParser(List<Line> lines) 73 75 {

+6 -2

src/main/java/app/input/StreamSource.java

reviewed

··· 13 13 14 14 @Override 15 15 public String getName() 16 16 - { return name; } 16 16 + { 17 17 + return name; 18 18 + } 17 19 18 20 @Override 19 21 public File getFile() 20 20 - { return null; } 22 22 + { 23 23 + return null; 24 24 + } 21 25 }

+3 -1

src/main/java/app/input/Token.java

reviewed

··· 48 48 } 49 49 50 50 public int getIntValue() throws InvalidInputException 51 51 - { return DataUtils.parseIntString(str); } 51 51 + { 52 52 + return DataUtils.parseIntString(str); 53 53 + } 52 54 53 55 public int getHexValue() throws InvalidInputException 54 56 {

+12 -4

src/main/java/assets/AssetManager.java

reviewed

··· 15 15 public class AssetManager 16 16 { 17 17 public static File getTopLevelAssetDir() 18 18 - { return Environment.assetDirectories.get(0); } 18 18 + { 19 19 + return Environment.assetDirectories.get(0); 20 20 + } 19 21 20 22 public static File getBaseAssetDir() 21 23 { ··· 50 52 } 51 53 52 54 public static File getTexBuildDir() 53 53 - { return AssetSubdir.MAP_TEX.getModDir(); } 55 55 + { 56 56 + return AssetSubdir.MAP_TEX.getModDir(); 57 57 + } 54 58 55 59 public static AssetHandle getMap(String mapName) 56 60 { ··· 63 67 } 64 68 65 69 public static File getMapBuildDir() 66 66 - { return AssetSubdir.MAP_GEOM.getModDir(); } 70 70 + { 71 71 + return AssetSubdir.MAP_GEOM.getModDir(); 72 72 + } 67 73 68 74 public static AssetHandle getBackground(String bgName) 69 75 { ··· 71 77 } 72 78 73 79 public static File getBackgroundBuildDir() 74 74 - { return AssetSubdir.MAP_BG.getModDir(); } 80 80 + { 81 81 + return AssetSubdir.MAP_BG.getModDir(); 82 82 + } 75 83 76 84 public static AssetHandle getNpcSprite(String spriteName) 77 85 {

+6 -2

src/main/java/assets/AssetSubdir.java

reviewed

··· 54 54 } 55 55 56 56 public File getBaseDir() 57 57 - { return get(AssetManager.getBaseAssetDir()); } 57 57 + { 58 58 + return get(AssetManager.getBaseAssetDir()); 59 59 + } 58 60 59 61 public File getModDir() 60 60 - { return get(AssetManager.getTopLevelAssetDir()); } 62 62 + { 63 63 + return get(AssetManager.getTopLevelAssetDir()); 64 64 + } 61 65 62 66 @Override 63 67 public String toString()

+3 -1

src/main/java/assets/ExpectedAsset.java

reviewed

··· 46 46 } 47 47 48 48 public String getPath() 49 49 - { return subdir.toString() + path; } 49 49 + { 50 50 + return subdir.toString() + path; 51 51 + } 50 52 }

+6 -2

src/main/java/assets/ui/SelectBackgroundDialog.java

reviewed

··· 172 172 } 173 173 174 174 private void setValue(BackgroundAsset object) 175 175 - { selectedObject = object; } 175 175 + { 176 176 + selectedObject = object; 177 177 + } 176 178 177 179 private File getSelectedFile() 178 178 - { return selectedObject; } 180 180 + { 181 181 + return selectedObject; 182 182 + } 179 183 }

+6 -2

src/main/java/assets/ui/SelectTexDialog.java

reviewed

··· 188 188 } 189 189 190 190 private void setValue(TexturesAsset object) 191 191 - { selectedObject = object; } 191 191 + { 192 192 + selectedObject = object; 193 193 + } 192 194 193 195 private File getSelectedFile() 194 194 - { return selectedObject; } 196 196 + { 197 197 + return selectedObject; 198 198 + } 195 199 }

+1 -1

src/main/java/assets/ui/TexturesAsset.java

reviewed

··· 46 46 sizeMap.put(getImageSize(imgFile), imgFile); 47 47 } 48 48 images = sizeMap.values(); 49 49 - 49 49 + 50 50 List<File> list = new ArrayList<>(images); 51 51 Collections.reverse(list); 52 52 */

+6 -2

src/main/java/game/DecompEnum.java

reviewed

··· 157 157 } 158 158 159 159 public List<String> getValueList() 160 160 - { return new ArrayList<>(decodeMap.values()); } 160 160 + { 161 161 + return new ArrayList<>(decodeMap.values()); 162 162 + } 161 163 162 164 public String getName(int id) 163 165 { ··· 170 172 } 171 173 172 174 public Collection<Entry<String, Integer>> getEntries() 173 173 - { return encodeMap.entrySet(); } 175 175 + { 176 176 + return encodeMap.entrySet(); 177 177 + } 174 178 175 179 public static void printNode(IASTNode node) throws ExpansionOverlapsBoundaryException 176 180 {

+9 -3

src/main/java/game/ProjectDatabase.java

reviewed

··· 77 77 } 78 78 79 79 public static List<String> getSavedFlagNames() 80 80 - { return savedFlags; } 80 80 + { 81 81 + return savedFlags; 82 82 + } 81 83 82 84 public static List<String> getSavedByteNames() 83 83 - { return savedBytes; } 85 85 + { 86 86 + return savedBytes; 87 87 + } 84 88 85 89 private static final Matcher SavedVarMatcher = Pattern.compile("\\s*(\\w+)\\s*=.+").matcher(""); 86 90 ··· 98 102 } 99 103 100 104 public static List<SimpleItem> getItemList() 101 101 - { return new ArrayList<>(items); } 105 105 + { 106 106 + return new ArrayList<>(items); 107 107 + } 102 108 103 109 public static Integer getItemID(String name) 104 110 {

+9 -3

src/main/java/game/ScriptVariable.java

reviewed

··· 81 81 } 82 82 83 83 public String getTypeName() 84 84 - { return name; } 84 84 + { 85 85 + return name; 86 86 + } 85 87 86 88 public int getMaxIndex() 87 87 - { return max; } 89 89 + { 90 90 + return max; 91 91 + } 88 92 89 93 public int getOffset() 90 90 - { return offset; } 94 94 + { 95 95 + return offset; 96 96 + } 91 97 92 98 private static final Pattern VarOffsetPattern = Pattern.compile("\\*(\\w+)\\[([\\-\\+]?[\\.0-9A-Fa-f]+['`]?)\\]"); 93 99 private static final Matcher VarOffsetMatcher = VarOffsetPattern.matcher("");

+16 -6

src/main/java/game/entity/EntityModel.java

reviewed

··· 244 244 } 245 245 246 246 public Vector3f getVector() 247 247 - { return new Vector3f(fx, fy, fz); } 247 247 + { 248 248 + return new Vector3f(fx, fy, fz); 249 249 + } 248 250 249 251 /* 250 252 public Vector3f getWorldVector(float yaw, float dx, float dy, float dz) ··· 252 254 double yawRad = Math.toRadians(yaw); 253 255 float sinYaw = (float)Math.sin(yawRad); 254 256 float cosYaw = (float)Math.cos(yawRad); 255 255 - 257 257 + 256 258 return new Vector3f( 257 259 dx + cosYaw * fx + sinYaw * fz, 258 260 dy + fy, ··· 618 620 619 621 @Override 620 622 public RenderMode getRenderMode() 621 621 - { return part.renderMode; } 623 623 + { 624 624 + return part.renderMode; 625 625 + } 622 626 623 627 @Override 624 628 public Vector3f getCenterPoint() 625 625 - { return new Vector3f(x, y, z); } 629 629 + { 630 630 + return new Vector3f(x, y, z); 631 631 + } 626 632 627 633 @Override 628 634 public void render(RenderingOptions opts, BaseCamera camera) ··· 650 656 651 657 @Override 652 658 public void setDepth(int normalizedDepth) 653 653 - { depth = normalizedDepth; } 659 659 + { 660 660 + depth = normalizedDepth; 661 661 + } 654 662 655 663 @Override 656 664 public int getDepth() 657 657 - { return depth; } 665 665 + { 666 666 + return depth; 667 667 + } 658 668 } 659 669 }

+6 -2

src/main/java/game/f3dex2/BaseF3DEX2.java

reviewed

··· 44 44 } 45 45 46 46 public String getName() 47 47 - { return type.opName; } 47 47 + { 48 48 + return type.opName; 49 49 + } 48 50 49 51 public void setSegment(int segment) 50 50 - { this.segment = segment; } 52 52 + { 53 53 + this.segment = segment; 54 54 + } 51 55 52 56 // return the final version with opcodes 53 57 public int[] assemble()

+3 -1

src/main/java/game/f3dex2/NoArg.java

reviewed

··· 17 17 18 18 @Override 19 19 public String getString() 20 20 - { return getName(); } 20 20 + { 21 21 + return getName(); 22 22 + } 21 23 }

+3 -1

src/main/java/game/f3dex2/commands/BranchZ.java

reviewed

··· 64 64 65 65 @Override 66 66 public String getString() 67 67 - { return String.format("%-16s (%08X, %d`, %08X)", getName(), addr, vidx, zval); } 67 67 + { 68 68 + return String.format("%-16s (%08X, %d`, %08X)", getName(), addr, vidx, zval); 69 69 + } 68 70 }

+3 -1

src/main/java/game/f3dex2/commands/CullDL.java

reviewed

··· 69 69 70 70 @Override 71 71 public String getString() 72 72 - { return String.format("%-16s (%2d`, %2d`)", getName(), start, end); } 72 72 + { 73 73 + return String.format("%-16s (%2d`, %2d`)", getName(), start, end); 74 74 + } 73 75 }

+3 -1

src/main/java/game/f3dex2/commands/NewDL.java

reviewed

··· 62 62 63 63 @Override 64 64 public String getString() 65 65 - { return String.format("%-16s (%s, %08X)", getName(), opt[jump ? 1 : 0], addr); } 65 65 + { 66 66 + return String.format("%-16s (%s, %08X)", getName(), opt[jump ? 1 : 0], addr); 67 67 + } 66 68 }

+3 -1

src/main/java/game/f3dex2/commands/PopMatrix.java

reviewed

··· 37 37 38 38 @Override 39 39 public String getString() 40 40 - { return String.format("%-16s (%d`)", getName(), num); } 40 40 + { 41 41 + return String.format("%-16s (%d`)", getName(), num); 42 42 + } 41 43 }

+3 -1

src/main/java/game/f3dex2/commands/Quad.java

reviewed

··· 75 75 76 76 @Override 77 77 public String getString() 78 78 - { return String.format("%-16s (%2d`, %2d`, %2d`, %2d`)", getName(), v1, v2, v3, v4); } 78 78 + { 79 79 + return String.format("%-16s (%2d`, %2d`, %2d`, %2d`)", getName(), v1, v2, v3, v4); 80 80 + } 79 81 }

+3 -1

src/main/java/game/f3dex2/commands/SetBuffer.java

reviewed

··· 36 36 37 37 @Override 38 38 public String getString() 39 39 - { return String.format("%-16s (%08X)", getName(), addr); } 39 39 + { 40 40 + return String.format("%-16s (%08X)", getName(), addr); 41 41 + } 40 42 }

+3 -1

src/main/java/game/f3dex2/commands/SetColor.java

reviewed

··· 50 50 51 51 @Override 52 52 public String getString() 53 53 - { return String.format("%-16s (%d`, %d`, %d`, %d`)", getName(), R, G, B, A); } 53 53 + { 54 54 + return String.format("%-16s (%d`, %d`, %d`, %d`)", getName(), R, G, B, A); 55 55 + } 54 56 }

+3 -1

src/main/java/game/f3dex2/commands/SetConvert.java

reviewed

··· 66 66 67 67 @Override 68 68 public String getString() 69 69 - { return String.format("%-16s (%d`, %d`, %d`, %d`, %d`, %d`)", getName(), A, B, C, D, E, F); } 69 69 + { 70 70 + return String.format("%-16s (%d`, %d`, %d`, %d`, %d`, %d`)", getName(), A, B, C, D, E, F); 71 71 + } 70 72 }

+3 -1

src/main/java/game/f3dex2/commands/SetFillColor.java

reviewed

··· 36 36 37 37 @Override 38 38 public String getString() 39 39 - { return String.format("%-16s (%08X)", getName(), value); } 39 39 + { 40 40 + return String.format("%-16s (%08X)", getName(), value); 41 41 + } 40 42 }

+3 -1

src/main/java/game/f3dex2/commands/SetKeyGB.java

reviewed

··· 69 69 70 70 @Override 71 71 public String getString() 72 72 - { return String.format("%-16s (%f, %f, %d`, %d`, %d`, %d`)", getName(), W, X, C, S, D, T); } 72 72 + { 73 73 + return String.format("%-16s (%f, %f, %d`, %d`, %d`, %d`)", getName(), W, X, C, S, D, T); 74 74 + } 73 75 }

+3 -1

src/main/java/game/f3dex2/commands/SetKeyR.java

reviewed

··· 56 56 57 57 @Override 58 58 public String getString() 59 59 - { return String.format("%-16s (%f, %d`, %d`)", getName(), W, C, S); } 59 59 + { 60 60 + return String.format("%-16s (%f, %d`, %d`)", getName(), W, C, S); 61 61 + } 60 62 }

+3 -1

src/main/java/game/f3dex2/commands/SetPrimColor.java

reviewed

··· 83 83 84 84 @Override 85 85 public String getString() 86 86 - { return String.format("%-16s (%f, %f, %d`, %d`, %d`, %d`)", getName(), minLOD, fracLOD, R, G, B, A); } 86 86 + { 87 87 + return String.format("%-16s (%f, %f, %d`, %d`, %d`, %d`)", getName(), minLOD, fracLOD, R, G, B, A); 88 88 + } 87 89 }

+3 -1

src/main/java/game/f3dex2/commands/SetPrimDepth.java

reviewed

··· 47 47 48 48 @Override 49 49 public String getString() 50 50 - { return String.format("%-16s (%d`, %d`)", getName(), Z, deltaZ); } 50 50 + { 51 51 + return String.format("%-16s (%d`, %d`)", getName(), Z, deltaZ); 52 52 + } 51 53 }

+3 -1

src/main/java/game/f3dex2/commands/Tri1.java

reviewed

··· 56 56 57 57 @Override 58 58 public String getString() 59 59 - { return String.format("%-16s (%2d`, %2d`, %2d`)", getName(), v1, v2, v3); } 59 59 + { 60 60 + return String.format("%-16s (%2d`, %2d`, %2d`)", getName(), v1, v2, v3); 61 61 + } 60 62 }

+3 -1

src/main/java/game/f3dex2/commands/Tri2.java

reviewed

··· 72 72 73 73 @Override 74 74 public String getString() 75 75 - { return String.format("%-16s (%2d`, %2d`, %2d`, %2d`, %2d`, %2d`)", getName(), v1, v2, v3, v4, v5, v6); } 75 75 + { 76 76 + return String.format("%-16s (%2d`, %2d`, %2d`, %2d`, %2d`, %2d`)", getName(), v1, v2, v3, v4, v5, v6); 77 77 + } 76 78 }

+4 -2

src/main/java/game/f3dex2/commands/UseMatrix.java

reviewed

··· 83 83 84 84 @Override 85 85 public String getString() 86 86 - { return String.format("%-16s (%08X, %s, %s, %s)", getName(), addr, 87 87 - optPush[push ? 1 : 0], optLoad[load ? 1 : 0], optProj[proj ? 1 : 0]); } 86 86 + { 87 87 + return String.format("%-16s (%08X, %s, %s, %s)", getName(), addr, 88 88 + optPush[push ? 1 : 0], optLoad[load ? 1 : 0], optProj[proj ? 1 : 0]); 89 89 + } 88 90 }

+6 -2

src/main/java/game/globals/IconRecord.java

reviewed

··· 85 85 86 86 @Override 87 87 public String getIdentifier() 88 88 - { return name; } 88 88 + { 89 89 + return name; 90 90 + } 89 91 90 92 @Override 91 93 public String getFilterableString() 92 92 - { return name; } 94 94 + { 95 95 + return name; 96 96 + } 93 97 94 98 @Override 95 99 public boolean canDeleteFromList()

+6 -2

src/main/java/game/globals/ItemRecord.java

reviewed

··· 183 183 184 184 @Override 185 185 public String getFilterableString() 186 186 - { return name + " " + enumName; } 186 186 + { 187 187 + return name + " " + enumName; 188 188 + } 187 189 188 190 @Override 189 191 public boolean canDeleteFromList() ··· 193 195 194 196 @Override 195 197 public String getIdentifier() 196 196 - { return name; } 198 198 + { 199 199 + return name; 200 200 + } 197 201 198 202 @Override 199 203 public String toString()

+6 -2

src/main/java/game/globals/MoveRecord.java

reviewed

··· 147 147 148 148 @Override 149 149 public String getFilterableString() 150 150 - { return name + " " + enumName; } 150 150 + { 151 151 + return name + " " + enumName; 152 152 + } 151 153 152 154 @Override 153 155 public boolean canDeleteFromList() ··· 157 159 158 160 @Override 159 161 public String getIdentifier() 160 160 - { return name; } 162 162 + { 163 163 + return name; 164 164 + } 161 165 162 166 @Override 163 167 public String toString()

+6 -2

src/main/java/game/globals/editor/BadgeReorderDialog.java

reviewed

··· 57 57 } 58 58 59 59 public DialogResult getResult() 60 60 - { return result; } 60 60 + { 61 61 + return result; 62 62 + } 61 63 62 64 public boolean isResultAccepted() 63 63 - { return result == DialogResult.ACCEPT; } 65 65 + { 66 66 + return result == DialogResult.ACCEPT; 67 67 + } 64 68 }

+3 -1

src/main/java/game/globals/editor/FilteredDragList.java

reviewed

··· 134 134 135 135 @Override 136 136 public DataFlavor[] getTransferDataFlavors() 137 137 - { return supportedFlavors; } 137 137 + { 138 138 + return supportedFlavors; 139 139 + } 138 140 139 141 @Override 140 142 public boolean isDataFlavorSupported(DataFlavor flavor)

+18 -6

src/main/java/game/globals/editor/FlagSet.java

reviewed

··· 56 56 } 57 57 58 58 public List<String> getSelectedReal() 59 59 - { return getNamesImpl("", false, false); } 59 59 + { 60 60 + return getNamesImpl("", false, false); 61 61 + } 60 62 61 63 public List<String> getSelectedDisp() 62 62 - { return getNamesImpl(prefix, changeCasing, false); } 64 64 + { 65 65 + return getNamesImpl(prefix, changeCasing, false); 66 66 + } 63 67 64 68 public List<String> getAllReal() 65 65 - { return getNamesImpl("", false, true); } 69 69 + { 70 70 + return getNamesImpl("", false, true); 71 71 + } 66 72 67 73 public String getYamlOut() 68 74 { ··· 77 83 } 78 84 79 85 public List<String> getAllDisp() 80 80 - { return getNamesImpl(prefix, changeCasing, true); } 86 86 + { 87 87 + return getNamesImpl(prefix, changeCasing, true); 88 88 + } 81 89 82 90 private List<String> getNamesImpl(String prefix, boolean shouldLower, boolean all) 83 91 { ··· 123 131 } 124 132 125 133 public int getBits() 126 126 - { return flagBits; } 134 134 + { 135 135 + return flagBits; 136 136 + } 127 137 128 138 public void setBits(int bits) 129 129 - { flagBits = bits; } 139 139 + { 140 140 + flagBits = bits; 141 141 + } 130 142 }

+12 -4

src/main/java/game/globals/editor/GlobalsRecord.java

reviewed

··· 9 9 10 10 @Override 11 11 public final int getIndex() 12 12 - { return listIndex; } 12 12 + { 13 13 + return listIndex; 14 14 + } 13 15 14 16 public final void setIndex(int index) 15 15 - { listIndex = index; } 17 17 + { 18 18 + listIndex = index; 19 19 + } 16 20 17 21 public final boolean getModified() 18 18 - { return modified; } 22 22 + { 23 23 + return modified; 24 24 + } 19 25 20 26 public final void setModified(boolean value) 21 21 - { modified = value; } 27 27 + { 28 28 + modified = value; 29 29 + } 22 30 23 31 public abstract String getIdentifier(); // assumed to be unqiue 24 32

+6 -2

src/main/java/game/globals/editor/ListConfirmDialog.java

reviewed

··· 69 69 } 70 70 71 71 public DialogResult getResult() 72 72 - { return result; } 72 72 + { 73 73 + return result; 74 74 + } 73 75 74 76 public boolean isResultAccepted() 75 75 - { return result == DialogResult.ACCEPT; } 77 77 + { 78 78 + return result == DialogResult.ACCEPT; 79 79 + } 76 80 }

+12 -4

src/main/java/game/globals/editor/ListSelectorDialog.java

reviewed

··· 140 140 } 141 141 142 142 public void setValue(T object) 143 143 - { selectedObject = object; } 143 143 + { 144 144 + selectedObject = object; 145 145 + } 144 146 145 147 public T getValue() 146 146 - { return selectedObject; } 148 148 + { 149 149 + return selectedObject; 150 150 + } 147 151 148 152 public DialogResult getResult() 149 149 - { return result; } 153 153 + { 154 154 + return result; 155 155 + } 150 156 151 157 public boolean isResultAccepted() 152 152 - { return result == DialogResult.ACCEPT; } 158 158 + { 159 159 + return result == DialogResult.ACCEPT; 160 160 + } 153 161 }

+6 -2

src/main/java/game/globals/editor/tabs/SingleListTab.java

reviewed

··· 305 305 } 306 306 307 307 protected final T getSelected() 308 308 - { return selectedObject; } 308 308 + { 309 309 + return selectedObject; 310 310 + } 309 311 310 312 protected final boolean shouldIgnoreChanges() 311 313 { ··· 326 328 protected abstract void updateInfoPanel(T object, boolean fromSet); 327 329 328 330 protected ListCellRenderer<T> getCellRenderer() 329 329 - { return null; } 331 331 + { 332 332 + return null; 333 333 + } 330 334 }

+21 -11

src/main/java/game/map/BoundingBox.java

reviewed

··· 95 95 } 96 96 97 97 public boolean isEmpty() 98 98 - { return empty; } 98 98 + { 99 99 + return empty; 100 100 + } 99 101 100 102 public Vector3f getMin() 101 101 - { return new Vector3f(min.getX(), min.getY(), min.getZ()); } 103 103 + { 104 104 + return new Vector3f(min.getX(), min.getY(), min.getZ()); 105 105 + } 102 106 103 107 public Vector3f getMax() 104 104 - { return new Vector3f(max.getX(), max.getY(), max.getZ()); } 108 108 + { 109 109 + return new Vector3f(max.getX(), max.getY(), max.getZ()); 110 110 + } 105 111 106 112 public Vector3f getCenter() 107 107 - { return new Vector3f( 108 108 - (max.getX() + min.getX()) / 2, 109 109 - (max.getY() + min.getY()) / 2, 110 110 - (max.getZ() + min.getZ()) / 2); } 113 113 + { 114 114 + return new Vector3f( 115 115 + (max.getX() + min.getX()) / 2, 116 116 + (max.getY() + min.getY()) / 2, 117 117 + (max.getZ() + min.getZ()) / 2); 118 118 + } 111 119 112 120 public Vector3f getSize() 113 113 - { return new Vector3f( 114 114 - (max.getX() - min.getX()), 115 115 - (max.getY() - min.getY()), 116 116 - (max.getZ() - min.getZ())); } 121 121 + { 122 122 + return new Vector3f( 123 123 + (max.getX() - min.getX()), 124 124 + (max.getY() - min.getY()), 125 125 + (max.getZ() - min.getZ())); 126 126 + } 117 127 118 128 public boolean contains(int x, int y, int z) 119 129 {

+9 -3

src/main/java/game/map/Map.java

reviewed

··· 327 327 } 328 328 329 329 public String getName() 330 330 - { return name; } 330 330 + { 331 331 + return name; 332 332 + } 331 333 332 334 public File getProjDir() 333 333 - { return projDir; } 335 335 + { 336 336 + return projDir; 337 337 + } 334 338 335 339 public void add(MapObject obj) 336 340 { ··· 1063 1067 } 1064 1068 1065 1069 public int getNumObjects() 1066 1066 - { return topLevelObjects.size(); } 1070 1070 + { 1071 1071 + return topLevelObjects.size(); 1072 1072 + } 1067 1073 } 1068 1074 1069 1075 private <T extends MapObject> void importTree(List<MapObject> topLevelObjects, MapObjectTreeModel<T> prefabTree)

+12 -4

src/main/java/game/map/MapIndex.java

reviewed

··· 89 89 } 90 90 91 91 public String getMapName() 92 92 - { return mapName; } 92 92 + { 93 93 + return mapName; 94 94 + } 93 95 94 96 public String getBackgroundName() 95 95 - { return bgName; } 97 97 + { 98 98 + return bgName; 99 99 + } 96 100 97 101 private IndexedModel getModel(String name) 98 102 { ··· 177 181 } 178 182 179 183 public int getEntryCount() 180 180 - { return entryList.size(); } 184 184 + { 185 185 + return entryList.size(); 186 186 + } 181 187 182 188 public List<Marker> getEntryList() 183 183 - { return entryList; } 189 189 + { 190 190 + return entryList; 191 191 + } 184 192 185 193 public static class IndexedModel 186 194 {

+18 -6

src/main/java/game/map/MapObject.java

reviewed

··· 83 83 private String originalName = null; 84 84 85 85 public String getName() 86 86 - { return name; } 86 86 + { 87 87 + return name; 88 88 + } 87 89 88 90 public void setName(String name) 89 91 { ··· 92 94 } 93 95 94 96 public String getOriginalName() 95 95 - { return originalName; } 97 97 + { 98 98 + return originalName; 99 99 + } 96 100 97 101 public void captureOriginalName() 98 102 { ··· 251 255 } 252 256 253 257 public CameraZoneData getCameraControlData() 254 254 - { return null; } 258 258 + { 259 259 + return null; 260 260 + } 255 261 256 262 @Override 257 263 public void addTo(BoundingBox aabb) ··· 267 273 268 274 @Override 269 275 public boolean isTransforming() 270 270 - { return transforming; } 276 276 + { 277 277 + return transforming; 278 278 + } 271 279 272 280 @Override 273 281 public void startTransformation() ··· 351 359 352 360 @Override 353 361 public void setSelected(boolean val) 354 354 - { selected = val; } 362 362 + { 363 363 + selected = val; 364 364 + } 355 365 356 366 @Override 357 367 public boolean isSelected() 358 358 - { return selected; } 368 368 + { 369 369 + return selected; 370 370 + } 359 371 360 372 /* required for tree operations */ 361 373

+21 -7

src/main/java/game/map/MutableAngle.java

reviewed

··· 25 25 } 26 26 27 27 public void setAngle(double a) 28 28 - { angle = a; } 28 28 + { 29 29 + angle = a; 30 30 + } 29 31 30 32 public void setAngle(int a) 31 33 { ··· 33 35 } 34 36 35 37 public void setTempAngle(double a) 36 36 - { temp = a; } 38 38 + { 39 39 + temp = a; 40 40 + } 37 41 38 42 public void startTransform() 39 43 { ··· 47 51 } 48 52 49 53 public boolean isTransforming() 50 50 - { return transforming; } 54 54 + { 55 55 + return transforming; 56 56 + } 51 57 52 58 public double getAngle() 53 53 - { return transforming ? temp : angle; } 59 59 + { 60 60 + return transforming ? temp : angle; 61 61 + } 54 62 55 63 public double getBaseAngle() 56 56 - { return angle; } 64 64 + { 65 65 + return angle; 66 66 + } 57 67 58 68 public double getTempAngle() 59 59 - { return temp; } 69 69 + { 70 70 + return temp; 71 71 + } 60 72 61 73 public MutableAngle deepCopy() 62 74 { ··· 64 76 } 65 77 66 78 public AngleBackup getBackup() 67 67 - { return new AngleBackup(this); } 79 79 + { 80 80 + return new AngleBackup(this); 81 81 + } 68 82 69 83 public static class AngleBackup 70 84 {

+51 -17

src/main/java/game/map/MutablePoint.java

reviewed

··· 74 74 } 75 75 76 76 public boolean isTransforming() 77 77 - { return transforming; } 77 77 + { 78 78 + return transforming; 79 79 + } 78 80 79 81 public void roundTemp(int dg) 80 82 { ··· 129 131 } 130 132 131 133 public int getX() 132 132 - { return transforming ? tempx : x; } 134 134 + { 135 135 + return transforming ? tempx : x; 136 136 + } 133 137 134 138 public int getY() 135 135 - { return transforming ? tempy : y; } 139 139 + { 140 140 + return transforming ? tempy : y; 141 141 + } 136 142 137 143 public int getZ() 138 138 - { return transforming ? tempz : z; } 144 144 + { 145 145 + return transforming ? tempz : z; 146 146 + } 139 147 140 148 public int getBaseX() 141 141 - { return x; } 149 149 + { 150 150 + return x; 151 151 + } 142 152 143 153 public int getBaseY() 144 144 - { return y; } 154 154 + { 155 155 + return y; 156 156 + } 145 157 146 158 public int getBaseZ() 147 147 - { return z; } 159 159 + { 160 160 + return z; 161 161 + } 148 162 149 163 public int getTempX() 150 150 - { return tempx; } 164 164 + { 165 165 + return tempx; 166 166 + } 151 167 152 168 public int getTempY() 153 153 - { return tempy; } 169 169 + { 170 170 + return tempy; 171 171 + } 154 172 155 173 public int getTempZ() 156 156 - { return tempz; } 174 174 + { 175 175 + return tempz; 176 176 + } 157 177 158 178 public void set(int axis, int val) 159 179 { ··· 173 193 } 174 194 175 195 public void setX(int val) 176 176 - { x = val; } 196 196 + { 197 197 + x = val; 198 198 + } 177 199 178 200 public void setY(int val) 179 179 - { y = val; } 201 201 + { 202 202 + y = val; 203 203 + } 180 204 181 205 public void setZ(int val) 182 182 - { z = val; } 206 206 + { 207 207 + z = val; 208 208 + } 183 209 184 210 public void setTempX(int val) 185 185 - { tempx = val; } 211 211 + { 212 212 + tempx = val; 213 213 + } 186 214 187 215 public void setTempY(int val) 188 188 - { tempy = val; } 216 216 + { 217 217 + tempy = val; 218 218 + } 189 219 190 220 public void setTempZ(int val) 191 191 - { tempz = val; } 221 221 + { 222 222 + tempz = val; 223 223 + } 192 224 193 225 public Vector3f getVector() 194 226 { ··· 204 236 } 205 237 206 238 public PointBackup getBackup() 207 207 - { return new PointBackup(this); } 239 239 + { 240 240 + return new PointBackup(this); 241 241 + } 208 242 209 243 public static class PointBackup 210 244 {

+1 -1

src/main/java/game/map/compiler/GeometryDecompiler.java

reviewed

··· 309 309 310 310 /* 311 311 int[][] propCheck = mdl.getProperties(); 312 312 - 312 312 + 313 313 assert(propCheck.length == properties.length); 314 314 for(int i = 0; i < properties.length; i++) 315 315 {

+13 -5

src/main/java/game/map/editor/CursorObject.java

reviewed

··· 377 377 double dot = nx*dir.x + nz*dir.z; 378 378 // okay way: 379 379 double dot = Vector3f.dot(dir, normalDir); 380 380 - 380 380 + 381 381 pos.x += length * (dir.x - normalDir.x * dot); 382 382 pos.z += length * (dir.z - normalDir.z * dot); 383 383 */ ··· 909 909 910 910 @Override 911 911 public RenderMode getRenderMode() 912 912 - { return RenderMode.ALPHA_TEST_AA_ZB_2SIDE; } 912 912 + { 913 913 + return RenderMode.ALPHA_TEST_AA_ZB_2SIDE; 914 914 + } 913 915 914 916 @Override 915 917 public Vector3f getCenterPoint() ··· 928 930 929 931 @Override 930 932 public void setDepth(int normalizedDepth) 931 931 - { depth = normalizedDepth; } 933 933 + { 934 934 + depth = normalizedDepth; 935 935 + } 932 936 933 937 @Override 934 938 public int getDepth() 935 935 - { return depth; } 939 939 + { 940 940 + return depth; 941 941 + } 936 942 } 937 943 938 944 private void renderCollision() ··· 1045 1051 1046 1052 @Override 1047 1053 public boolean isTransforming() 1048 1048 - { return position.isTransforming(); } 1054 1054 + { 1055 1055 + return position.isTransforming(); 1056 1056 + } 1049 1057 1050 1058 @Override 1051 1059 public void startTransformation()

+3 -1

src/main/java/game/map/editor/DrawTrianglesManager.java

reviewed

··· 59 59 } 60 60 61 61 public boolean isActive() 62 62 - { return drawMode != DrawMode.Inactive; } 62 62 + { 63 63 + return drawMode != DrawMode.Inactive; 64 64 + } 63 65 64 66 private void reset() 65 67 {

+6 -2

src/main/java/game/map/editor/EditorObject.java

reviewed

··· 39 39 40 40 @Override 41 41 public MapObjectType getObjectType() 42 42 - { return MapObjectType.EDITOR; } 42 42 + { 43 43 + return MapObjectType.EDITOR; 44 44 + } 43 45 44 46 // ================================================== 45 47 // picking ··· 73 75 74 76 @Override 75 77 public AbstractMesh getMesh() 76 76 - { return null; } 78 78 + { 79 79 + return null; 80 80 + } 77 81 78 82 @Override 79 83 public void updateMeshHierarchy()

+9 -3

src/main/java/game/map/editor/Grid.java

reviewed

··· 64 64 } 65 65 66 66 public int getPower() 67 67 - { return power; } 67 67 + { 68 68 + return power; 69 69 + } 68 70 69 71 private int getMaxPower() 70 70 - { return binary ? MAX_BIN_PWR : MAX_DEC_PWR; } 72 72 + { 73 73 + return binary ? MAX_BIN_PWR : MAX_DEC_PWR; 74 74 + } 71 75 72 76 public int getSpacing() 73 73 - { return getGridSpacing(power); } 77 77 + { 78 78 + return getGridSpacing(power); 79 79 + } 74 80 75 81 public int getSpacing(int width) 76 82 {

+3 -1

src/main/java/game/map/editor/MapInfoPanel.java

reviewed

··· 15 15 } 16 16 17 17 public final T getData() 18 18 - { return data; } 18 18 + { 19 19 + return data; 20 20 + } 19 21 20 22 public final void setData(T newData) 21 23 {

+24 -8

src/main/java/game/map/editor/PaintManager.java

reviewed

··· 262 262 } 263 263 264 264 public static Color getSelectedColor() 265 265 - { return paintVertexTab.getSelectedColor(); } 265 265 + { 266 266 + return paintVertexTab.getSelectedColor(); 267 267 + } 266 268 267 269 public static void setSelectedColor(Color c) 268 270 { ··· 300 302 } 301 303 302 304 private static BrushFallOffType getFallOffType() 303 303 - { return (BrushFallOffType) paintVertexTab.fallOffComboBox.getSelectedItem(); } 305 305 + { 306 306 + return (BrushFallOffType) paintVertexTab.fallOffComboBox.getSelectedItem(); 307 307 + } 304 308 305 309 public static int getInnerBrushRadius() 306 306 - { return paintVertexTab.innerRadiusSlider.getValue(); } 310 310 + { 311 311 + return paintVertexTab.innerRadiusSlider.getValue(); 312 312 + } 307 313 308 314 public static int getOuterBrushRadius() 309 309 - { return paintVertexTab.outerRadiusSlider.getValue(); } 315 315 + { 316 316 + return paintVertexTab.outerRadiusSlider.getValue(); 317 317 + } 310 318 311 319 public static boolean shouldDrawInnerRadius() 312 320 { ··· 540 548 } 541 549 542 550 private Color getSelectedColor() 543 543 - { return selectedColor; } 551 551 + { 552 552 + return selectedColor; 553 553 + } 544 554 545 555 private void setSelectedColor(Color c) 546 556 { ··· 739 749 } 740 750 741 751 public int getMaxValue() 742 742 - { return max; } 752 752 + { 753 753 + return max; 754 754 + } 743 755 744 756 public void setMaximum(int value) 745 757 { ··· 748 760 } 749 761 750 762 public int getValue() 751 751 - { return slider.getValue(); } 763 763 + { 764 764 + return slider.getValue(); 765 765 + } 752 766 753 767 public void setValue(int value) 754 768 { ··· 781 795 } 782 796 783 797 public boolean isPaintEnabled() 784 784 - { return hasCheckbox && checkbox.isSelected(); } 798 798 + { 799 799 + return hasCheckbox && checkbox.isSelected(); 800 800 + } 785 801 } 786 802 787 803 public static int getNewComponent(PaintSlider slider, int val, int increment)

+6 -2

src/main/java/game/map/editor/PointObject.java

reviewed

··· 22 22 } 23 23 24 24 public Vector3f getPosition() 25 25 - { return position.getVector(); } 25 25 + { 26 26 + return position.getVector(); 27 27 + } 26 28 27 29 public abstract float getRadius(); 28 30 ··· 77 79 78 80 @Override 79 81 public boolean isTransforming() 80 80 - { return position.isTransforming(); } 82 82 + { 83 83 + return position.isTransforming(); 84 84 + } 81 85 82 86 @Override 83 87 public void startTransformation()

+12 -4

src/main/java/game/map/editor/camera/CameraController.java

reviewed

··· 40 40 float Cz = 0; 41 41 42 42 public Vector3f getPosition() 43 43 - { return currentPos; } 43 43 + { 44 44 + return currentPos; 45 45 + } 44 46 45 47 public Vector3f getRotation() 46 46 - { return new Vector3f(currentPitch, currentYaw, 0); } 48 48 + { 49 49 + return new Vector3f(currentPitch, currentYaw, 0); 50 50 + } 47 51 48 52 public Vector3f getSamplePosition() 49 49 - { return new Vector3f(samplePosition); } 53 53 + { 54 54 + return new Vector3f(samplePosition); 55 55 + } 50 56 51 57 public Vector3f getTargetPosition() 52 52 - { return new Vector3f(targetPos); } 58 58 + { 59 59 + return new Vector3f(targetPos); 60 60 + } 53 61 54 62 public void update(CameraZoneData data, Vector3f position, boolean allowVertical, double deltaTime) 55 63 {

+3 -1

src/main/java/game/map/editor/camera/MapEditCamera.java

reviewed

··· 50 50 } 51 51 52 52 public Vector3f getPosition() 53 53 - { return new Vector3f(pos); } 53 53 + { 54 54 + return new Vector3f(pos); 55 55 + } 54 56 55 57 public void release() 56 58 {}

+3 -1

src/main/java/game/map/editor/camera/OrthographicCamera.java

reviewed

··· 55 55 } 56 56 57 57 public float getZoomLevel() 58 58 - { return zoomLevel; } 58 58 + { 59 59 + return zoomLevel; 60 60 + } 59 61 60 62 @Override 61 63 public void resize()

+3 -1

src/main/java/game/map/editor/camera/OrthographicViewport.java

reviewed

··· 38 38 } 39 39 40 40 public float getViewWorldSizeX() 41 41 - { return ((OrthographicCamera) camera).getZoomLevel() * sizeX; } 41 41 + { 42 42 + return ((OrthographicCamera) camera).getZoomLevel() * sizeX; 43 43 + } 42 44 43 45 public BoundingBox getViewingVolume() 44 46 {

+3 -1

src/main/java/game/map/editor/camera/PerspectiveViewport.java

reviewed

··· 55 55 } 56 56 57 57 public void setCamera(PerspBaseCamera cam) 58 58 - { camera = cam; } 58 58 + { 59 59 + camera = cam; 60 60 + } 59 61 60 62 @Override 61 63 public float getScaleFactor(float x, float y, float z)

+3 -1

src/main/java/game/map/editor/camera/UVEditorViewport.java

reviewed

··· 44 44 } 45 45 46 46 public void setModel(Model mdl) 47 47 - { this.mdl = mdl; } 47 47 + { 48 48 + this.mdl = mdl; 49 49 + } 48 50 49 51 public boolean setTriangles(List<Triangle> newTriangles) 50 52 {

+3 -1

src/main/java/game/map/editor/commands/AbstractCommand.java

reviewed

··· 65 65 } 66 66 67 67 public STATE getState() 68 68 - { return state; } 68 68 + { 69 69 + return state; 70 70 + } 69 71 }

+3 -1

src/main/java/game/map/editor/commands/CommandBatch.java

reviewed

··· 34 34 } 35 35 36 36 public void setModifiesMap(boolean value) 37 37 - { modifiesMap = value; } 37 37 + { 38 38 + modifiesMap = value; 39 39 + } 38 40 39 41 @Override 40 42 public boolean modifiesMap()

+9 -3

src/main/java/game/map/editor/commands/fields/EditableField.java

reviewed

··· 46 46 private static boolean enableCallbacks = false; 47 47 48 48 public static void setCallbacksEnabled(boolean enabled) 49 49 - { enableCallbacks = enabled; } 49 49 + { 50 50 + enableCallbacks = enabled; 51 51 + } 50 52 51 53 private EditableField(T initialValue) 52 54 { ··· 179 181 } 180 182 181 183 public boolean isEnabled() 182 182 - { return enabled; } 184 184 + { 185 185 + return enabled; 186 186 + } 183 187 184 188 public void setEnabled(boolean enabled) 185 185 - { this.enabled = enabled; } 189 189 + { 190 190 + this.enabled = enabled; 191 191 + } 186 192 187 193 public AbstractCommand enabler(boolean enabled) 188 194 {

+6 -2

src/main/java/game/map/editor/common/BaseCamera.java

reviewed

··· 47 47 } 48 48 49 49 public float getPitch() 50 50 - { return pitch; } 50 50 + { 51 51 + return pitch; 52 52 + } 51 53 52 54 public float getYaw() 53 53 - { return yaw; } 55 55 + { 56 56 + return yaw; 57 57 + } 54 58 55 59 public int glViewMinX = 0; 56 60 public int glViewMinY = 0;

+12 -4

src/main/java/game/map/editor/common/BasicCamera.java

reviewed

··· 167 167 } 168 168 169 169 public float getZoom() 170 170 - { return zoom; } 170 170 + { 171 171 + return zoom; 172 172 + } 171 173 172 174 public float getDist() 173 173 - { return 400.0f * zoom; } 175 175 + { 176 176 + return 400.0f * zoom; 177 177 + } 174 178 175 179 public float getPosX() 176 176 - { return pos.x; } 180 180 + { 181 181 + return pos.x; 182 182 + } 177 183 178 184 public float getPosY() 179 179 - { return pos.y; } 185 185 + { 186 186 + return pos.y; 187 187 + } 180 188 181 189 /** 182 190 * Returns a pick ray based on current mouse position.

+3 -1

src/main/java/game/map/editor/common/BasicEditorCommand.java

reviewed

··· 55 55 } 56 56 57 57 public STATE getState() 58 58 - { return state; } 58 58 + { 59 59 + return state; 60 60 + } 59 61 }

+3 -1

src/main/java/game/map/editor/common/FrameLimiter.java

reviewed

··· 138 138 * @return will return the current time in nano's 139 139 */ 140 140 private long getTime() 141 141 - { return System.nanoTime(); } 141 141 + { 142 142 + return System.nanoTime(); 143 143 + } 142 144 143 145 private static class RunningAvg 144 146 {

+3 -1

src/main/java/game/map/editor/common/InfoPanel.java

reviewed

··· 18 18 } 19 19 20 20 public final T getData() 21 21 - { return data; } 21 21 + { 22 22 + return data; 23 23 + } 22 24 23 25 public final void setData(T newData) 24 26 {

+9 -3

src/main/java/game/map/editor/common/KeyboardInput.java

reviewed

··· 73 73 } 74 74 75 75 public boolean isCtrlDown() 76 76 - { return isKeyDown.contains(KeyEvent.VK_CONTROL); } 76 76 + { 77 77 + return isKeyDown.contains(KeyEvent.VK_CONTROL); 78 78 + } 77 79 78 80 public boolean isShiftDown() 79 79 - { return isKeyDown.contains(KeyEvent.VK_SHIFT); } 81 81 + { 82 82 + return isKeyDown.contains(KeyEvent.VK_SHIFT); 83 83 + } 80 84 81 85 public boolean isAltDown() 82 82 - { return isKeyDown.contains(KeyEvent.VK_ALT); } 86 86 + { 87 87 + return isKeyDown.contains(KeyEvent.VK_ALT); 88 88 + } 83 89 84 90 public boolean isKeyDown(int keycode) 85 91 {

+27 -9

src/main/java/game/map/editor/common/MouseInput.java

reviewed

··· 214 214 } 215 215 216 216 public boolean isGrabbed() 217 217 - { return grabbed; } 217 217 + { 218 218 + return grabbed; 219 219 + } 218 220 219 221 public void update(MouseManagerListener listener, boolean hasFocus) 220 222 { ··· 450 452 } 451 453 452 454 public boolean isHoldingLMB() 453 453 - { return holding[MouseButton.LEFT.id]; } 455 455 + { 456 456 + return holding[MouseButton.LEFT.id]; 457 457 + } 454 458 455 459 public boolean isHoldingRMB() 456 456 - { return holding[MouseButton.RIGHT.id]; } 460 460 + { 461 461 + return holding[MouseButton.RIGHT.id]; 462 462 + } 457 463 458 464 public boolean isHoldingMMB() 459 459 - { return holding[MouseButton.MIDDLE.id]; } 465 465 + { 466 466 + return holding[MouseButton.MIDDLE.id]; 467 467 + } 460 468 461 469 public boolean hasLocation() 462 470 { ··· 464 472 } 465 473 466 474 public int getPosX() 467 467 - { return lastPosX; } 475 475 + { 476 476 + return lastPosX; 477 477 + } 468 478 469 479 public int getPosY() 470 470 - { return height - lastPosY; } 480 480 + { 481 481 + return height - lastPosY; 482 482 + } 471 483 472 484 public int getFrameDX() 473 473 - { return frameDX; } 485 485 + { 486 486 + return frameDX; 487 487 + } 474 488 475 489 public int getFrameDY() 476 476 - { return frameDY; } 490 490 + { 491 491 + return frameDY; 492 492 + } 477 493 478 494 public int getFrameDW() 479 479 - { return frameDW; } 495 495 + { 496 496 + return frameDW; 497 497 + } 480 498 }

+3 -1

src/main/java/game/map/editor/geometry/GUVertex.java

reviewed

··· 43 43 } 44 44 45 45 public Vertex getVertex() 46 46 - { return new Vertex(x, y, z); } 46 46 + { 47 47 + return new Vertex(x, y, z); 48 48 + } 47 49 48 50 @Override 49 51 public String toString()

+3 -1

src/main/java/game/map/editor/render/PreviewGeometry.java

reviewed

··· 37 37 } 38 38 39 39 public final void setUpdate(Runnable runnable) 40 40 - { updateFunc = runnable; } 40 40 + { 41 41 + updateFunc = runnable; 42 42 + } 41 43 42 44 public final void update() 43 45 {

+9 -3

src/main/java/game/map/editor/render/Renderer.java

reviewed

··· 133 133 private static float fastPulse = 0.0f; 134 134 135 135 public static float getPulse() 136 136 - { return pulse; } 136 136 + { 137 137 + return pulse; 138 138 + } 137 139 138 140 public static float getSlowPulse() 139 139 - { return slowPulse; } 141 141 + { 142 142 + return slowPulse; 143 143 + } 140 144 141 145 public static float getFastPulse() 142 142 - { return fastPulse; } 146 146 + { 147 147 + return fastPulse; 148 148 + } 143 149 144 150 public static float interpColor(float min, float max) 145 151 {

+9 -3

src/main/java/game/map/editor/render/ShadowRenderer.java

reviewed

··· 229 229 230 230 @Override 231 231 public Vector3f getCenterPoint() 232 232 - { return pos; } 232 232 + { 233 233 + return pos; 234 234 + } 233 235 234 236 @Override 235 237 public void render(RenderingOptions opts, BaseCamera camera) ··· 239 241 240 242 @Override 241 243 public void setDepth(int normalizedDepth) 242 242 - { depth = normalizedDepth; } 244 244 + { 245 245 + depth = normalizedDepth; 246 246 + } 243 247 244 248 @Override 245 249 public int getDepth() 246 246 - { return depth; } 250 250 + { 251 251 + return depth; 252 252 + } 247 253 } 248 254 }

+21 -7

src/main/java/game/map/editor/selection/SelectablePoint.java

reviewed

··· 35 35 } 36 36 37 37 public Vector3f getPosition() 38 38 - { return new Vector3f(point.getX(), point.getY(), point.getZ()); } 38 38 + { 39 39 + return new Vector3f(point.getX(), point.getY(), point.getZ()); 40 40 + } 39 41 40 42 public void set(int axis, int val) 41 43 { ··· 63 65 } 64 66 65 67 public int getX() 66 66 - { return point.getX(); } 68 68 + { 69 69 + return point.getX(); 70 70 + } 67 71 68 72 public int getY() 69 69 - { return point.getY(); } 73 73 + { 74 74 + return point.getY(); 75 75 + } 70 76 71 77 public int getZ() 72 72 - { return point.getZ(); } 78 78 + { 79 79 + return point.getZ(); 80 80 + } 73 81 74 82 public void round(int spacing) 75 83 { ··· 90 98 91 99 @Override 92 100 public boolean isTransforming() 93 93 - { return point.isTransforming(); } 101 101 + { 102 102 + return point.isTransforming(); 103 103 + } 94 104 95 105 @Override 96 106 public void startTransformation() ··· 130 140 131 141 @Override 132 142 public void setSelected(boolean val) 133 133 - { selected = val; } 143 143 + { 144 144 + selected = val; 145 145 + } 134 146 135 147 @Override 136 148 public boolean isSelected() 137 137 - { return selected; } 149 149 + { 150 150 + return selected; 151 151 + } 138 152 139 153 @Override 140 154 public int hashCode()

+12 -4

src/main/java/game/map/editor/selection/Selection.java

reviewed

··· 113 113 } 114 114 115 115 public TransformState getTransformState() 116 116 - { return transformState; } 116 116 + { 117 117 + return transformState; 118 118 + } 117 119 118 120 public Axis getRotatationAxis() 119 119 - { return (transformState == TransformState.ROTATE) ? rotation.axis : null; } 121 121 + { 122 122 + return (transformState == TransformState.ROTATE) ? rotation.axis : null; 123 123 + } 120 124 121 125 public float getRotatationAngle() 122 122 - { return (transformState == TransformState.ROTATE) ? (float) rotation.angle : 0.0f; } 126 126 + { 127 127 + return (transformState == TransformState.ROTATE) ? (float) rotation.angle : 0.0f; 128 128 + } 123 129 124 130 public boolean transforming() 125 131 { ··· 1017 1023 * @return Whether the list is empty or not. 1018 1024 */ 1019 1025 public boolean isEmpty() 1020 1020 - { return selectableList.isEmpty(); } 1026 1026 + { 1027 1027 + return selectableList.isEmpty(); 1028 1028 + } 1021 1029 1022 1030 /** 1023 1031 * @return Most recently added item to the selection.

+33 -13

src/main/java/game/map/editor/selection/SelectionManager.java

reviewed

··· 128 128 } 129 129 130 130 public SelectionMode getSelectionMode() 131 131 - { return selectionMode; } 131 131 + { 132 132 + return selectionMode; 133 133 + } 132 134 133 135 public void setSelectionMode(SelectionMode newSelectionMode) 134 136 { ··· 285 287 } 286 288 287 289 public void setObjectType(MapObjectType type) 288 288 - { currentType = type; } 290 290 + { 291 291 + currentType = type; 292 292 + } 289 293 290 294 public MapObjectType getObjectType() 291 291 - { return currentType; } 295 295 + { 296 296 + return currentType; 297 297 + } 292 298 293 299 /** 294 300 * @return Unfiltered list of all selected MapObjects. 295 301 */ 296 302 public List<MapObject> getSelectedObjects() 297 297 - { return new ArrayList<>(objectSelection.selectableList); } 303 303 + { 304 304 + return new ArrayList<>(objectSelection.selectableList); 305 305 + } 298 306 299 307 /** 300 308 * @param filterClass ··· 316 324 * @return Unfiltered list of all selected triangles. 317 325 */ 318 326 public List<Triangle> getTrianglesFromSelection() 319 319 - { return getTrianglesFromSelection(MapObject.class); } 327 327 + { 328 328 + return getTrianglesFromSelection(MapObject.class); 329 329 + } 320 330 321 331 /** 322 332 * @param filterClass ··· 351 361 * @return Unfiltered list of all selected vertices. 352 362 */ 353 363 public List<Vertex> getVerticesFromSelection() 354 354 - { return getVerticesFromSelection(MapObject.class); } 364 364 + { 365 365 + return getVerticesFromSelection(MapObject.class); 366 366 + } 355 367 356 368 /** 357 369 * @param filterClass ··· 395 407 } 396 408 397 409 public List<Vertex> getVertices() 398 398 - { return vertexWorkingSet; } 410 410 + { 411 411 + return vertexWorkingSet; 412 412 + } 399 413 400 414 public void generateUVListFromSelectedModel() 401 415 { ··· 1879 1893 */ 1880 1894 1881 1895 private AbstractCommand getClearVertices() 1882 1882 - { return new ModifySelection<>("Clear Vertex Selection", 1883 1883 - vertexSelection, null, vertexSelection.selectableList); } 1896 1896 + { 1897 1897 + return new ModifySelection<>("Clear Vertex Selection", 1898 1898 + vertexSelection, null, vertexSelection.selectableList); 1899 1899 + } 1884 1900 1885 1901 private AbstractCommand getModifyUVs(Iterable<UV> addList, Iterable<UV> removeList) 1886 1902 { ··· 1889 1905 } 1890 1906 1891 1907 public AbstractCommand getClearUVs() 1892 1892 - { return new ModifySelection<>("Clear UV Selection", 1893 1893 - uvSelection, null, uvSelection.selectableList); } 1908 1908 + { 1909 1909 + return new ModifySelection<>("Clear UV Selection", 1910 1910 + uvSelection, null, uvSelection.selectableList); 1911 1911 + } 1894 1912 1895 1913 public AbstractCommand getModifyPoints(Iterable<SelectablePoint> addList, Iterable<SelectablePoint> removeList) 1896 1914 { ··· 1899 1917 } 1900 1918 1901 1919 public AbstractCommand getClearPoints() 1902 1902 - { return new ModifySelection<>("Clear Point Selection", 1903 1903 - pointSelection, null, pointSelection.selectableList); } 1920 1920 + { 1921 1921 + return new ModifySelection<>("Clear Point Selection", 1922 1922 + pointSelection, null, pointSelection.selectableList); 1923 1923 + } 1904 1924 }

+9 -3

src/main/java/game/map/editor/selection/TransformGizmo.java

reviewed

··· 575 575 576 576 @Override 577 577 public void setSelected(boolean val) 578 578 - { selected = val; } 578 578 + { 579 579 + selected = val; 580 580 + } 579 581 580 582 @Override 581 583 public boolean isSelected() 582 582 - { return selected; } 584 584 + { 585 585 + return selected; 586 586 + } 583 587 584 588 @Override 585 589 public boolean transforms() ··· 589 593 590 594 @Override 591 595 public boolean isTransforming() 592 592 - { return origin.isTransforming(); } 596 596 + { 597 597 + return origin.isTransforming(); 598 598 + } 593 599 594 600 @Override 595 601 public void startTransformation()

+3 -1

src/main/java/game/map/editor/ui/BoundObjectPanel.java

reviewed

··· 94 94 } 95 95 96 96 public String getText() 97 97 - { return field.getText(); } 97 97 + { 98 98 + return field.getText(); 99 99 + } 98 100 99 101 private void buildPopupMenu(JPopupMenu menu) 100 102 {

+6 -2

src/main/java/game/map/editor/ui/ComplexEditableJTree.java

reviewed

··· 95 95 } 96 96 97 97 public DefaultMutableTreeNode getNode() 98 98 - { return source; } 98 98 + { 99 99 + return source; 100 100 + } 99 101 100 102 public void show(PopupMenu menu) 101 103 { ··· 251 253 252 254 @Override 253 255 public DataFlavor[] getTransferDataFlavors() 254 254 - { return flavors; } 256 256 + { 257 257 + return flavors; 258 258 + } 255 259 256 260 @Override 257 261 public boolean isDataFlavorSupported(DataFlavor flavor)

+12 -4

src/main/java/game/map/editor/ui/MapObjectPanel.java

reviewed

··· 102 102 } 103 103 104 104 public MapObjectNode<Model> getPopupModel() 105 105 - { return modelJTree.popupSource; } 105 105 + { 106 106 + return modelJTree.popupSource; 107 107 + } 106 108 107 109 public MapObjectNode<Collider> getPopupCollider() 108 108 - { return colliderJTree.popupSource; } 110 110 + { 111 111 + return colliderJTree.popupSource; 112 112 + } 109 113 110 114 public MapObjectNode<Zone> getPopupZone() 111 111 - { return zoneJTree.popupSource; } 115 115 + { 116 116 + return zoneJTree.popupSource; 117 117 + } 112 118 113 119 public MapObjectNode<Marker> getPopupMarker() 114 114 - { return markerJTree.popupSource; } 120 120 + { 121 121 + return markerJTree.popupSource; 122 122 + } 115 123 116 124 private JPanel getModelSubpanel(SwingGUI gui) 117 125 {

+6 -2

src/main/java/game/map/editor/ui/PathList.java

reviewed

··· 162 162 } 163 163 164 164 private IterableListModel<PathPoint> getIterableModel() 165 165 - { return (IterableListModel<PathPoint>) getModel(); } 165 165 + { 166 166 + return (IterableListModel<PathPoint>) getModel(); 167 167 + } 166 168 167 169 @Override 168 170 public int locationToIndex(Point location) ··· 259 261 260 262 @Override 261 263 public DataFlavor[] getTransferDataFlavors() 262 262 - { return flavors; } 264 264 + { 265 265 + return flavors; 266 266 + } 263 267 264 268 @Override 265 269 public boolean isDataFlavorSupported(DataFlavor flavor)

+1 -1

src/main/java/game/map/editor/ui/ScriptManager.java

reviewed

··· 131 131 { 132 132 generalTab.updateFields(data); 133 133 } 134 134 - 134 134 + 135 135 public void updateCameraFields(ScriptData data) 136 136 { 137 137 cameraTab.updateFields(data);

+6 -2

src/main/java/game/map/editor/ui/SimpleEditableJTree.java

reviewed

··· 103 103 } 104 104 105 105 public DefaultMutableTreeNode getNode() 106 106 - { return source; } 106 106 + { 107 107 + return source; 108 108 + } 107 109 108 110 public void show(JPopupMenu menu) 109 111 { ··· 303 305 304 306 @Override 305 307 public DataFlavor[] getTransferDataFlavors() 306 306 - { return flavors; } 308 308 + { 309 309 + return flavors; 310 310 + } 307 311 308 312 @Override 309 313 public boolean isDataFlavorSupported(DataFlavor flavor)

+7 -7

src/main/java/game/map/editor/ui/SwingGUI.java

reviewed

··· 1253 1253 // following commands are forwarded directly to the editor 1254 1254 /* 1255 1255 case SAVE_MAP: 1256 1256 - 1256 1256 + 1257 1257 case COMPILE_SHAPE: 1258 1258 case COMPILE_COLLISION: 1259 1259 - 1259 1259 + 1260 1260 case SHOW_MODELS: 1261 1261 case SHOW_COLLIDERS: 1262 1262 case SHOW_ZONES: 1263 1263 case SHOW_MARKERS: 1264 1264 - 1264 1264 + 1265 1265 case RESET_CAMERAS: 1266 1266 case RESET_LAYOUT: 1267 1267 - 1267 1267 + 1268 1268 case SEPARATE_VERTS: 1269 1269 case FUSE_VERTS: 1270 1270 case JOIN_MODELS: 1271 1271 case SPLIT_MODEL: 1272 1272 - 1272 1272 + 1273 1273 case CONVERT_COLLIDER_TO_ZONE: 1274 1274 case CONVERT_ZONE_TO_COLLIDER: 1275 1275 - 1275 1275 + 1276 1276 case CREATE_COLLIDER_GROUP: 1277 1277 case CREATE_ZONE_GROUP: 1278 1278 - 1278 1278 + 1279 1279 case DEBUG_RECOMPUTE_BOUNDING_BOXES: 1280 1280 */ 1281 1281 default:

+6 -2

src/main/java/game/map/editor/ui/dialogs/DirChooser.java

reviewed

··· 18 18 } 19 19 20 20 public void setCurrentDirectory(File dir) 21 21 - { currentDirectory = dir; } 21 21 + { 22 22 + currentDirectory = dir; 23 23 + } 22 24 23 25 public ChooseDialogResult prompt(File dir) 24 26 { ··· 38 40 } 39 41 40 42 public File getSelectedFile() 41 41 - { return selected; } 43 43 + { 44 44 + return selected; 45 45 + } 42 46 }

+6 -2

src/main/java/game/map/editor/ui/dialogs/GenerateFromPathsDialog.java

reviewed

··· 190 190 } 191 191 192 192 public String getTypeName() 193 193 - { return (segmentsSlider.getValue() > 2) ? "Pipe" : "Ribbon"; } 193 193 + { 194 194 + return (segmentsSlider.getValue() > 2) ? "Pipe" : "Ribbon"; 195 195 + } 194 196 195 197 public TriangleBatch generateTriangles() 196 198 { ··· 240 242 private boolean supressEvents = false; 241 243 242 244 public int getValue() 243 243 - { return slider.getValue(); } 245 245 + { 246 246 + return slider.getValue(); 247 247 + } 244 248 245 249 public SliderSpinner(String name, int minValue, int maxValue, int initialValue) 246 250 {

+3 -1

src/main/java/game/map/editor/ui/dialogs/GenerateFromTrianglesDialog.java

reviewed

··· 207 207 private boolean supressEvents = false; 208 208 209 209 public int getValue() 210 210 - { return slider.getValue(); } 210 210 + { 211 211 + return slider.getValue(); 212 212 + } 211 213 212 214 public SliderSpinner(String name, int minValue, int maxValue, int initialValue) 213 215 {

+3 -1

src/main/java/game/map/editor/ui/dialogs/GeneratePrimitiveOptionsDialog.java

reviewed

··· 297 297 } 298 298 299 299 public String getTypeName() 300 300 - { return primitiveType.name; } 300 300 + { 301 301 + return primitiveType.name; 302 302 + } 301 303 302 304 /** 303 305 * ComboBox renderer with separators, adapted from code by:

+3 -1

src/main/java/game/map/editor/ui/dialogs/MarkerOptionsPanel.java

reviewed

··· 77 77 } 78 78 79 79 public static MarkerType getMarkerType() 80 80 - { return instance.markerType; } 80 80 + { 81 81 + return instance.markerType; 82 82 + } 81 83 }

+6 -2

src/main/java/game/map/editor/ui/dialogs/OpenFileChooser.java

reviewed

··· 29 29 } 30 30 31 31 public void setDirectoryContaining(File dir) 32 32 - { currentDirectory = dir; } 32 32 + { 33 33 + currentDirectory = dir; 34 34 + } 33 35 34 36 public ChooseDialogResult prompt(File dir) 35 37 { ··· 64 66 } 65 67 66 68 public File getSelectedFile() 67 67 - { return selected; } 69 69 + { 70 70 + return selected; 71 71 + } 68 72 }

+7 -5

src/main/java/game/map/editor/ui/dialogs/SetPositionPanel.java

reviewed

··· 29 29 } 30 30 31 31 public int[] getVector() 32 32 - { return new int[] { 33 33 - Integer.decode(fieldX.getText()), 34 34 - Integer.decode(fieldY.getText()), 35 35 - Integer.decode(fieldZ.getText()) 36 36 - }; } 32 32 + { 33 33 + return new int[] { 34 34 + Integer.decode(fieldX.getText()), 35 35 + Integer.decode(fieldY.getText()), 36 36 + Integer.decode(fieldZ.getText()) 37 37 + }; 38 38 + } 37 39 }

+12 -4

src/main/java/game/map/editor/ui/dialogs/UVOptionsPanel.java

reviewed

··· 25 25 private final LabeledDoubleSpinner scaleSpinner; 26 26 27 27 public UVGenerator getUVGenerator() 28 28 - { return new UVGenerator(projectionType, projectionAxis, (float) scaleSpinner.getValue()); } 28 28 + { 29 29 + return new UVGenerator(projectionType, projectionAxis, (float) scaleSpinner.getValue()); 30 30 + } 29 31 30 32 public Projection getProjectionType() 31 31 - { return projectionType; } 33 33 + { 34 34 + return projectionType; 35 35 + } 32 36 33 37 public ProjectionAxis getProjectionAxis() 34 34 - { return projectionAxis; } 38 38 + { 39 39 + return projectionAxis; 40 40 + } 35 41 36 42 public double getScale() 37 37 - { return scaleSpinner.getValue(); } 43 43 + { 44 44 + return scaleSpinner.getValue(); 45 45 + } 38 46 39 47 public UVOptionsPanel() 40 48 {

+3 -1

src/main/java/game/map/editor/ui/info/DisplayListPanel.java

reviewed

··· 472 472 473 473 @Override 474 474 public DataFlavor[] getTransferDataFlavors() 475 475 - { return flavors; } 475 475 + { 476 476 + return flavors; 477 477 + } 476 478 477 479 @Override 478 480 public boolean isDataFlavorSupported(DataFlavor flavor)

+9 -3

src/main/java/game/map/hit/CameraZoneData.java

reviewed

··· 223 223 } 224 224 225 225 public List<SelectablePoint> getPoints() 226 226 - { return points; } 226 226 + { 227 227 + return points; 228 228 + } 227 229 228 230 public void drawHelpers(Renderer renderer, CameraController controller, boolean editPointsMode) 229 231 { ··· 594 596 } 595 597 596 598 public ControlType getType() 597 597 - { return type; } 599 599 + { 600 600 + return type; 601 601 + } 598 602 599 603 private void setType(ControlType value) 600 604 { ··· 612 616 } 613 617 614 618 public boolean getFlag() 615 615 - { return flag; } 619 619 + { 620 620 + return flag; 621 621 + } 616 622 617 623 private void setFlag(boolean value) 618 624 {

+6 -2

src/main/java/game/map/hit/Collider.java

reviewed

··· 106 106 107 107 @Override 108 108 public MapObjectType getObjectType() 109 109 - { return MapObjectType.COLLIDER; } 109 109 + { 110 110 + return MapObjectType.COLLIDER; 111 111 + } 110 112 111 113 public Collider(HitType type) 112 114 { ··· 144 146 145 147 @Override 146 148 public MapObjectNode<Collider> getNode() 147 147 - { return node; } 149 149 + { 150 150 + return node; 151 151 + } 148 152 149 153 private static final Color4f[] COLORS = { 150 154 new Color4f(0.0f, 1.0f, 0.0f, 0.50f), // selected

+6 -2

src/main/java/game/map/hit/HitObject.java

reviewed

··· 36 36 } 37 37 38 38 public HitType getType() 39 39 - { return hitType; } 39 39 + { 40 40 + return hitType; 41 41 + } 40 42 41 43 public abstract Color4f[] getColors(boolean useColoring); 42 44 ··· 119 121 120 122 @Override 121 123 public AbstractMesh getMesh() 122 122 - { return mesh; } 124 124 + { 125 125 + return mesh; 126 126 + } 123 127 124 128 @Override 125 129 public void updateMeshHierarchy()

+9 -3

src/main/java/game/map/hit/Zone.java

reviewed

··· 117 117 118 118 @Override 119 119 public MapObjectType getObjectType() 120 120 - { return MapObjectType.ZONE; } 120 120 + { 121 121 + return MapObjectType.ZONE; 122 122 + } 121 123 122 124 public Zone(HitType type) 123 125 { ··· 157 159 158 160 @Override 159 161 public MapObjectNode<Zone> getNode() 160 160 - { return node; } 162 162 + { 163 163 + return node; 164 164 + } 161 165 162 166 private static final Color4f[] COLORS = { 163 167 new Color4f(1.0f, 1.0f, 0.0f, 0.50f), // selected ··· 192 196 193 197 @Override 194 198 public CameraZoneData getCameraControlData() 195 195 - { return camData; } 199 199 + { 200 200 + return camData; 201 201 + } 196 202 197 203 @Override 198 204 public void addPoints(IdentityHashSet<MutablePoint> positionSet)

+18 -6

src/main/java/game/map/marker/Marker.java

reviewed

··· 329 329 330 330 @Override 331 331 public MapObjectType getObjectType() 332 332 - { return MapObjectType.MARKER; } 332 332 + { 333 333 + return MapObjectType.MARKER; 334 334 + } 333 335 334 336 @Override 335 337 public void addTo(BoundingBox aabb) ··· 340 342 341 343 @Override 342 344 public boolean isTransforming() 343 343 - { return position.isTransforming(); } 345 345 + { 346 346 + return position.isTransforming(); 347 347 + } 344 348 345 349 @Override 346 350 public void startTransformation() ··· 539 543 540 544 @Override 541 545 public AbstractMesh getMesh() 542 542 - { return null; } 546 546 + { 547 547 + return null; 548 548 + } 543 549 544 550 @Override 545 551 public void updateMeshHierarchy() ··· 696 702 } 697 703 698 704 public String getDescription() 699 699 - { return description; } 705 705 + { 706 706 + return description; 707 707 + } 700 708 701 709 @Override 702 710 public MapObjectNode<Marker> getNode() 703 703 - { return node; } 711 711 + { 712 712 + return node; 713 713 + } 704 714 705 715 public MarkerType getType() 706 706 - { return type; } 716 716 + { 717 717 + return type; 718 718 + } 707 719 708 720 public void setType(MarkerType value) 709 721 {

+12 -4

src/main/java/game/map/marker/NpcComponent.java

reviewed

··· 626 626 627 627 @Override 628 628 public RenderMode getRenderMode() 629 629 - { return RenderMode.ALPHA_TEST_AA_ZB_2SIDE; } 629 629 + { 630 630 + return RenderMode.ALPHA_TEST_AA_ZB_2SIDE; 631 631 + } 630 632 631 633 @Override 632 634 public Vector3f getCenterPoint() 633 633 - { return comp.parentMarker.position.getVector(); } 635 635 + { 636 636 + return comp.parentMarker.position.getVector(); 637 637 + } 634 638 635 639 @Override 636 640 public void render(RenderingOptions opts, BaseCamera camera) ··· 640 644 641 645 @Override 642 646 public void setDepth(int normalizedDepth) 643 643 - { depth = normalizedDepth; } 647 647 + { 648 648 + depth = normalizedDepth; 649 649 + } 644 650 645 651 @Override 646 652 public int getDepth() 647 647 - { return depth; } 653 653 + { 654 654 + return depth; 655 655 + } 648 656 } 649 657 650 658 private void reloadSprite()

+12 -4

src/main/java/game/map/mesh/Triangle.java

reviewed

··· 99 99 } 100 100 101 101 public void setParent(TriangleBatch b) 102 102 - { parentBatch = b; } 102 102 + { 103 103 + parentBatch = b; 104 104 + } 103 105 104 106 /** 105 107 * @return Deep copy of this Triangle. No hierarchical relationships are copied. ··· 205 207 206 208 @Override 207 209 public boolean isTransforming() 208 208 - { return vert[0].getPosition().isTransforming(); } 210 210 + { 211 211 + return vert[0].getPosition().isTransforming(); 212 212 + } 209 213 210 214 @Override 211 215 public void startTransformation() ··· 245 249 246 250 @Override 247 251 public void setSelected(boolean val) 248 248 - { selected = val; } 252 252 + { 253 253 + selected = val; 254 254 + } 249 255 250 256 @Override 251 257 public boolean isSelected() 252 252 - { return selected; } 258 258 + { 259 259 + return selected; 260 260 + } 253 261 254 262 @Override 255 263 public int hashCode()

+24 -8

src/main/java/game/map/mesh/Vertex.java

reviewed

··· 158 158 * world/local models. 159 159 */ 160 160 public MutablePoint getPosition() 161 161 - { return useLocal ? localPos : worldPos; } 161 161 + { 162 162 + return useLocal ? localPos : worldPos; 163 163 + } 162 164 163 165 public void setPositon(Vector3f pos) 164 166 { ··· 169 171 } 170 172 171 173 public MutablePoint getLocalPosition() 172 172 - { return localPos; } 174 174 + { 175 175 + return localPos; 176 176 + } 173 177 174 178 /** 175 179 * @return ··· 190 194 * transformations (previews) and distiction between world/local models. 191 195 */ 192 196 public int getCurrentX() 193 193 - { return useLocal ? localPos.getX() : worldPos.getX(); } 197 197 + { 198 198 + return useLocal ? localPos.getX() : worldPos.getX(); 199 199 + } 194 200 195 201 /** 196 202 * @return ··· 198 204 * transformations (previews) and distiction between world/local models. 199 205 */ 200 206 public int getCurrentY() 201 201 - { return useLocal ? localPos.getY() : worldPos.getY(); } 207 207 + { 208 208 + return useLocal ? localPos.getY() : worldPos.getY(); 209 209 + } 202 210 203 211 /** 204 212 * @return ··· 206 214 * transformations (previews) and distiction between world/local models. 207 215 */ 208 216 public int getCurrentZ() 209 209 - { return useLocal ? localPos.getZ() : worldPos.getZ(); } 217 217 + { 218 218 + return useLocal ? localPos.getZ() : worldPos.getZ(); 219 219 + } 210 220 211 221 /** 212 222 * Applies a transformation matrix to generate a world coordinate for this vertex. ··· 282 292 283 293 @Override 284 294 public boolean isTransforming() 285 285 - { return getPosition().isTransforming(); } 295 295 + { 296 296 + return getPosition().isTransforming(); 297 297 + } 286 298 287 299 @Override 288 300 public void startTransformation() ··· 319 331 320 332 @Override 321 333 public void setSelected(boolean val) 322 322 - { selected = val; } 334 334 + { 335 335 + selected = val; 336 336 + } 323 337 324 338 @Override 325 339 public boolean isSelected() 326 326 - { return selected; } 340 340 + { 341 341 + return selected; 342 342 + } 327 343 328 344 @Override 329 345 public ReversibleTransform createTransformer(TransformMatrix m)

+3 -1

src/main/java/game/map/scripts/EntityGenerator.java

reviewed

··· 195 195 } 196 196 197 197 public List<String> getLines() 198 198 - { return body; } 198 198 + { 199 199 + return body; 200 200 + } 199 201 200 202 // shared data for entity types 201 203 private void addSupport(List<Marker> entityList)

+2 -2

src/main/java/game/map/scripts/ScriptGenerator.java

reviewed

··· 133 133 // header 134 134 pw.println("% Auto-generated script for " + map.name); 135 135 pw.println(); 136 136 - 136 136 + 137 137 for(String line : out) 138 138 pw.println(line); 139 139 } 140 140 - 140 140 + 141 141 File[] matches = IOUtils.getFileWithin(MOD_MAP_PATCH, patchName, true); 142 142 File modPatch = (matches.length > 0) ? matches[0] : new File(MOD_MAP_PATCH + patchName); 143 143 if(!modPatch.exists())

+2 -2

src/main/java/game/map/scripts/ShadingProfileInfoPanel.java

reviewed

··· 119 119 sourceList.addListSelectionListener((e) -> { 120 120 if(getData() == null) 121 121 return; 122 122 - 122 122 + 123 123 MapEditor.instance().selectionManager.deselectLightsFromGUI(getData().sources); 124 124 if(sourceList.getSelectedValue() != null) 125 125 MapEditor.instance().selectionManager.selectLightsFromGUI(sourceList.getSelectedValue()); 126 126 - 126 126 + 127 127 }); 128 128 */ 129 129

+11 -11

src/main/java/game/map/scripts/UISelectionHelper.java

reviewed

··· 72 72 { 73 73 return getLastModel(true); 74 74 } 75 75 - 75 75 + 76 76 public static Model getLastModel(boolean requireMesh) 77 77 { 78 78 MapObject mostRecent = getLastObject(MapObjectType.MODEL); 79 79 if(mostRecent == null) 80 80 return null; 81 81 - 81 81 + 82 82 Model mdl = (Model)mostRecent; 83 83 if(requireMesh && !mdl.hasMesh()) 84 84 { ··· 86 86 Toolkit.getDefaultToolkit().beep(); 87 87 return null; 88 88 } 89 89 - 89 89 + 90 90 return mdl; 91 91 } 92 92 - 92 92 + 93 93 public static Collider getLastCollider() 94 94 { 95 95 return getLastCollider(true); 96 96 } 97 97 - 97 97 + 98 98 public static Collider getLastCollider(boolean requireMesh) 99 99 { 100 100 MapObject mostRecent = getLastObject(MapObjectType.COLLIDER); 101 101 if(mostRecent == null) 102 102 return null; 103 103 - 103 103 + 104 104 Collider c = (Collider)mostRecent; 105 105 if(requireMesh && !c.hasMesh()) 106 106 { ··· 108 108 Toolkit.getDefaultToolkit().beep(); 109 109 return null; 110 110 } 111 111 - 111 111 + 112 112 return c; 113 113 } 114 114 - 114 114 + 115 115 public static Zone getLastZone() 116 116 { 117 117 return getLastZone(true); 118 118 } 119 119 - 119 119 + 120 120 public static Zone getLastZone(boolean requireMesh) 121 121 { 122 122 MapObject mostRecent = getLastObject(MapObjectType.COLLIDER); 123 123 if(mostRecent == null) 124 124 return null; 125 125 - 125 125 + 126 126 Zone z = (Zone)mostRecent; 127 127 if(requireMesh && !z.hasMesh()) 128 128 { ··· 130 130 Toolkit.getDefaultToolkit().beep(); 131 131 return null; 132 132 } 133 133 - 133 133 + 134 134 return z; 135 135 } 136 136 */

+3 -1

src/main/java/game/map/scripts/extract/Extractor.java

reviewed

··· 130 130 } 131 131 132 132 public String getFileText() 133 133 - { return fileText; } 133 133 + { 134 134 + return fileText; 135 135 + } 134 136 135 137 public void setFileText(String newText) 136 138 {

+5 -5

src/main/java/game/map/scripts/extract/MapPropertiesExtractor.java

reviewed

··· 41 41 } 42 42 43 43 /* 44 44 - 44 44 + 45 45 ShadingMatcher.reset(workingText); 46 46 if (ShadingMatcher.find()) { 47 47 modified = true; 48 48 if (out == null) 49 49 out = new StringBuilder(extractor.getFileText().length()); 50 50 - 50 50 + 51 51 String profileName = ShadingMatcher.group(1); 52 52 map.scripts.hasSpriteShading.set(!"SHADING_NONE".equals(profileName)); 53 53 - 53 53 + 54 54 map.scripts.shadingProfile.set(null); 55 55 //TODO 56 56 - 56 56 + 57 57 ShadingMatcher.appendReplacement(out, "Call(SetSpriteShading, MAP_SPRITE_SHADING)"); 58 58 - 58 58 + 59 59 if (modifiedLine) { 60 60 modified = true; 61 61 }

+3 -1

src/main/java/game/map/scripts/extract/StageExtractor.java

reviewed

··· 120 120 } 121 121 122 122 public String getFileText() 123 123 - { return fileText; } 123 123 + { 124 124 + return fileText; 125 125 + } 124 126 125 127 public void setFileText(String newText) 126 128 {

+3 -1

src/main/java/game/map/scripts/extract/entity/ArrowSign.java

reviewed

··· 54 54 55 55 @Override 56 56 public List<String> getLines() 57 57 - { return super.getLines(); } 57 57 + { 58 58 + return super.getLines(); 59 59 + } 58 60 59 61 @Override 60 62 public void addHeaderDefines(HeaderEntry h)

+3 -1

src/main/java/game/map/scripts/extract/entity/ExtractedEntity.java

reviewed

··· 57 57 } 58 58 59 59 public String getIndent() 60 60 - { return indent; } 60 60 + { 61 61 + return indent; 62 62 + } 61 63 62 64 public List<String> getLines() 63 65 {

+3 -3

src/main/java/game/map/scripts/generators/Entrance.java

reviewed

··· 190 190 { 191 191 this(type); 192 192 ScriptLine gotoMap = null; 193 193 - 193 193 + 194 194 switch(type) 195 195 { 196 196 case Walk: 197 197 markerID = script.get(1).args[2]; 198 198 gotoMap = script.get(3); 199 199 break; 200 200 - 200 200 + 201 201 case SingleDoor: 202 202 doorSound = DataConstants.DoorSoundsType.getName(script.get(2).args[1]); 203 203 markerID = script.get(3).args[1]; ··· 205 205 doorSwing = DataConstants.DoorSwingsType.getName(script.get(6).args[1]); 206 206 gotoMap = script.get(9); 207 207 break; 208 208 - 208 208 + 209 209 case DoubleDoor: 210 210 doorSound = DataConstants.DoorSoundsType.getName(script.get(2).args[1]); 211 211 markerID = script.get(3).args[1];

+3 -1

src/main/java/game/map/scripts/generators/Generator.java

reviewed

··· 50 50 } 51 51 52 52 public String getName() 53 53 - { return nodeName; } 53 53 + { 54 54 + return nodeName; 55 55 + } 54 56 } 55 57 56 58 public static enum ValidationState

+3 -1

src/main/java/game/map/scripts/generators/foliage/Foliage.java

reviewed

··· 40 40 } 41 41 42 42 public String getName() 43 43 - { return name; } 43 43 + { 44 44 + return name; 45 45 + } 44 46 } 45 47 46 48 public final EditableField<String> overrideName;

+3 -1

src/main/java/game/map/scripts/generators/foliage/FoliageDropEditor.java

reviewed

··· 125 125 } 126 126 127 127 public FoliageDrop getEditedDrop() 128 128 - { return drop; } 128 128 + { 129 129 + return drop; 130 130 + } 129 131 }

+3 -1

src/main/java/game/map/scripts/generators/foliage/FoliageModelEditor.java

reviewed

··· 47 47 } 48 48 49 49 public String getValue() 50 50 - { return name; } 50 50 + { 51 51 + return name; 52 52 + } 51 53 }

+3 -1

src/main/java/game/map/scripts/generators/foliage/FoliageVectorEditor.java

reviewed

··· 48 48 } 49 49 50 50 public String getValue() 51 51 - { return name; } 51 51 + { 52 52 + return name; 53 53 + } 52 54 }

+3 -1

src/main/java/game/map/shading/SpriteShadingData.java

reviewed

··· 136 136 } 137 137 138 138 public ShadingProfile getProfile() 139 139 - { return profile; } 139 139 + { 140 140 + return profile; 141 141 + } 140 142 141 143 @Override 142 144 public boolean modifiesMap()

+6 -2

src/main/java/game/map/shape/Fixed.java

reviewed

··· 48 48 } 49 49 50 50 public short getWholePart() 51 51 - { return (short) (v >> 16); } 51 51 + { 52 52 + return (short) (v >> 16); 53 53 + } 52 54 53 55 public short getFracPart() 54 54 - { return (short) v; } 56 56 + { 57 57 + return (short) v; 58 58 + } 55 59 56 60 @Override 57 61 public String toString()

+3 -1

src/main/java/game/map/shape/LightSet.java

reviewed

··· 165 165 } 166 166 167 167 public int getLightCount() 168 168 - { return lightList.size(); } 168 168 + { 169 169 + return lightList.size(); 170 170 + } 169 171 170 172 public static LightSet createEmptySet() 171 173 {

+15 -5

src/main/java/game/map/shape/Model.java

reviewed

··· 522 522 523 523 @Override 524 524 public MapObjectType getObjectType() 525 525 - { return MapObjectType.MODEL; } 525 525 + { 526 526 + return MapObjectType.MODEL; 527 527 + } 526 528 527 529 /** 528 530 * Camera Controller ··· 536 538 537 539 @Override 538 540 public CameraZoneData getCameraControlData() 539 539 - { return camData; } 541 541 + { 542 542 + return camData; 543 543 + } 540 544 541 545 @Override 542 546 public void addPoints(IdentityHashSet<MutablePoint> positionSet) ··· 567 571 568 572 @Override 569 573 public TexturedMesh getMesh() 570 570 - { return mesh; } 574 574 + { 575 575 + return mesh; 576 576 + } 571 577 572 578 public void setMesh(TexturedMesh newMesh) 573 579 { ··· 635 641 } 636 642 637 643 public Color getTreeTextColor() 638 638 - { return (hasTransformMatrix.get() && !localTransformMatrix.baked) ? SwingUtils.getBlueTextColor() : null; } 644 644 + { 645 645 + return (hasTransformMatrix.get() && !localTransformMatrix.baked) ? SwingUtils.getBlueTextColor() : null; 646 646 + } 639 647 640 648 public void calculateLocalAABB() 641 649 { ··· 759 767 760 768 @Override 761 769 public MapObjectNode<Model> getNode() 762 762 - { return node; } 770 770 + { 771 771 + return node; 772 772 + } 763 773 764 774 public static final class SetMatrixElement extends AbstractCommand 765 775 {

+12 -4

src/main/java/game/map/shape/ModelRenderer.java

reviewed

··· 157 157 158 158 @Override 159 159 public RenderMode getRenderMode() 160 160 - { return mdl.renderMode.get(); } 160 160 + { 161 161 + return mdl.renderMode.get(); 162 162 + } 161 163 162 164 @Override 163 165 public Vector3f getCenterPoint() 164 164 - { return mdl.AABB.getCenter(); } 166 166 + { 167 167 + return mdl.AABB.getCenter(); 168 168 + } 165 169 166 170 @Override 167 171 public void render(RenderingOptions opts, BaseCamera camera) ··· 171 175 172 176 @Override 173 177 public void setDepth(int normalizedDepth) 174 174 - { depth = normalizedDepth; } 178 178 + { 179 179 + depth = normalizedDepth; 180 180 + } 175 181 176 182 @Override 177 183 public int getDepth() 178 178 - { return depth; } 184 184 + { 185 185 + return depth; 186 186 + } 179 187 } 180 188 }

+3 -1

src/main/java/game/map/shape/TriangleBatch.java

reviewed

··· 121 121 122 122 @Override 123 123 public CmdType getType() 124 124 - { return CmdType.DrawTriangleBatch; } 124 124 + { 125 125 + return CmdType.DrawTriangleBatch; 126 126 + } 125 127 126 128 @Override 127 129 public int[] getF3DEX2Command()

+15 -5

src/main/java/game/map/shape/UV.java

reviewed

··· 30 30 } 31 31 32 32 public short getU() 33 33 - { return (short) texCoordinate.getX(); } 33 33 + { 34 34 + return (short) texCoordinate.getX(); 35 35 + } 34 36 35 37 public short getV() 36 36 - { return (short) texCoordinate.getY(); } 38 38 + { 39 39 + return (short) texCoordinate.getY(); 40 40 + } 37 41 38 42 public Vector3f toVector() 39 43 { ··· 69 73 70 74 @Override 71 75 public boolean isTransforming() 72 72 - { return texCoordinate.isTransforming(); } 76 76 + { 77 77 + return texCoordinate.isTransforming(); 78 78 + } 73 79 74 80 @Override 75 81 public void startTransformation() ··· 101 107 102 108 @Override 103 109 public void setSelected(boolean val) 104 104 - { selected = val; } 110 110 + { 111 111 + selected = val; 112 112 + } 105 113 106 114 @Override 107 115 public boolean isSelected() 108 108 - { return selected; } 116 116 + { 117 117 + return selected; 118 118 + } 109 119 110 120 public UV deepCopy() 111 121 {

+15 -15

src/main/java/game/map/shape/UVUnwrapper.java

reviewed

··· 83 83 uvList.endDirectTransformation(); 84 84 85 85 /* 86 86 - 86 86 + 87 87 ArrayList<Vertex> vertexList = getUniqueVertices(triangleList); 88 88 ArrayList<float[]> forceList = new ArrayList<>(vertexList.size()); 89 89 for(int i = 0; i < vertexList.size(); i++) 90 90 forceList.add(new float[] {0, 0}); 91 91 - 91 91 + 92 92 // 93 93 Selection<UV> uvList = new Selection<>(); 94 94 BoundingBox aabb = new BoundingBox(); ··· 99 99 } 100 100 Vector3f center = aabb.getCenter(); 101 101 uvList.startDirectTransformation(); 102 102 - 102 102 + 103 103 // initial state from spherical projection 104 104 int[] coords = new int[3]; 105 105 - 105 105 + 106 106 for(Vertex v : vertexList) 107 107 { 108 108 coords[0] = v.getPosition().getX() - (int)center.x; 109 109 coords[1] = v.getPosition().getY() - (int)center.y; 110 110 coords[2] = v.getPosition().getZ() - (int)center.z; 111 111 - 111 111 + 112 112 int radius = (int)Math.sqrt(coords[0]*coords[0] + coords[1]*coords[1]); 113 113 int azimuth = 180 + (int)Math.toDegrees(Math.atan2(coords[1], coords[0])); 114 114 int polar = 180 + (int)Math.toDegrees(Math.atan2(radius, coords[2])); 115 115 - 115 115 + 116 116 v.uv.setPosition(8 * azimuth, 8 * polar); 117 117 } 118 118 - 118 118 + 119 119 float kE = 1.0f; 120 120 float kA = 1.0f; 121 121 - 121 121 + 122 122 int maxIterations = 100; 123 123 - 123 123 + 124 124 float maxForce = 0.0f; 125 125 float forceTolerance = 0.0f; 126 126 - 126 126 + 127 127 for(int i = 0; i < maxIterations; i++) 128 128 { 129 129 for(UV uv : uvList.list) ··· 131 131 uv.force[0] = 0; 132 132 uv.force[1] = 0; 133 133 } 134 134 - 134 134 + 135 135 for(UnwrapEdge e : edgeList) 136 136 e.addForces(kE); 137 137 - 137 137 + 138 138 for(UnwrapFace f : faceList) 139 139 f.addForces(kA); 140 140 - 140 140 + 141 141 for(UV uv : uvList.list) 142 142 { 143 143 uv.setPosition(uv.getU() + uv.force[0], uv.getV() + uv.force[1]); 144 144 } 145 145 - 145 145 + 146 146 if(maxForce < forceTolerance) 147 147 break; 148 148 } 149 149 - 149 149 + 150 150 uvList.endDirectTransformation(); 151 151 */ 152 152 }

+3 -1

src/main/java/game/map/shape/commands/ClearGeometryFlags.java

reviewed

··· 35 35 36 36 @Override 37 37 public CmdType getType() 38 38 - { return CmdType.SetGeometryFlags; } 38 38 + { 39 39 + return CmdType.SetGeometryFlags; 40 40 + } 39 41 40 42 @Override 41 43 public int[] getF3DEX2Command()

+6 -2

src/main/java/game/map/shape/commands/CustomCommand.java

reviewed

··· 32 32 33 33 @Override 34 34 public CmdType getType() 35 35 - { return CmdType.Custom; } 35 35 + { 36 36 + return CmdType.Custom; 37 37 + } 36 38 37 39 @Override 38 40 public int[] getF3DEX2Command() 39 39 - { return new int[] { r, s }; } 41 41 + { 42 42 + return new int[] { r, s }; 43 43 + } 40 44 41 45 @Override 42 46 public DisplayCommand deepCopy()

+5 -5

src/main/java/game/map/shape/commands/DisplayCommand.java

reviewed

··· 6 6 { 7 7 /* 8 8 These are the only display commands that are used: 9 9 - 9 9 + 10 10 * DrawTriangleBatch 11 11 01 F3DEX2_LOAD_VTX 12 12 05 F3DEX2_DRAW_TRI 13 13 06 F3DEX2_DRAW_TRIS 14 14 - 14 14 + 15 15 * RDP Pipe Sync 16 16 E7 RDP_PIPE_SYNC 17 17 - 17 17 + 18 18 * Set Geometry Flags 19 19 * Clear Geometry Flags 20 20 D9 F3DEX2_GEOMETRYMODE 21 21 - 21 21 + 22 22 * Matrix Commands (handled by model tree) 23 23 D8 F3DEX2_POP_MATRIX 24 24 DA F3DEX2_LOAD_MATRIX 25 25 - 25 25 + 26 26 * No Associated Command 27 27 DE F3DEX2_START_DL 28 28 DF F3DEX2_END_DL

+6 -2

src/main/java/game/map/shape/commands/FlushPipeline.java

reviewed

··· 17 17 18 18 @Override 19 19 public CmdType getType() 20 20 - { return CmdType.PipeSync; } 20 20 + { 21 21 + return CmdType.PipeSync; 22 22 + } 21 23 22 24 @Override 23 25 public int[] getF3DEX2Command() 24 24 - { return new int[] { 0xE7000000, 0x00000000 }; } 26 26 + { 27 27 + return new int[] { 0xE7000000, 0x00000000 }; 28 28 + } 25 29 26 30 @Override 27 31 public DisplayCommand deepCopy()

+6 -2

src/main/java/game/map/shape/commands/SetGeometryFlags.java

reviewed

··· 35 35 36 36 @Override 37 37 public CmdType getType() 38 38 - { return CmdType.SetGeometryFlags; } 38 38 + { 39 39 + return CmdType.SetGeometryFlags; 40 40 + } 39 41 40 42 @Override 41 43 public int[] getF3DEX2Command() 42 42 - { return new int[] { 0xD9FFFFFF, getFlags() }; } 44 44 + { 45 45 + return new int[] { 0xD9FFFFFF, getFlags() }; 46 46 + } 43 47 44 48 @Override 45 49 public DisplayCommand deepCopy()

+12 -4

src/main/java/game/map/tree/CategoryTreeModel.java

reviewed

··· 179 179 180 180 @Override 181 181 public Dimension getPreferredSize() 182 182 - { return size; } 182 182 + { 183 183 + return size; 184 184 + } 183 185 184 186 /* 185 187 @Override ··· 245 247 } 246 248 247 249 public K getCategory() 248 248 - { return category; } 250 250 + { 251 251 + return category; 252 252 + } 249 253 250 254 @SuppressWarnings("unchecked") 251 255 public T getObject() ··· 257 261 } 258 262 259 263 public boolean isCategory() 260 260 - { return isCategory; } 264 264 + { 265 265 + return isCategory; 266 266 + } 261 267 262 268 public boolean isObject() 263 263 - { return isObject; } 269 269 + { 270 270 + return isObject; 271 271 + } 264 272 } 265 273 }

+4 -2

src/main/java/game/map/tree/MapObjectJTree.java

reviewed

··· 74 74 { 75 75 /* 76 76 private static final Dimension DEFAULT_SIZE = new Dimension(300,20); 77 77 - 77 77 + 78 78 @Override 79 79 public Dimension getPreferredSize() 80 80 { ··· 489 489 490 490 @Override 491 491 public DataFlavor[] getTransferDataFlavors() 492 492 - { return flavors; } 492 492 + { 493 493 + return flavors; 494 494 + } 493 495 494 496 @Override 495 497 public boolean isDataFlavorSupported(DataFlavor flavor)

+15 -5

src/main/java/game/map/tree/MapObjectNode.java

reviewed

··· 23 23 } 24 24 25 25 public MapObjectType getObjectType() 26 26 - { return getUserObject().getObjectType(); } 26 26 + { 27 27 + return getUserObject().getObjectType(); 28 28 + } 27 29 28 30 @Override 29 31 public void add(MutableTreeNode child) ··· 43 45 @SuppressWarnings("unchecked") 44 46 @Override 45 47 public MapObjectNode<T> getParent() 46 46 - { return (MapObjectNode<T>) super.getParent(); } 48 48 + { 49 49 + return (MapObjectNode<T>) super.getParent(); 50 50 + } 47 51 48 52 // cuts down on the amount of casting required 49 53 @SuppressWarnings("unchecked") ··· 61 65 @SuppressWarnings("unchecked") 62 66 @Override 63 67 public T getUserObject() 64 64 - { return (T) super.getUserObject(); } 68 68 + { 69 69 + return (T) super.getUserObject(); 70 70 + } 65 71 66 72 /** 67 73 * It is assumed that any node which allows children is a group and ··· 69 75 */ 70 76 @Override 71 77 public boolean getAllowsChildren() 72 72 - { return getUserObject().allowsChildren(); } 78 78 + { 79 79 + return getUserObject().allowsChildren(); 80 80 + } 73 81 74 82 public int reassignIndexDepthFirstPost(int current) 75 83 { ··· 98 106 } 99 107 100 108 public int getTreeIndex() 101 101 - { return treeIndex; } 109 109 + { 110 110 + return treeIndex; 111 111 + } 102 112 103 113 @Override 104 114 public int compareTo(MapObjectNode<T> other)

+9 -3

src/main/java/game/map/tree/MapObjectTreeModel.java

reviewed

··· 30 30 } 31 31 32 32 public void setTree(MapObjectJTree<T> tree) 33 33 - { this.tree = tree; } 33 33 + { 34 34 + this.tree = tree; 35 35 + } 34 36 35 37 public MapObjectJTree<T> getTree() 36 36 - { return tree; } 38 38 + { 39 39 + return tree; 40 40 + } 37 41 38 42 public static <T extends MapObject> MapObjectNode<T> load(XmlReader xmr, Element objTreeElement, HashMap<Integer, T> objMap) 39 43 { ··· 102 106 @Override 103 107 @SuppressWarnings("unchecked") 104 108 public MapObjectNode<T> getRoot() 105 105 - { return (MapObjectNode<T>) super.getRoot(); } 109 109 + { 110 110 + return (MapObjectNode<T>) super.getRoot(); 111 111 + } 106 112 107 113 /* 108 114 * Returns a list of MapObjects corresponding to a depth-first

+21 -7

src/main/java/game/message/Message.java

reviewed

··· 95 95 } 96 96 97 97 public String getMarkup() 98 98 - { return markup; } 98 98 + { 99 99 + return markup; 100 100 + } 99 101 100 102 public void sanitize() 101 103 { ··· 125 127 } 126 128 127 129 public int getID() 128 128 - { return ((section & 0xFFFF) << 16) | (index & 0xFFFF); } 130 130 + { 131 131 + return ((section & 0xFFFF) << 16) | (index & 0xFFFF); 132 132 + } 129 133 130 134 public String getIDName() 131 131 - { return String.format("%02X-%03X", section, index); } 135 135 + { 136 136 + return String.format("%02X-%03X", section, index); 137 137 + } 132 138 133 139 @Override 134 140 public String toString() ··· 137 143 } 138 144 139 145 public String getIdentifier() 140 140 - { return name; } 146 146 + { 147 147 + return name; 148 148 + } 141 149 142 150 public void setModified() 143 151 { ··· 147 155 } 148 156 149 157 public boolean isModified() 150 150 - { return modified; } 158 158 + { 159 159 + return modified; 160 160 + } 151 161 152 162 public void setErrorMessage(String string) 153 163 { ··· 162 172 } 163 173 164 174 public String getErrorMessage() 165 165 - { return errorMessage; } 175 175 + { 176 176 + return errorMessage; 177 177 + } 166 178 167 179 public boolean hasError() 168 180 { ··· 171 183 172 184 @Override 173 185 public String getFilterableString() 174 174 - { return name.replaceAll("_", " ") + " " + toString(); } 186 186 + { 187 187 + return name.replaceAll("_", " ") + " " + toString(); 188 188 + } 175 189 }

+15 -7

src/main/java/game/message/MessageBoxes.java

reviewed

··· 65 65 private Palette pal; 66 66 67 67 public File getFile() 68 68 - { return AssetManager.get(AssetSubdir.UI_MSG, filename + ".png"); } 68 68 + { 69 69 + return AssetManager.get(AssetSubdir.UI_MSG, filename + ".png"); 70 70 + } 69 71 70 72 public Color[] getColors() 71 71 - { return pal.getColors(); } 73 73 + { 74 74 + return pal.getColors(); 75 75 + } 72 76 } 73 77 74 78 public static enum WindowPart ··· 135 139 private Tile tile; 136 140 137 141 public File getFile() 138 138 - { return AssetManager.get(AssetSubdir.UI_MSG, filename + ".png"); } 142 142 + { 143 143 + return AssetManager.get(AssetSubdir.UI_MSG, filename + ".png"); 144 144 + } 139 145 140 146 public void drawBasicQuad(float x, float y) 141 147 { ··· 163 169 shader.renderQuad(); 164 170 165 171 /* 166 166 - 172 172 + 167 173 TriangleRenderQueue.addQuad( 168 174 TriangleRenderQueue.addVertex().setPosition(x1, y1, 0).setUV(0,0).getIndex(), 169 175 TriangleRenderQueue.addVertex().setPosition(x2, y1, 0).setUV(1,0).getIndex(), 170 176 TriangleRenderQueue.addVertex().setPosition(x2, y2, 0).setUV(1,1).getIndex(), 171 177 TriangleRenderQueue.addVertex().setPosition(x1, y2, 0).setUV(0,1).getIndex()); 172 172 - 178 178 + 173 179 /* 174 180 TriangleRenderQueue.addVertex().setPosition(x1, y2, 0).setUV(0.05f,0.05f).getIndex(), 175 181 TriangleRenderQueue.addVertex().setPosition(x2, y2, 0).setUV(0.95f,0.05f).getIndex(), 176 182 TriangleRenderQueue.addVertex().setPosition(x2, y1, 0).setUV(0.95f,0.95f).getIndex(), 177 183 TriangleRenderQueue.addVertex().setPosition(x1, y1, 0).setUV(0.05f,0.95f).getIndex()); 178 184 / 179 179 - 185 185 + 180 186 TriangleRenderQueue.render(true); 181 187 */ 182 188 } ··· 246 252 private int glTexID; 247 253 248 254 public File getFile() 249 249 - { return AssetManager.get(subdir, filename + ".png"); } 255 255 + { 256 256 + return AssetManager.get(subdir, filename + ".png"); 257 257 + } 250 258 251 259 public void drawBasicQuad(float x, float y) 252 260 {

+3 -1

src/main/java/game/message/StringConstants.java

reviewed

··· 26 26 //protected static final String CONTINUE_LINE_TAG = "..."; 27 27 28 28 public static int getMaxStringVars() 29 29 - { return 3; } 29 29 + { 30 30 + return 3; 31 31 + } 30 32 31 33 public static enum ControlCharacter 32 34 {

+2 -2

src/main/java/game/message/editor/AssetListTab.java

reviewed

··· 70 70 { 71 71 StringTreeNode node = nodes.pop(); 72 72 FileMetadata nodeData = node.getUserObject(); 73 73 - 73 73 + 74 74 if(nodeData.getType() == FileType.Resource && nodeData.modified) 75 75 { 76 76 StringResource res = nodeData.getResource(); 77 77 if(!editor.resourcesToSave.contains(res)) 78 78 editor.resourcesToSave.add(res); 79 79 } 80 80 - 80 80 + 81 81 for(int i = 0; i < node.getChildCount(); i++) 82 82 nodes.push(node.getChildAt(i)); 83 83 }

+3 -1

src/main/java/game/message/editor/ColorSelectionDialogPanel.java

reviewed

··· 19 19 private static ImageIcon[] previews; 20 20 21 21 public static void setButtonIcons(ImageIcon[] images) 22 22 - { previews = images; } 22 22 + { 23 23 + previews = images; 24 24 + } 23 25 24 26 private ColorSelectionDialogPanel(JFrame parent) 25 27 {

+6 -2

src/main/java/game/message/editor/MessagePrinter.java

reviewed

··· 795 795 } 796 796 797 797 public int getAnimSprite() 798 798 - { return anim.sprites.get(0); } 798 798 + { 799 799 + return anim.sprites.get(0); 800 800 + } 799 801 800 802 public int getAnimRaster() 801 801 - { return anim.currentRaster; } 803 803 + { 804 804 + return anim.currentRaster; 805 805 + } 802 806 }

+6 -2

src/main/java/game/message/font/FontManager.java

reviewed

··· 51 51 private static boolean readyForGL = false; 52 52 53 53 public static boolean isLoaded() 54 54 - { return loaded; } 54 54 + { 55 55 + return loaded; 56 56 + } 55 57 56 58 public static boolean isReadyForGL() 57 57 - { return readyForGL; } 59 59 + { 60 60 + return readyForGL; 61 61 + } 58 62 59 63 public static void loadData() throws IOException 60 64 {

+3 -1

src/main/java/game/sprite/ImgAsset.java

reviewed

··· 49 49 } 50 50 51 51 public String getName() 52 52 - { return FilenameUtils.removeExtension(source.getName()); } 52 52 + { 53 53 + return FilenameUtils.removeExtension(source.getName()); 54 54 + } 53 55 54 56 @Override 55 57 public String toString()

+3 -1

src/main/java/game/sprite/RawAnimation.java

reviewed

··· 43 43 } 44 44 45 45 public List<Entry<Integer, String>> getAllLabels() 46 46 - { return new ArrayList<>(labels.entrySet()); } 46 46 + { 47 47 + return new ArrayList<>(labels.entrySet()); 48 48 + } 47 49 48 50 public RawAnimation deepCopy() 49 51 {

+9 -3

src/main/java/game/sprite/Sprite.java

reviewed

··· 130 130 } 131 131 132 132 public String getDirectoryName() 133 133 - { return source.getParentFile() + "/"; } 133 133 + { 134 134 + return source.getParentFile() + "/"; 135 135 + } 134 136 135 137 public boolean isPlayerSprite() 136 136 - { return isPlayerSprite; } 138 138 + { 139 139 + return isPlayerSprite; 140 140 + } 137 141 138 142 public static Sprite readNpc(File xmlFile, String name) 139 143 { ··· 578 582 } 579 583 580 584 public int getPaletteCount() 581 581 - { return palettes.size(); } 585 585 + { 586 586 + return palettes.size(); 587 587 + } 582 588 583 589 public int lastValidPaletteID() 584 590 {

+9 -3

src/main/java/game/sprite/SpriteAnimation.java

reviewed

··· 33 33 } 34 34 35 35 public int getComponentCount() 36 36 - { return components.size(); } 36 36 + { 37 37 + return components.size(); 38 38 + } 37 39 38 40 @Override 39 41 public String toString() ··· 43 45 44 46 @Override 45 47 public SpriteAnimation getObject() 46 46 - { return this; } 48 48 + { 49 49 + return this; 50 50 + } 47 51 48 52 @Override 49 53 public int getIndex() 50 50 - { return listIndex; } 54 54 + { 55 55 + return listIndex; 56 56 + } 51 57 52 58 public void step() 53 59 {

+15 -5

src/main/java/game/sprite/SpriteComponent.java

reviewed

··· 141 141 } 142 142 143 143 public int getX() 144 144 - { return posx + dx; } 144 144 + { 145 145 + return posx + dx; 146 146 + } 145 147 146 148 public int getY() 147 147 - { return posy + dy; } 149 149 + { 150 150 + return posy + dy; 151 151 + } 148 152 149 153 public int getZ() 150 150 - { return posz + dz; } 154 154 + { 155 155 + return posz + dz; 156 156 + } 151 157 152 158 public void addCorners(BoundingBox aabb) 153 159 { ··· 454 460 455 461 @Override 456 462 public SpriteComponent getObject() 457 457 - { return this; } 463 463 + { 464 464 + return this; 465 465 + } 458 466 459 467 @Override 460 468 public int getIndex() 461 461 - { return listIndex; } 469 469 + { 470 470 + return listIndex; 471 471 + } 462 472 463 473 /* 464 474 * When composing transformations, the order is:

+6 -2

src/main/java/game/sprite/SpriteLoader.java

reviewed

··· 49 49 50 50 @Override 51 51 public String getObject() 52 52 - { return name; } 52 52 + { 53 53 + return name; 54 54 + } 53 55 54 56 @Override 55 57 public int getIndex() 56 56 - { return id; } 58 58 + { 59 59 + return id; 60 60 + } 57 61 58 62 public long lastModified() 59 63 {

+12 -4

src/main/java/game/sprite/SpritePalette.java

reviewed

··· 36 36 } 37 37 38 38 public Sprite getSprite() 39 39 - { return spr; } 39 39 + { 40 40 + return spr; 41 41 + } 40 42 41 43 @Override 42 44 public String toString() ··· 46 48 47 49 @Override 48 50 public SpritePalette getObject() 49 49 - { return this; } 51 51 + { 52 52 + return this; 53 53 + } 50 54 51 55 @Override 52 56 public int getIndex() 53 53 - { return listIndex; } 57 57 + { 58 58 + return listIndex; 59 59 + } 54 60 55 61 public boolean hasPal() 56 62 { ··· 58 64 } 59 65 60 66 public Palette getPal() 61 61 - { return (asset == null) ? null : asset.pal; } 67 67 + { 68 68 + return (asset == null) ? null : asset.pal; 69 69 + } 62 70 63 71 public void saveAs(File out) 64 72 {

+12 -4

src/main/java/game/sprite/SpriteRaster.java

reviewed

··· 41 41 } 42 42 43 43 public Sprite getSprite() 44 44 - { return spr; } 44 44 + { 45 45 + return spr; 46 46 + } 45 47 46 48 public ImgAsset getFront() 47 47 - { return front.asset; } 49 49 + { 50 50 + return front.asset; 51 51 + } 48 52 49 53 public ImgAsset getBack() 50 50 - { return back.asset; } 54 54 + { 55 55 + return back.asset; 56 56 + } 51 57 52 58 public void bindRasters(LinkedHashMap<String, ImgAsset> imgAssets) 53 59 { ··· 71 77 } 72 78 73 79 public int getIndex() 74 74 - { return listIndex; } 80 80 + { 81 81 + return listIndex; 82 82 + } 75 83 76 84 public boolean hasMissing() 77 85 {

+3 -1

src/main/java/game/sprite/editor/PalettesTab.java

reviewed

··· 382 382 } 383 383 384 384 public SpritePalette getOverridePalette() 385 385 - { return paletteList.list.getSelectedValue(); } 385 385 + { 386 386 + return paletteList.list.getSelectedValue(); 387 387 + } 386 388 387 389 private void setSelectedColor(Color c) 388 390 {

+3 -1

src/main/java/game/sprite/editor/SpriteList.java

reviewed

··· 110 110 } 111 111 112 112 public SpriteMetadata getSelected() 113 113 - { return list.getSelectedValue(); } 113 113 + { 114 114 + return list.getSelectedValue(); 115 115 + } 114 116 115 117 public int getInitialSelection(String name) 116 118 {

+3 -1

src/main/java/game/sprite/editor/animators/BlankArrowUI.java

reviewed

··· 11 11 return new JButton() { 12 12 @Override 13 13 public int getWidth() 14 14 - { return 0; } 14 14 + { 15 15 + return 0; 16 16 + } 15 17 }; 16 18 } 17 19 }

+3 -1

src/main/java/game/sprite/editor/dialogs/ListPanel.java

reviewed

··· 75 75 } 76 76 77 77 public DefaultListModel<T> getListModel() 78 78 - { return (DefaultListModel<T>) list.getModel(); } 78 78 + { 79 79 + return (DefaultListModel<T>) list.getModel(); 80 80 + } 79 81 80 82 protected boolean canDelete(T item) 81 83 {

+18 -6

src/main/java/game/texture/ModelTexture.java

reviewed

··· 71 71 } 72 72 73 73 public String getName() 74 74 - { return tx.name; } 74 74 + { 75 75 + return tx.name; 76 76 + } 75 77 76 78 public int getHeight() 77 77 - { return tx.main.height; } 79 79 + { 80 80 + return tx.main.height; 81 81 + } 78 82 79 83 public int getWidth() 80 80 - { return tx.main.width; } 84 84 + { 85 85 + return tx.main.width; 86 86 + } 81 87 82 88 public boolean hasAux() 83 89 { ··· 85 91 } 86 92 87 93 public int getAuxHeight() 88 88 - { return tx.aux.height; } 94 94 + { 95 95 + return tx.aux.height; 96 96 + } 89 97 90 98 public int getAuxWidth() 91 91 - { return tx.aux.width; } 99 99 + { 100 100 + return tx.aux.width; 101 101 + } 92 102 93 103 public int getAuxCombine() 94 94 - { return tx.auxCombine; } 104 104 + { 105 105 + return tx.auxCombine; 106 106 + } 95 107 96 108 public static float getScaleU(ModelTexture texture) 97 109 {

+1 -1

src/main/java/game/texture/Tile.java

reviewed

··· 493 493 494 494 /* 495 495 GL_TEXTURE_MIN_FILTER: 496 496 - 496 496 + 497 497 GL_NEAREST_MIPMAP_NEAREST 498 498 GL_NEAREST_MIPMAP_LINEAR 499 499 GL_LINEAR_MIPMAP_NEAREST

+4 -2

src/main/java/game/texture/editor/EditorImage.java

reviewed

··· 698 698 } 699 699 700 700 public int getNumSelected() 701 701 - { return selectedCount; } 701 701 + { 702 702 + return selectedCount; 703 703 + } 702 704 703 705 public boolean hasSelectedPixels() 704 706 { ··· 838 840 palette[k++] = new Color(intensity, intensity, intensity, alpha); 839 841 } 840 842 } 841 841 - 843 843 + 842 844 for(int j = 0; j < 16; j++) 843 845 { 844 846 int alpha = 17 * j; // 0 -> 0, 15 -> 255

+1 -1

src/main/java/game/texture/editor/ImageEditor.java

reviewed

··· 1195 1195 else 1196 1196 image.draw(mousePixelX, mousePixelY, pickedPixel); 1197 1197 } 1198 1198 - 1198 1198 + 1199 1199 if(mouseManager.holdingRMB && mousePixelValid) 1200 1200 image.deselect(mousePixelX, mousePixelY); 1201 1201 */

+3 -1

src/main/java/game/texture/editor/Pixel.java

reviewed

··· 60 60 } 61 61 62 62 public int getARGB() 63 63 - { return (a << 24) | (r << 16) | (g << 8) | b; } 63 63 + { 64 64 + return (a << 24) | (r << 16) | (g << 8) | b; 65 65 + } 64 66 65 67 public boolean equals(Pixel other) 66 68 {

+9 -3

src/main/java/game/texture/editor/dialogs/CreateOptionsPanel.java

reviewed

··· 50 50 } 51 51 52 52 public TileFormat getFormat() 53 53 - { return (TileFormat) fmtComboBox.getSelectedItem(); } 53 53 + { 54 54 + return (TileFormat) fmtComboBox.getSelectedItem(); 55 55 + } 54 56 55 57 public int getImageWidth() 56 56 - { return widthModel.getNumber().intValue(); } 58 58 + { 59 59 + return widthModel.getNumber().intValue(); 60 60 + } 57 61 58 62 public int getImageHeight() 59 59 - { return heightModel.getNumber().intValue(); } 63 63 + { 64 64 + return heightModel.getNumber().intValue(); 65 65 + } 60 66 }

+3 -1

src/main/java/game/texture/editor/dialogs/ImportOptionsPanel.java

reviewed

··· 26 26 } 27 27 28 28 public TileFormat getFormat() 29 29 - { return (TileFormat) fmtComboBox.getSelectedItem(); } 29 29 + { 30 30 + return (TileFormat) fmtComboBox.getSelectedItem(); 31 31 + } 30 32 }

+6 -2

src/main/java/game/worldmap/WorldMapModder.java

reviewed

··· 45 45 } 46 46 47 47 public int getX() 48 48 - { return x + Math.round(dragX); } 48 48 + { 49 49 + return x + Math.round(dragX); 50 50 + } 49 51 50 52 public int getY() 51 51 - { return y + Math.round(dragY); } 53 53 + { 54 54 + return y + Math.round(dragY); 55 55 + } 52 56 } 53 57 54 58 public static final class WorldLocation extends WorldMarker

+6 -2

src/main/java/game/yay0/EncodeCopy.java

reviewed

··· 17 17 18 18 @Override 19 19 public int getEncodeLength() 20 20 - { return 1; } 20 20 + { 21 21 + return 1; 22 22 + } 21 23 22 24 @Override 23 25 public int getBudgetCost() 24 24 - { return 1; } 26 26 + { 27 27 + return 1; 28 28 + } 25 29 26 30 @Override 27 31 public String toString()

+6 -2

src/main/java/game/yay0/EncodeLink.java

reviewed

··· 19 19 20 20 @Override 21 21 public int getEncodeLength() 22 22 - { return length; } 22 22 + { 23 23 + return length; 24 24 + } 23 25 24 26 @Override 25 27 public int getBudgetCost() 26 26 - { return (length > 17) ? 3 : 2; } 28 28 + { 29 29 + return (length > 17) ? 3 : 2; 30 30 + } 27 31 28 32 @Override 29 33 public String toString()

+3 -1

src/main/java/game/yay0/Yay0EncodeHelper.java

reviewed

··· 251 251 } 252 252 253 253 public byte[] getFile() 254 254 - { return encoder.getFile(); } 254 254 + { 255 255 + return encoder.getFile(); 256 256 + } 255 257 }

+2 -2

src/main/java/game/yay0/Yay0FileHelper.java

reviewed

··· 13 13 0x08 offset to link table 14 14 0x0C offset to non-linked chunks and count modifiers table 15 15 0x10 packed data 16 16 - 16 16 + 17 17 The packed data is a bitstream (padded to a multiple of 32bits), with each bit having the following meaning: 18 18 - 18 18 + 19 19 0 linked chunk, copy block from the link table (offset 0x0008) 20 20 1 non linked chunk, copy next byte from non-linked chunks and count modifiers table (offset at 0x000c) 21 21 **/

+5 -5

src/main/java/game/yay0/Yay0Helper.java

reviewed

··· 10 10 { 11 11 File source = new File("./yay0/decoded/0210ACFC.bin"); 12 12 encode(FileUtils.readFileToByteArray(source)); 13 13 - 13 13 + 14 14 /* 15 15 File sourceFile = new File("./test/dro_01_shape.yay0"); 16 16 byte[] source = FileUtils.readFileToByteArray(sourceFile); 17 17 - 17 17 + 18 18 byte[] decoded = decode(source); 19 19 - 19 19 + 20 20 File out = new File("./test/dro_01_shape.bin"); 21 21 FileUtils.writeByteArrayToFile(out, decoded); 22 22 */ ··· 27 27 */ 28 28 29 29 /* 30 30 - 30 30 + 31 31 File sourceFile = new File("./yay0/ver/decomp/024F64DC.bin"); 32 32 byte[] yay0 = encode(FileUtils.readFileToByteArray(sourceFile)); 33 33 - 33 33 + 34 34 for(int i = 0; i < yay0.length;) 35 35 { 36 36 System.out.print(String.format("%02X", yay0[i]));

+9 -3

src/main/java/renderer/FrameBuffer.java

reviewed

··· 81 81 } 82 82 83 83 public int getFrameBuffer() 84 84 - { return frameBuffer; } 84 84 + { 85 85 + return frameBuffer; 86 86 + } 85 87 86 88 public int getColorTexture() 87 87 - { return colorTexture; } 89 89 + { 90 90 + return colorTexture; 91 91 + } 88 92 89 93 public int getDepthTexture() 90 90 - { return depthTexture; } 94 94 + { 95 95 + return depthTexture; 96 96 + } 91 97 92 98 public void setViewport(int minX, int minY, int sizeX, int sizeY) 93 99 {

+6 -2

src/main/java/renderer/buffers/BufferVertex.java

reviewed

··· 26 26 } 27 27 28 28 public int getIndex() 29 29 - { return index; } 29 29 + { 30 30 + return index; 31 31 + } 30 32 31 33 protected void setIndex(int newIndex) 32 32 - { index = newIndex; } 34 34 + { 35 35 + index = newIndex; 36 36 + } 33 37 34 38 public BufferVertex setPosition(float x, float y, float z) 35 39 {

+6 -2

src/main/java/renderer/buffers/BufferedMesh.java

reviewed

··· 110 110 } 111 111 112 112 public int getVertexCount() 113 113 - { return verts.size(); } 113 113 + { 114 114 + return verts.size(); 115 115 + } 114 116 115 117 public int getTriangleCount() 116 116 - { return tris.size(); } 118 118 + { 119 119 + return tris.size(); 120 120 + } 117 121 118 122 public void loadBuffers() 119 123 {

+6 -2

src/main/java/renderer/buffers/LineBatch.java

reviewed

··· 49 49 } 50 50 51 51 public int getVertexCount() 52 52 - { return verts.size(); } 52 52 + { 53 53 + return verts.size(); 54 54 + } 53 55 54 56 public int getLineCount() 55 55 - { return lines.size(); } 57 57 + { 58 58 + return lines.size(); 59 59 + } 56 60 57 61 @Override 58 62 public int compareTo(LineBatch o)

+15 -5

src/main/java/renderer/shaders/RenderState.java

reviewed

··· 202 202 } 203 203 204 204 public static final float getLineWidth() 205 205 - { return rec.glLineWidth; } 205 205 + { 206 206 + return rec.glLineWidth; 207 207 + } 206 208 207 209 // -------------------------------------------------------------------------- 208 210 // cache point size ··· 223 225 } 224 226 225 227 public static final float getPointSize() 226 226 - { return rec.glPointSize; } 228 228 + { 229 229 + return rec.glPointSize; 230 230 + } 227 231 228 232 // -------------------------------------------------------------------------- 229 233 // cache shader program ··· 289 293 } 290 294 291 295 public static int getGlobalsUBO() 292 292 - { return matrixUBO; } 296 296 + { 297 297 + return matrixUBO; 298 298 + } 293 299 294 300 // -------------------------------------------------------------------------- 295 301 // global matrix state ··· 390 396 } 391 397 392 398 public static int getViewportSizeX() 393 393 - { return rec.glViewSizeX; } 399 399 + { 400 400 + return rec.glViewSizeX; 401 401 + } 394 402 395 403 public static int getViewportSizeY() 396 396 - { return rec.glViewSizeY; } 404 404 + { 405 405 + return rec.glViewSizeY; 406 406 + } 397 407 398 408 // -------------------------------------------------------------------------- 399 409 // global time

+3 -1

src/main/java/renderer/shaders/postprocess/PostProcessFX.java

reviewed

··· 41 41 } 42 42 43 43 public int getNumPasses() 44 44 - { return numPasses; } 44 44 + { 45 45 + return numPasses; 46 46 + } 45 47 46 48 // do not include this in constructor! we want to keep shaders lazy-loaded 47 49 // postprocess shaders can either use different shaders in each pass or switch on the u_pass uniform

+3 -1

src/main/java/renderer/text/DrawableString.java

reviewed

··· 68 68 } 69 69 70 70 public void setVisible(boolean value) 71 71 - { fadeAlphaGoal = value ? 1.0f : 0.0f; } 71 71 + { 72 72 + fadeAlphaGoal = value ? 1.0f : 0.0f; 73 73 + } 72 74 73 75 private void build() 74 76 {

+3 -1

src/main/java/util/DebugPrinter.java

reviewed

··· 25 25 } 26 26 27 27 public static void setEnabled(boolean value) 28 28 - { enabled = value; } 28 28 + { 29 29 + enabled = value; 30 30 + } 29 31 }

+9 -3

src/main/java/util/DualHashMap.java

reviewed

··· 22 22 } 23 23 24 24 public boolean isEmpty() 25 25 - { return forward.isEmpty(); } 25 25 + { 26 26 + return forward.isEmpty(); 27 27 + } 26 28 27 29 public Set<K> getKeySet() 28 28 - { return forward.keySet(); } 30 30 + { 31 31 + return forward.keySet(); 32 32 + } 29 33 30 34 public Set<V> getValues() 31 31 - { return backward.keySet(); } 35 35 + { 36 36 + return backward.keySet(); 37 37 + } 32 38 33 39 public boolean contains(K key) 34 40 {

+3 -1

src/main/java/util/LogFile.java

reviewed

··· 26 26 } 27 27 28 28 public File getFile() 29 29 - { return logFile; } 29 29 + { 30 30 + return logFile; 31 31 + } 30 32 31 33 @Override 32 34 public void post(Message msg)

+6 -2

src/main/java/util/Logger.java

reviewed

··· 80 80 } 81 81 82 82 public static void setProgressListener(Listener listener) 83 83 - { progressListener = listener; } 83 83 + { 84 84 + progressListener = listener; 85 85 + } 84 86 85 87 public static void removeProgressListener() 86 88 { ··· 176 178 } 177 179 178 180 public static void setDefaultOuputPriority(Priority p) 179 179 - { defaultPriority = p; } 181 181 + { 182 182 + defaultPriority = p; 183 183 + } 180 184 181 185 public static void disable() 182 186 {

+3 -1

src/main/java/util/identity/IdentityHashSet.java

reviewed

··· 44 44 } 45 45 46 46 public boolean isEmpty() 47 47 - { return map.isEmpty(); } 47 47 + { 48 48 + return map.isEmpty(); 49 49 + } 48 50 49 51 @Override 50 52 public Iterator<E> iterator()

+6 -2

src/main/java/util/ui/ColorSlider.java

reviewed

··· 140 140 } 141 141 142 142 public int getMaxValue() 143 143 - { return max; } 143 143 + { 144 144 + return max; 145 145 + } 144 146 145 147 public int getValue() 146 146 - { return slider.getValue(); } 148 148 + { 149 149 + return slider.getValue(); 150 150 + } 147 151 148 152 public void setValue(int value) 149 153 {

+3 -1

src/main/java/util/ui/DragReorderList.java

reviewed

··· 132 132 133 133 @Override 134 134 public DataFlavor[] getTransferDataFlavors() 135 135 - { return supportedFlavors; } 135 135 + { 136 136 + return supportedFlavors; 137 137 + } 136 138 137 139 @Override 138 140 public boolean isDataFlavorSupported(DataFlavor flavor)

+9 -3

src/main/java/util/ui/FilteredListModel.java

reviewed

··· 55 55 } 56 56 57 57 public void setIgnoreChanges(boolean value) 58 58 - { ignoreChanges = value; } 58 58 + { 59 59 + ignoreChanges = value; 60 60 + } 59 61 60 62 public void setFilter(ListFilter f) 61 63 { ··· 80 82 } 81 83 82 84 public DefaultListModel<T> getSource() 83 83 - { return source; } 85 85 + { 86 86 + return source; 87 87 + } 84 88 85 89 @Override 86 90 public int getSize() 87 87 - { return (filter != null) ? indices.size() : source.getSize(); } 91 91 + { 92 92 + return (filter != null) ? indices.size() : source.getSize(); 93 93 + } 88 94 89 95 public int getIndexFor(int index) 90 96 {

+3 -1

src/main/java/util/ui/FilteredListPanel.java

reviewed

··· 155 155 } 156 156 157 157 public T getSelected() 158 158 - { return list.getSelectedValue(); } 158 158 + { 159 159 + return list.getSelectedValue(); 160 160 + } 159 161 160 162 public void setSelected(T value) 161 163 {

+3 -1

src/main/java/util/ui/HexSpinner.java

reviewed

··· 63 63 64 64 @Override 65 65 public Integer getValue() 66 66 - { return (Integer) super.getValue(); } 66 66 + { 67 67 + return (Integer) super.getValue(); 68 68 + } 67 69 }

+3 -1

src/main/java/util/ui/LabeledDoubleSpinner.java

reviewed

··· 17 17 private JSpinner spinner; 18 18 19 19 public double getValue() 20 20 - { return (Double) spinner.getValue(); } 20 20 + { 21 21 + return (Double) spinner.getValue(); 22 22 + } 21 23 22 24 public void setValue(double val) 23 25 {

+3 -1

src/main/java/util/ui/LabeledIntegerSpinner.java

reviewed

··· 16 16 private JSpinner spinner; 17 17 18 18 public int getValue() 19 19 - { return (Integer) spinner.getValue(); } 19 19 + { 20 20 + return (Integer) spinner.getValue(); 21 21 + } 20 22 21 23 public void setValue(int val) 22 24 {

+6 -2

src/main/java/util/ui/ListAdapterComboboxModel.java

reviewed

··· 23 23 24 24 @Override 25 25 public int getSize() 26 26 - { return dataModel.getSize(); } 26 26 + { 27 27 + return dataModel.getSize(); 28 28 + } 27 29 28 30 @Override 29 31 public T getElementAt(int index) ··· 56 58 57 59 @Override 58 60 public Object getSelectedItem() 59 59 - { return selectedObject; } 61 61 + { 62 62 + return selectedObject; 63 63 + } 60 64 61 65 private class DataModelListDataListenerAdapter implements ListDataListener 62 66 {

+6 -2

src/main/java/util/ui/ListConfirmDialog.java

reviewed

··· 69 69 } 70 70 71 71 public DialogResult getResult() 72 72 - { return result; } 72 72 + { 73 73 + return result; 74 74 + } 73 75 74 76 public boolean isResultAccepted() 75 75 - { return result == DialogResult.ACCEPT; } 77 77 + { 78 78 + return result == DialogResult.ACCEPT; 79 79 + } 76 80 }

+12 -4

src/main/java/util/ui/ListSelectorDialog.java

reviewed

··· 139 139 } 140 140 141 141 public void setValue(T object) 142 142 - { selectedObject = object; } 142 142 + { 143 143 + selectedObject = object; 144 144 + } 143 145 144 146 public T getValue() 145 145 - { return selectedObject; } 147 147 + { 148 148 + return selectedObject; 149 149 + } 146 150 147 151 public DialogResult getResult() 148 148 - { return result; } 152 152 + { 153 153 + return result; 154 154 + } 149 155 150 156 public boolean isResultAccepted() 151 151 - { return result == DialogResult.ACCEPT; } 157 157 + { 158 158 + return result == DialogResult.ACCEPT; 159 159 + } 152 160 }

+12 -4

src/main/java/util/ui/StringSelectorDialog.java

reviewed

··· 133 133 } 134 134 135 135 public void setValue(String s) 136 136 - { selectedObject = s; } 136 136 + { 137 137 + selectedObject = s; 138 138 + } 137 139 138 140 public String getValue() 139 139 - { return selectedObject; } 141 141 + { 142 142 + return selectedObject; 143 143 + } 140 144 141 145 public DialogResult getResult() 142 142 - { return result; } 146 146 + { 147 147 + return result; 148 148 + } 143 149 144 150 public boolean isResultAccepted() 145 145 - { return result == DialogResult.ACCEPT; } 151 151 + { 152 152 + return result == DialogResult.ACCEPT; 153 153 + } 146 154 }

+6 -2

src/main/java/util/xml/XmlWrapper.java

reviewed

··· 58 58 } 59 59 60 60 public File getSourceFile() 61 61 - { return xmlFile; } 61 61 + { 62 62 + return xmlFile; 63 63 + } 62 64 63 65 public void complain(String message) 64 66 { ··· 66 68 } 67 69 68 70 public Element getRootElement() 69 69 - { return rootElement; } 71 71 + { 72 72 + return rootElement; 73 73 + } 70 74 71 75 public NodeList getRootElements(XmlKey key) throws IOException 72 76 {