maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some improvements to the designer

Browse source
This commit is contained in:
modmuss50 2016-04-07 15:57:20 +01:00
parent 9e107c849f
commit df651e7016
8 changed files with 146 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/techreborn/manual/designer/ManualDesigner.java
View file

@ -68,5 +68,6 @@ public class ManualDesigner extends Application {
controller.image.setFitHeight(1000);
controller.image.setFitWidth(1000);
controller.image.fitWidthProperty().bind(controller.renderPane.widthProperty());
controller.image.fitHeightProperty().bind(controller.renderPane.heightProperty());
}
}

14
src/main/java/techreborn/manual/designer/exporter/Exporter.java
View file

@ -1,14 +0,0 @@
package techreborn.manual.designer.exporter;
/**
* Created by Mark on 05/04/2016.
*/
public class Exporter {
public static void export(){
//TODO things
}
}

12
src/main/java/techreborn/manual/designer/fileUtils/LoadSystem.java Normal file
View file

@ -0,0 +1,12 @@
package techreborn.manual.designer.fileUtils;
/**
* Created by Mark on 05/04/2016.
*/
public class LoadSystem {
public static void load(){}
}

36
src/main/java/techreborn/manual/designer/fileUtils/SaveSystem.java Normal file
View file

@ -0,0 +1,36 @@
package techreborn.manual.designer.fileUtils;
import javafx.scene.control.TreeItem;
import techreborn.lib.ModInfo;
import techreborn.manual.saveFormat.Entry;
import techreborn.manual.saveFormat.ManualFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
* Created by Mark on 05/04/2016.
*/
public class SaveSystem {
public static HashMap<TreeItem, Entry> entries = new HashMap<>();
public static ManualFormat master;
public static void export(){
List<Entry> entrieList = new ArrayList<>();
for(Object object : entries.entrySet().toArray()){
Entry entry = (Entry) object;
entrieList.add(entry);
}
System.out.println(entrieList);
if(master == null){
master = new ManualFormat("TechReborn", ModInfo.MOD_ID, entrieList);
}
//TODO things
}
}

73
src/main/java/techreborn/manual/designer/windows/MainWindowController.java
View file

@ -1,14 +1,25 @@
package techreborn.manual.designer.windows;
import javafx.event.ActionEvent;
import javafx.event.Event;
import javafx.scene.control.Button;
import javafx.scene.control.ChoiceDialog;
import javafx.scene.control.MenuBar;
import javafx.scene.control.SplitPane;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextInputDialog;
import javafx.scene.control.TreeItem;
import javafx.scene.control.TreeView;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import techreborn.manual.designer.ManualCatergories;
import techreborn.manual.designer.fileUtils.LoadSystem;
import techreborn.manual.designer.fileUtils.SaveSystem;
import techreborn.manual.saveFormat.Entry;
import java.awt.*;
import java.util.ArrayList;
import java.util.Optional;
/**
* Created by Mark on 05/04/2016.
@ -21,13 +32,71 @@ public class MainWindowController {
public AnchorPane renderPane;
public Button buttonNew;
public TextArea textInput;
public Button buttonDelete;
public void newItem(Event event) {
if(treeList.getSelectionModel().getSelectedItem() instanceof TreeItem){
TreeItem item = (TreeItem) treeList.getSelectionModel().getSelectedItem();
item.getChildren().add(new TreeItem<String>("hi"));
item.setExpanded(true);
if(item == ManualCatergories.blocks || item == ManualCatergories.items){
TextInputDialog dialog = new TextInputDialog("");
dialog.setTitle("Name?");
dialog.setContentText("Name of item:");
Optional<String> result = dialog.showAndWait();
if(result.isPresent()){
TreeItem<String> newItem = new TreeItem<>(result.get());
Entry entry = new Entry();
entry.name = result.get();
ArrayList<String> choices = new ArrayList<>();
choices.add("Text");
choices.add("Image");
choices.add("Recipe");
ChoiceDialog<String> choiceDialog = new ChoiceDialog<>("Text", choices);
choiceDialog.setTitle("Type?");
Optional<String> choiceResult = choiceDialog.showAndWait();
if(choiceResult.isPresent()){
System.out.println(choiceResult.get());
entry.type = choiceResult.get();
} else {
Toolkit.getDefaultToolkit().beep();
return;
}
item.getChildren().add(newItem);
SaveSystem.entries.put(newItem, entry);
} else {
Toolkit.getDefaultToolkit().beep();
}
} else {
Toolkit.getDefaultToolkit().beep();
}
}
}
public void deleteItem(Event event) {
if(treeList.getSelectionModel().getSelectedItem() instanceof TreeItem){
TreeItem item = (TreeItem) treeList.getSelectionModel().getSelectedItem();
TreeItem parent = item.getParent();
if(parent != null){
if(parent == ManualCatergories.blocks || parent == ManualCatergories.items){
parent.getChildren().remove(item);
} else {
Toolkit.getDefaultToolkit().beep();
}
}
}
}
public void save(ActionEvent actionEvent) {
SaveSystem.export();
}
public void open(ActionEvent actionEvent) {
LoadSystem.load();
}
public void close(ActionEvent actionEvent) {
//TODO checks to make sure its being saved
System.exit(0);
}
}

10
src/main/java/techreborn/manual/saveFormat/Entry.java
View file

@ -5,16 +5,18 @@ package techreborn.manual.saveFormat;
*/
public class Entry {
String registryName;
public String name;
MetaData meta;
public String registryName;
public MetaData meta;
/**
* This says what type of page it is, crafting, image, ect
*
* //TODO use class name?
*/
String type;
public String type;
EntryData data;
public EntryData data;
}

11
src/main/java/techreborn/manual/saveFormat/ManualFormat.java
View file

@ -11,7 +11,14 @@ public class ManualFormat {
String modId;
List<Entry> blocks;
List<Entry> entries;
List<Entry> items;
public ManualFormat(String name, String modId, List<Entry> entries) {
this.name = name;
this.modId = modId;
this.entries = entries;
}
public ManualFormat() {
}
}

14
src/main/resources/assets/techreborn/designer/mainWindow.fxml
View file

@ -7,19 +7,21 @@
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.TreeView?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.VBox?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="techreborn.manual.designer.windows.MainWindowController">
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="550.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="techreborn.manual.designer.windows.MainWindowController">
<children>
<MenuBar fx:id="menuBar">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Save" />
<MenuItem mnemonicParsing="false" text="Close" />
<MenuItem mnemonicParsing="false" onAction="#save" text="Save" />
<MenuItem mnemonicParsing="false" onAction="#open" text="Open" />
<MenuItem mnemonicParsing="false" onAction="#close" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
@ -40,6 +42,7 @@
<AnchorPane prefHeight="49.0" prefWidth="175.0">
<children>
<Button fx:id="buttonNew" layoutX="8.0" layoutY="12.0" mnemonicParsing="false" onMouseClicked="#newItem" text="New" />
<Button fx:id="buttonDelete" layoutX="54.0" layoutY="12.0" mnemonicParsing="false" onMouseClicked="#deleteItem" text="Delete" />
</children>
</AnchorPane>
</children>
@ -49,10 +52,13 @@
<AnchorPane fx:id="renderPane" minHeight="0.0" minWidth="0.0" prefHeight="358.0" prefWidth="417.0">
<children>
<ImageView fx:id="image" fitHeight="298.0" fitWidth="417.0" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="75.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
<AnchorPane prefHeight="75.0" prefWidth="417.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<AnchorPane prefHeight="98.0" prefWidth="627.0" style="-fx-background-color: lightgrey;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<children>
<Label layoutY="6.0" text="Settings" />
<TextArea fx:id="textInput" layoutX="43.0" layoutY="8.0" maxWidth="250.0" prefHeight="59.0" prefWidth="250.0" AnchorPane.bottomAnchor="8.0" AnchorPane.rightAnchor="8.0" AnchorPane.topAnchor="8.0" />
<TextField layoutX="88.0" layoutY="25.0" />
<Label layoutX="6.0" layoutY="29.0" text="Registry Name" />
<Button layoutX="19.0" layoutY="59.0" mnemonicParsing="false" text="Set meta" />
</children>
</AnchorPane>
</children>