Small updates & bugfixes

* Removed android label option from the server-side, fixes #1 * Updated Forge, CCC, CCL, FMP and NEI * `build.gradle` now gets mod version from `build.properties` * Changed title and logo to Matter Megadrive * Added .editorconfig
Ionaru · Dec 28, 2017 · 765c392 · 765c392
1 parent 936f337
commit 765c392
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 49 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,6 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4
diff --git a/.gitignore b/.gitignore
@@ -8,30 +8,36 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-/run
-/logs
+run/
+logs/
 
-# windows
-*.bat
+# Windows
+thumbs.db
 
-# gradle
-/.gradle
-/build
-!gradlew.bat
+# Mac
+.DS_Store
+
+# Gradle
+.gradle/
+build/
 
-# eclipse
-/eclipse
-/.settings
-/.metdata
-/.classpath
-/.project
-/bin
+# Eclipse
+eclipse/
+.settings/
+.metdata/
+.classpath/
+.project/
+bin/
+
+# VSCode
+.vscode/
 
-# intellij
-/out
-/.idea
-/*.iml
-/*.ipr
-/*.iws
-
-.DS_Store
+# IntelliJ
+out/
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Java
+*.hprof
diff --git a/MatterMegadriveLogo.png b/MatterMegadriveLogo.png
diff --git a/MatterOverdriveLogo.png b/MatterOverdriveLogo.png
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# Matter Overdrive
-![alt tag](https://raw.githubusercontent.com/simeonradivoev/MatterOverdrive/master/MatterOverdriveLogo.png)
+# Matter Megadrive
+![alt tag](https://raw.githubusercontent.com/Ionaru/MatterMegadrive/master/MatterMegadriveLogo.png)
 
 <h2 align="center">
 <a href='https://mo.simeonradivoev.com/'>Website</a> |

diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ buildscript {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-version = "${config.mc_version}-0.4.3"
+version = "${config.mc_version}-${config.mod_version}"
 
 if (System.getenv('TRAVIS_BUILD_NUMBER') != null) {
     version += "-build-" + System.getenv('TRAVIS_BUILD_NUMBER')

diff --git a/build.properties b/build.properties
@@ -1,19 +1,6 @@
+# suppress inspection "UnusedProperty" for whole file
 #
-# This file is part of Matter Overdrive
-# Copyright (c) 2015., Simeon Radivoev, All rights reserved.
-#
-# Matter Overdrive is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Matter Overdrive is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Matter Overdrive.  If not, see <http://www.gnu.org/licenses>.
+# This file handles the Forge version and dependencies for Matter Overdrive.
 #
 
 mo_group=matteroverdrive
@@ -23,17 +10,17 @@ mo_base_name=MatterOverdrive
 # Versions
 ########################################
 mc_version=1.7.10
-mod_version=0.4.2
-forge_version=10.13.4.1517-1.7.10
+mod_version=0.4.4
+forge_version=10.13.4.1614-1.7.10
 
 #########################################
 # Dependencies
 #########################################
 # Chicken Bones
-fmp_version=1.2.0.345
-ccl_version=1.1.3.138
-ccc_version=1.0.7.46
-nei_version=1.0.5.111
+fmp_version=1.2.0.347
+ccl_version=1.1.3.140
+ccc_version=1.0.7.47
+nei_version=1.0.5.120
 
 # WAILA
 waila_version=1.5.10

diff --git a/src/main/java/matteroverdrive/entity/monster/EntityRogueAndroid.java b/src/main/java/matteroverdrive/entity/monster/EntityRogueAndroid.java
@@ -1,5 +1,7 @@
 package matteroverdrive.entity.monster;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
 import matteroverdrive.MatterOverdrive;
 import matteroverdrive.client.render.entity.EntityRendererRougeAndroid;
 import matteroverdrive.handler.ConfigurationHandler;
@@ -38,7 +40,6 @@ private static void addInBiome(BiomeGenBase[] biomes) {
                         spawnList.add(entry);
                     }
                 }
-
             }
         }
     }
@@ -67,7 +68,11 @@ public void onConfigChanged(ConfigurationHandler config) {
 
         EntityRangedRogueAndroidMob.UNLIMITED_WEAPON_ENERGY = config.getBool("unlimited_weapon_energy", ConfigurationHandler.CATEGORY_ENTITIES + ".rogue_android", true, "Do Ranged Rogue Androids have unlimited weapon energy in their weapons");
         MAX_ANDROIDS_PER_CHUNK = config.getInt("max_android_per_chunk", ConfigurationHandler.CATEGORY_ENTITIES + ".rogue_android", 4, "The max amount of Rogue Android that can spawn in a given chunk");
-        EntityRendererRougeAndroid.RENDER_ANDROID_LABEL = config.getBool("render_android_label", ConfigurationHandler.CATEGORY_ENTITIES + ".rogue_android", true, "Whether to render the name label above a Rogue Android (without a team)");
+
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
+            // RENDER_ANDROID_LABEL is a client-only option.
+            EntityRendererRougeAndroid.RENDER_ANDROID_LABEL = config.getBool("render_android_label", ConfigurationHandler.CATEGORY_ENTITIES + ".rogue_android", true, "Whether to render the name label above a Rogue Android (without a team)");
+        }
     }
 
     private static void loadBiomeBlacklist(ConfigurationHandler config) {