[U] 1.2.2

ClayCoffee · Jul 22, 2020 · b8b1798 · b8b1798
1 parent 94c0781
commit b8b1798
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/...t_Slimefun4_master_RC_7_g7d82bfe_1249.xml → ...t_Slimefun4_master_RC_7_ga1952ed_1279.xml b/...t_Slimefun4_master_RC_7_g7d82bfe_1249.xml → ...t_Slimefun4_master_RC_7_ga1952ed_1279.xml
diff --git a/ClayTech.iml b/ClayTech.iml
@@ -20,7 +20,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheBusyBiscuit:CS-CoreLib:master-v1.6.1-g9dd4a1c-118" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Multiverse:Multiverse-Core:master-2.3-g3afca50-387" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheBusyBiscuit:Slimefun4:master-RC-7-g7d82bfe-1249" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheBusyBiscuit:Slimefun4:master-RC-7-ga1952ed-1279" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: org.eclipse.jdt:Anotation:2.2.400">
         <CLASSES>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>club.claycoffee</groupId>
     <artifactId>ClayTech</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <build>
         <plugins>
             <plugin>

diff --git a/src/main/java/club/claycoffee/ClayTech/ClayTech.java b/src/main/java/club/claycoffee/ClayTech/ClayTech.java
@@ -350,6 +350,7 @@ public void run() {
 
     @Override
     public void onDisable() {
+
     }
 
     private String languageCodeToLanguage(String code) {
@@ -431,5 +432,4 @@ public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
         }
         return Bukkit.getWorld(getOverworld()).getGenerator();
     }
-
 }
diff --git a/src/main/java/club/claycoffee/ClayTech/api/Planet.java b/src/main/java/club/claycoffee/ClayTech/api/Planet.java
@@ -149,7 +149,11 @@ public void register() {
 
             return;
         }
-        newWorld.createWorld();
+        try {
+            newWorld.createWorld();
+        }
+        catch(Exception e) {}
+
 
         new BukkitRunnable() {
 

diff --git a/src/main/java/club/claycoffee/ClayTech/implementation/abstractMachines/ANewContainer.java b/src/main/java/club/claycoffee/ClayTech/implementation/abstractMachines/ANewContainer.java
@@ -22,6 +22,8 @@
 import java.util.Map;
 
 public abstract class ANewContainer extends AContainer implements InventoryBlock, EnergyNetComponent {
+    protected Map<Block, Integer> progress = new HashMap<Block, Integer>();
+    protected Map<Block, MachineRecipe> processing = new HashMap<Block, MachineRecipe>();
 
     public ANewContainer(Category category, SlimefunItemStack item, String id, RecipeType recipeType,
                          ItemStack[] recipe) {

diff --git a/src/main/java/club/claycoffee/ClayTech/implementation/machines/CobbleStoneGenerator.java b/src/main/java/club/claycoffee/ClayTech/implementation/machines/CobbleStoneGenerator.java
@@ -40,9 +40,9 @@ public class CobbleStoneGenerator extends SlimefunItem implements InventoryBlock
             Lang.readMachinesText("SPLIT_LINE"));
     private static final ItemStack BORDER_B_ITEM = Utils.newItemD(Material.LIME_STAINED_GLASS_PANE,
             Lang.readMachinesText("SPLIT_LINE"));
-    public static Map<Block, MachineRecipe> processing = new HashMap<>();
-    public static Map<Block, Integer> progress = new HashMap<>();
-    protected final List<MachineRecipe> recipes = new ArrayList<>();
+    public static Map<Block, MachineRecipe> processing = new HashMap<Block, MachineRecipe>();
+    public static Map<Block, Integer> progress = new HashMap<Block, Integer>();
+    protected final List<MachineRecipe> recipes = new ArrayList<MachineRecipe>();
 
     public CobbleStoneGenerator(Category category, SlimefunItemStack item, String id, RecipeType recipeType,
                                 ItemStack[] recipe) {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: ClayTech
 main: club.claycoffee.ClayTech.ClayTech
-version: 1.2.1
+version: 1.2.2
 api-version: 1.13
 author: ClayCoffee
 loadbefore: [Multiverse-Core]