merge

Dev

Author: Garten

README.md

@@ -1 +1,12 @@
-# sourcecraft
+# sourcecraft
+
+an easy to use Minecraft to Source Engine Converter.
+
+### getting started:
+```
+git clone git@github.com:Garten/sourcecraft.git
+cd sourcecraft
+mvn install
+cd target
+java -jar sourcecraft-x.y.jar
+```

src/gui/Gui.java

@@ -148,6 +148,9 @@ public String getMincraftPath() {
 	}
 
 	public void setSourcePath(File file) {
+		if (file == null) {
+			return;
+		}
 		this.setupPanel.setSourcePath(file.toString());
 	}
 
@@ -361,6 +364,9 @@ private void initialize() {
 		// input Panel
 		this.inputPanel = new InputPanel();
 		this.inputPanel.setUponContinue(() -> {
+			if (this.inputPanel.getWorld() == null) {
+				return;
+			}
 			if (this.validatePlaceIntern.run(this.inputPanel.getPlaceFromCoordinates())) {
 				tabbedPaneFinal.setSelectedIndex(2);
 			}

src/gui/WorldComboboxRenderer.java

@@ -2,9 +2,7 @@
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Font;
 
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
@@ -20,8 +18,6 @@ public class WorldComboboxRenderer extends JLabel implements ListCellRenderer<Ob
 
 	private static final Color NIMBUS_FOCUS = new Color(51, 98, 140);
 
-	private Font uhOhFont;
-
 	public WorldComboboxRenderer() {
 		// setOpaque(true);
 		this.setVerticalAlignment(CENTER);
@@ -33,12 +29,7 @@ public WorldComboboxRenderer() {
 	 */
 	@Override
 	public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		// int selectedIndex = ((Integer) value).intValue();
-
-		// Set the icon and text. If icon was null, say so.
-		// ImageIcon icon = images[selectedIndex];
-		// String pet = petStrings[selectedIndex];
-		this.setText("<no world found>");
+		this.setText("<No Minecraft World Found>");
 		if (value instanceof World) {
 			World world = (World) value;
 			this.setIcon(world.getIcon());
@@ -54,20 +45,4 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
 
 		return this;
 	}
-
-	// Set the font and text when no image was found.
-	protected void setUhOhText(String uhOhText, Font normalFont) {
-		if (this.uhOhFont == null) { // lazily create this font
-			this.uhOhFont = normalFont.deriveFont(Font.ITALIC);
-		}
-		this.setFont(this.uhOhFont);
-		this.setText(uhOhText);
-	}
-
-	protected static ImageIcon createImageIcon() { // TODO
-		String path = "images//test.jpg";
-		ImageIcon icon = new ImageIcon(path);
-		return icon = new ImageIcon(icon.getImage()
-				.getScaledInstance(25, 25, 0));
-	}
 }

src/gui/panel/InputPanel.java

@@ -129,8 +129,11 @@ public World getWorld() {
 	public Place getPlaceFromCoordinates() {
 		String placeName = this.getSaveLocation();
 		Place place = new Place(placeName);
-		place.setWorld(this.comboBox_World.getSelectedItem()
-				.toString());
+		Object object = this.comboBox_World.getSelectedItem();
+		if (object == null) {
+			return null;
+		}
+		place.setWorld(object.toString());
 		try {
 			Position start = new Position(Integer.valueOf(this.textField_FromX.getText()), Integer.valueOf(this.textField_FromY.getText()),
 					Integer.valueOf(this.textField_FromZ.getText()));

src/main/Converter.java

@@ -27,7 +27,7 @@ private void convertMap(ConverterData converterData, File file) {
 		DefaultMinecraftMapConverter map = this.getMinecraftMap(converterData);
 		Loggger.log("Saving to " + file);
 		try {
-			map.write(file);
+			map.write(file, converterData.getGame());
 		} catch (IOException e) {
 			Loggger.error(e.toString());
 		}

src/main/GuiLogic.java

@@ -227,7 +227,6 @@ private void updateContinueButton() {
 	}
 
 	private void informAboutTexturePack(String texturePackName) {
-		Loggger.log(texturePackName);
 		TexturePack texturePack = TexturePack.getTexturePack(texturePackName);
 		boolean upToDate = Steam.areTexturesUpToDate(this.gui.getSourceGame(), texturePack);
 		this.gui.setVisibleTextTexturesUpToDate(upToDate);

src/main/Main.java

@@ -15,8 +15,8 @@
 
 public class Main {
 
-	public static final String TITLE = "Sourcecraft - Minecraft to Source converter";
-	public static final String VERSION = "3.0";
+	public static final String TITLE = "Sourcecraft - Minecraft to VMF converter";
+	public static final String VERSION = "3.1";
 	public static final String AUTHOR = "garten";
 	public static final String LICENSE = "GNU General Public License v3.0";
 	public static final String LICENSE_INFO = "https://www.gnu.org/licenses/gpl-3.0.html";
@@ -54,12 +54,29 @@ public Main() {
 
 			File output = new File(this.gui.getOutputFile());
 			ConverterData data = this.getConverterData();
+			if (data == null) {
+				return;
+			}
 			this.converter.convert(data, output);
 			if (data.getUpdateTextures()) {
 				final TexturePack pack = data.getTexturePack();
 				if (!Steam.areTexturesUpToDate(data.getGame(), pack)) {
-					TextureFolderMover.copyFolder(pack.getFolder(), data.getGame()
-							.getMatriealPath(pack));
+					File targetDirectory = data.getGame()
+							.getMatriealPath(pack);
+					if (targetDirectory.exists()) {
+						TextureFolderMover.copyFolder(pack.getFolder(), data.getGame()
+								.getMatriealPath(pack));
+					} else if (targetDirectory.getParentFile()
+							.getParentFile()
+							.exists()) {
+						targetDirectory.getParentFile()
+								.mkdir(); // Garrysmod comes without material folder
+						TextureFolderMover.copyFolder(pack.getFolder(), data.getGame()
+								.getMatriealPath(pack));
+					} else {
+						Loggger.log("Not copying textures. The directory " + targetDirectory + " does not exist. Have you launched " + data.getGame()
+								.getLongName() + " at least once?");
+					}
 				}
 			}
 
@@ -80,6 +97,9 @@ public Main() {
 		});
 	}
 
+	/**
+	 * returns true if place has been found.
+	 */
 	private void saveNewPlace() {
 		if (this.gui.getRememberPlaceSelected()) {
 			String name = this.gui.getSaveLocation();
@@ -113,8 +133,11 @@ public ConverterData getConverterData() {
 		ConverterData converterData = new ConverterData();
 
 		Place place = this.gui.getPlaceFromCoordinates();
-		String worldName = this.gui.getWorld()
-				.toString();
+		World world = this.gui.getWorld();
+		if (world == null) {
+			return null;
+		}
+		String worldName = world.toString();
 		Loggger.log("world = " + worldName);
 		if (place == null) {
 			Loggger.warn("Place not found");

src/main/Steam.java

@@ -13,21 +13,20 @@
 public class Steam {
 
 	private static final String STEAM_NAME = "Steam";
-
-	private static final String STEAM_GAME_PATH = "SteamApps" + File.separator + "common";
+	private static final String STEAM_NAME_UNIX = ".steam" + File.separator + "steam";
 
 	public static final String STEAM_GAME_PATH() {
 		if (Main.isUnix()) {
-			return STEAM_GAME_PATH.toLowerCase();
+			return "steamapps" + File.separator + "common";
 		}
-		return STEAM_GAME_PATH;
-	}
+		return "SteamApps" + File.separator + "common";
+	};
 
 	public static final String STEAM_SDK_PATH = "sourcesdk_content";
 	public static final String STEAM_MAP_SRC_PATH = "mapsrc";
 
-	private static final String[] POTENTIAL_STEAM_PATH_GRAND_PARENTS = { "C:", "D:", "E:", "D:", "F:", File.separator };
-	private static final String[] POTENTIAL_STEAM_PATH_PARENTS = { "Program Files", "Program Files (x86)", "Programme", };
+	private static final String[] POTENTIAL_STEAM_PATH_GRAND_PARENTS = { "C:", "D:", "E:", File.separator };
+	private static final String[] POTENTIAL_STEAM_PATH_PARENTS = { "Program Files", "Program Files (x86)", "Programs", "Programme" };
 
 	public static File getSteamPath() {
 		File steamPath = Periphery.CONFIG.getSteamPath();
@@ -43,6 +42,12 @@ public static File getSteamPath() {
 	}
 
 	private static File guessSteamPath() {
+		if (Main.isUnix()) {
+			File potentialPath = new File(System.getProperty("user.home") + File.separator + STEAM_NAME_UNIX);
+			if (isSteamPath(potentialPath)) {
+				return potentialPath;
+			}
+		}
 		for (String first : POTENTIAL_STEAM_PATH_GRAND_PARENTS) {
 			for (String second : POTENTIAL_STEAM_PATH_PARENTS) {
 				File potentialPath = new File(first + File.separator + second + File.separator + STEAM_NAME);
@@ -92,6 +97,9 @@ public static String getHammerPath(SourceGame game) {
 
 	public static boolean areTexturesUpToDate(SourceGame game, TexturePack pack) {
 		File materiaPath = game.getMatriealPath(pack);
+		if (materiaPath == null) {
+			return false;
+		}
 		Loggger.log("checking textures in " + materiaPath.toString());
 		if (materiaPath == null || materiaPath.getParentFile()
 				.exists() == false) {

src/minecraft/Minecraft.java

@@ -59,6 +59,8 @@ private static File getNewMinecraftPath() {
 		return minecraftPath;
 	}
 
+	public static final int MAXIMUM_HEIGHT = 256;
+
 	public Vector<LabeledCoordinates> getPlayerCoordinates(World world) {
 		File file = new File(Periphery.CONFIG.getWorldPath(world), "level.dat");
 		Vector<LabeledCoordinates> vector = new Vector<>();
@@ -78,6 +80,14 @@ public Vector<LabeledCoordinates> getPlayerCoordinates(World world) {
 		return vector;
 	}
 
+	public static File getFileOfChunk(File fileFolder, WorldPiece source) {
+		int fileX = source.getFilePosition()
+				.getX();
+		int fileZ = source.getFilePosition()
+				.getZ();
+		return new File(fileFolder, "r." + fileX + "." + fileZ + "." + ANVIL_ENDING);
+	}
+
 	public static Vector<World> getPossibleWorlds() {
 		File file = Periphery.CONFIG.getMinceraftSavePath();
 		String[] list = file.list();

src/minecraft/WorldPiece.java

@@ -24,7 +24,6 @@ public WorldPiece(Position position, Position end, Position vmfStart) {
 
 		this.higher = Position.subtract(end, chunkStart);
 		this.higher.y = end.y;
-		// this.higher = Position.capBy(this.higher, new Position(15, 256, 15));
 		this.higher = Position.capBelow(this.higher, new Position(Minecraft.CHUNK_SIZE_X, Minecraft.MAX_Y, Minecraft.CHUNK_SIZE_Z));
 
 		// local chunk position
@@ -48,13 +47,18 @@ private static final int getLowerLocalCoordinate(int value) {
 	}
 
 	private ChunkPosition getFileOfChunk(ChunkPosition global) {
-		int fileX = global.getX() / (Minecraft.MAX_CHUNK_IN_FILE_X);
-		if (global.getX() < 0) {
-			fileX = fileX - 1;
+		int globalX = global.getX();
+		int fileX, fileZ;
+		if (globalX >= 0) {
+			fileX = globalX / Minecraft.MAX_CHUNK_IN_FILE_X;
+		} else {
+			fileX = ((globalX + 1) / Minecraft.MAX_CHUNK_IN_FILE_X) - 1;
 		}
-		int fileZ = global.getZ() / (Minecraft.MAX_CHUNK_IN_FILE_Z);
-		if (global.getZ() < 0) {
-			fileZ = fileZ - 1;
+		int globalZ = global.getZ();
+		if (globalZ >= 0) {
+			fileZ = globalZ / Minecraft.MAX_CHUNK_IN_FILE_Z;
+		} else {
+			fileZ = ((globalZ + 1) / Minecraft.MAX_CHUNK_IN_FILE_Z) - 1;
 		}
 		return new ChunkPosition(fileX, fileZ);
 	}