diff --git a/.github/ISSUE_TEMPLATE/bug-oder-fehler.md b/.github/ISSUE_TEMPLATE/bug-oder-fehler.md index e858a0c70..9db6679f8 100644 --- a/.github/ISSUE_TEMPLATE/bug-oder-fehler.md +++ b/.github/ISSUE_TEMPLATE/bug-oder-fehler.md @@ -25,4 +25,4 @@ Füge gegebenenfalls Screenshots hinzu, um das Problem zu erläutern. **Weitere Informationen (bitte ausfüllen):** Minecraft Version: `1.12.2` -Addon Version: `1.8.2` +Addon Version: `1.8.3` diff --git a/build.gradle b/build.gradle index c73423e03..ab2174145 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'idea' apply plugin: 'maven-publish' -version = '1.8.2' +version = '1.8.3' group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'UnicacityAddon' diff --git a/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java b/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java index 8b7d449a5..67d3c90af 100644 --- a/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java +++ b/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java @@ -34,7 +34,7 @@ @Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]") public class UnicacityAddon extends LabyModAddon { - public static final String VERSION = "1.8.2"; + public static final String VERSION = "1.8.3"; public static final Minecraft MINECRAFT = Minecraft.getMinecraft(); public static UnicacityAddon ADDON; public static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/com/rettichlp/unicacityaddon/base/manager/FileManager.java b/src/main/java/com/rettichlp/unicacityaddon/base/manager/FileManager.java index 39206a0ad..9ed60dfa0 100644 --- a/src/main/java/com/rettichlp/unicacityaddon/base/manager/FileManager.java +++ b/src/main/java/com/rettichlp/unicacityaddon/base/manager/FileManager.java @@ -18,7 +18,7 @@ */ public class FileManager { - public static Data DATA = new Data(); + public static Data DATA; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); @@ -121,12 +121,9 @@ public static File getNewActivityImageFile(String type) throws IOException { public static void loadData() { try { File dataFile = FileManager.getDataFile(); - if (dataFile != null) { - Gson g = new Gson(); - String jsonData = FileUtils.readFileToString(dataFile, StandardCharsets.UTF_8.toString()); - DATA = g.fromJson(jsonData, Data.class); - } - + assert dataFile != null; + String jsonData = FileUtils.readFileToString(dataFile, StandardCharsets.UTF_8.toString()); + DATA = !jsonData.equals("") ? new Gson().fromJson(jsonData, Data.class) : new Data(); Runtime.getRuntime().addShutdownHook(new Thread(FileManager::saveData)); } catch (IOException e) { throw new RuntimeException(e); diff --git a/src/main/java/com/rettichlp/unicacityaddon/base/models/Data.java b/src/main/java/com/rettichlp/unicacityaddon/base/models/Data.java index c1e8d355a..9814361fe 100644 --- a/src/main/java/com/rettichlp/unicacityaddon/base/models/Data.java +++ b/src/main/java/com/rettichlp/unicacityaddon/base/models/Data.java @@ -7,97 +7,37 @@ import com.rettichlp.unicacityaddon.base.enums.faction.DrugType; import com.rettichlp.unicacityaddon.base.enums.faction.Equip; import joptsimple.internal.Strings; +import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import net.minecraft.util.math.BlockPos; -import java.util.Collections; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +@NoArgsConstructor +@Getter @Setter public class Data { - private Integer bankBalance; - private String carInfo; - private Integer cashBalance; - private Map> drugInventoryMap; - private List coordlist; - private Map equipMap; - private Long firstAidDate; - private Map houseDataMap; - private Integer jobBalance; - private Integer jobExperience; - private Integer payDayTime; - private Long plantFertilizeTime; - private Long plantWaterTime; - private Integer serviceCount; - private Integer timer; - private List todolist; - - public int getBankBalance() { - return bankBalance != null ? bankBalance : 0; - } - - public String getCarInfo() { - return carInfo != null ? carInfo : Strings.EMPTY; - } - - public int getCashBalance() { - return cashBalance != null ? cashBalance : 0; - } - - public Map> getDrugInventoryMap() { - return drugInventoryMap != null ? drugInventoryMap : Collections.emptyMap(); - } - - public List getCoordlist() { - return coordlist != null ? coordlist : Collections.emptyList(); - } - - public Map getEquipMap() { - return equipMap != null ? equipMap : Collections.emptyMap(); - } - - public long getFirstAidDate() { - return firstAidDate != null ? firstAidDate : 0; - } - - public Map getHouseDataMap() { - return houseDataMap != null ? houseDataMap : Collections.emptyMap(); - } - - public int getJobBalance() { - return jobBalance != null ? jobBalance : 0; - } - - public int getJobExperience() { - return jobExperience != null ? jobExperience : 0; - } - - public int getPayDayTime() { - return payDayTime != null ? payDayTime : 0; - } - - public long getPlantFertilizeTime() { - return plantFertilizeTime != null ? plantFertilizeTime : 0; - } - - public long getPlantWaterTime() { - return plantWaterTime != null ? plantWaterTime : 0; - } - - public int getServiceCount() { - return serviceCount != null ? serviceCount : 0; - } - - public int getTimer() { - return timer != null ? timer : 0; - } - - public List getTodolist() { - return todolist != null ? todolist : Collections.emptyList(); - } + private Integer bankBalance = 0; + private String carInfo = Strings.EMPTY; + private Integer cashBalance = 0; + private Map> drugInventoryMap = new HashMap<>(); + private List coordlist = new ArrayList<>(); + private Map equipMap = new HashMap<>(); + private Long firstAidDate = 0L; + private Map houseDataMap = new HashMap<>(); + private Integer jobBalance = 0; + private Integer jobExperience = 0; + private Integer payDayTime = 0; + private Long plantFertilizeTime = 0L; + private Long plantWaterTime = 0L; + private Integer serviceCount = 0; + private Integer timer = 0; + private List todolist = new ArrayList<>(); /** * Adds the given value i to the bankBalance diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 92e7eda0b..3899eed4c 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "unicacityaddon", "name": "UnicacityAddon", "description": "This addon is a modification for UnicaCity providing specialized and nice-to-have features and utilities for everyday gameplay.", - "version": "1.8.2", + "version": "1.8.3", "mcversion": "1.12.2", "url": "", "updateUrl": "",