AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 09:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix crash in settings window, network: fix item stack writing

Browse Source
This commit is contained in:
Bixilon 2021-05-02 20:42:57 +02:00
parent 54777771e2
commit b9ed5c4f45
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt
View File

@ -29,7 +29,7 @@ data class BlockEntityType(
val factory: BlockEntityFactory<out BlockEntity>, val factory: BlockEntityFactory<out BlockEntity>,
) : RegistryItem { ) : RegistryItem {
fun build(connection: PlayConnection): BlockEntity? { fun build(connection: PlayConnection): BlockEntity {
return DefaultBlockEntityMetaDataFactory.buildBlockEntity(factory, connection) return DefaultBlockEntityMetaDataFactory.buildBlockEntity(factory, connection)
} }

3
src/main/java/de/bixilon/minosoft/gui/main/GUITools.java
View File

@ -18,7 +18,6 @@ import de.bixilon.minosoft.Minosoft;
import de.bixilon.minosoft.data.mappings.ResourceLocation; import de.bixilon.minosoft.data.mappings.ResourceLocation;
import de.bixilon.minosoft.data.mappings.versions.Version; import de.bixilon.minosoft.data.mappings.versions.Version;
import de.bixilon.minosoft.data.mappings.versions.Versions; import de.bixilon.minosoft.data.mappings.versions.Versions;
import de.bixilon.minosoft.util.logging.LogMessageType;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
@ -31,14 +30,12 @@ import javafx.stage.Stage;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
public class GUITools { public class GUITools {
public static final Image MINOSOFT_LOGO = new Image(GUITools.class.getResourceAsStream("/assets/minosoft/textures/icons/window_icon.png")); public static final Image MINOSOFT_LOGO = new Image(GUITools.class.getResourceAsStream("/assets/minosoft/textures/icons/window_icon.png"));
public static final ObservableList<Version> VERSIONS = FXCollections.observableArrayList(); public static final ObservableList<Version> VERSIONS = FXCollections.observableArrayList();
public static final JFXComboBox<Version> VERSION_COMBO_BOX = new JFXComboBox<>(VERSIONS); public static final JFXComboBox<Version> VERSION_COMBO_BOX = new JFXComboBox<>(VERSIONS);
public static final ObservableList<LogMessageType> LOG_LEVELS = FXCollections.observableList(Arrays.asList(LogMessageType.values().clone()));
static { static {
VERSIONS.add(Versions.AUTOMATIC_VERSION); VERSIONS.add(Versions.AUTOMATIC_VERSION);

7
src/main/java/de/bixilon/minosoft/gui/main/SettingsWindow.java
View File

@ -13,12 +13,9 @@
package de.bixilon.minosoft.gui.main; package de.bixilon.minosoft.gui.main;
import com.jfoenix.controls.JFXComboBox;
import de.bixilon.minosoft.data.locale.LocaleManager; import de.bixilon.minosoft.data.locale.LocaleManager;
import de.bixilon.minosoft.data.locale.Strings; import de.bixilon.minosoft.data.locale.Strings;
import de.bixilon.minosoft.util.logging.LogMessageType;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
@ -27,17 +24,13 @@ import java.util.ResourceBundle;
public class SettingsWindow implements Initializable { public class SettingsWindow implements Initializable {
public GridPane tabGeneral; public GridPane tabGeneral;
public JFXComboBox<LogMessageType> generalLogLevel;
public Tab general; public Tab general;
public Tab download; public Tab download;
public Label generalLogLevelLabel;
@Override @Override
public void initialize(URL url, ResourceBundle resourceBundle) { public void initialize(URL url, ResourceBundle resourceBundle) {
this.generalLogLevel.setItems(GUITools.LOG_LEVELS);
this.general.setText(LocaleManager.translate(Strings.SETTINGS_GENERAL)); this.general.setText(LocaleManager.translate(Strings.SETTINGS_GENERAL));
this.generalLogLevelLabel.setText(LocaleManager.translate(Strings.SETTINGS_GENERAL_LOG_LEVEL));
this.download.setText(LocaleManager.translate(Strings.SETTINGS_DOWNLOAD)); this.download.setText(LocaleManager.translate(Strings.SETTINGS_DOWNLOAD));
} }
} }

2
src/main/java/de/bixilon/minosoft/protocol/protocol/PlayOutByteBuffer.kt
View File

@ -53,8 +53,8 @@ class PlayOutByteBuffer(override val connection: PlayConnection) : OutByteBuffer
writeNBT(itemStack.nbtOut) writeNBT(itemStack.nbtOut)
return return
} }
writeBoolean(itemStack != null)
if (itemStack == null) { if (itemStack == null) {
writeBoolean(false)
return return
} }
writeVarInt(connection.mapping.itemRegistry.getId(itemStack.item)) writeVarInt(connection.mapping.itemRegistry.getId(itemStack.item))