Update to 1.10

Sollace · Jun 30, 2016 · aa26855 · aa26855
1 parent 76d71c7
commit aa26855
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
 	}
 }
 configurations {

diff --git a/gradle.properties b/gradle.properties
@@ -5,6 +5,6 @@ description=MAtmos, a Minecraft mod.
 url=http://presencefootsteps.ha3.eu
 organization=
 buildType=SNAPSHOT
-buildVersion=1.9.4
-mcVersion=1.9.4
-mcMappings=snapshot_20160518
+buildVersion=1.10
+mcVersion=1.10
+mcMappings=snapshot_20160623
diff --git a/main-src/eu/ha3/matmos/game/data/ModularDataGatherer.java b/main-src/eu/ha3/matmos/game/data/ModularDataGatherer.java
@@ -14,8 +14,8 @@
 import eu.ha3.matmos.game.data.abstractions.scanner.Progress;
 import eu.ha3.matmos.game.data.abstractions.scanner.ScannerModule;
 import eu.ha3.matmos.game.data.modules.*;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.IDontKnowHowToCode;
-import eu.ha3.matmos.game.system.MAtMod;
 import eu.ha3.matmos.log.MAtLog;
 
 import java.util.*;

diff --git a/main-src/eu/ha3/matmos/game/data/modules/L__meta_mod.java b/main-src/eu/ha3/matmos/game/data/modules/L__meta_mod.java
@@ -3,7 +3,7 @@
 import eu.ha3.matmos.engine.core.interfaces.Data;
 import eu.ha3.matmos.game.data.abstractions.module.Module;
 import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 
 /*
 --filenotes-placeholder

diff --git a/main-src/eu/ha3/matmos/game/data/modules/M__w_biome.java b/main-src/eu/ha3/matmos/game/data/modules/M__w_biome.java
@@ -3,7 +3,7 @@
 import eu.ha3.matmos.engine.core.interfaces.Data;
 import eu.ha3.matmos.game.data.abstractions.module.Module;
 import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.MAtmosUtility;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;

diff --git a/main-src/eu/ha3/matmos/game/data/modules/M__w_general.java b/main-src/eu/ha3/matmos/game/data/modules/M__w_general.java
@@ -29,19 +29,15 @@ protected void doProcess()
 		setValue("time_modulo24k", (int) (info.getWorldTime() % 24000L));
 		setValue("rain", w.isRaining());
 		//setValue("thunder", info.isThundering());
-        // dag edit getWeightedThunderStrength(..) - > getThunderStrength(..)
 		setValue("thunder", w.getThunderStrength(0f) > 0.9f);
         setValue("dimension", player.dimension);
-        // dag edit .skylightSubtracted -> getSkylightSubtracted()
 		setValue("light_subtracted", w.getSkylightSubtracted());
 		setValue("remote", w.isRemote);
 		setValue("moon_phase", w.getMoonPhase());
         setValue("can_rain_on", w.canSeeSky(player.getPosition()));
 
-        // dag edit + ..canSpawnLightningBolt()
-        // solly edit + .canSpawnLightningBolt() -> .canRain()
         // If snowy biome is False. If biome disables rain is False
-        setValue("biome_can_rain", w.getBiomeGenForCoords(player.getPosition()).canRain());
+        setValue("biome_can_rain", w.getBiome(player.getPosition()).canRain());
 
 		setValue("rain_force1k", Math.round(w.getRainStrength(0f) * 1000));
 		setValue("thunder_force1k", Math.round(w.getThunderStrength(0f) * 1000));

diff --git a/main-src/eu/ha3/matmos/game/data/modules/R__legacy_configvars.java b/main-src/eu/ha3/matmos/game/data/modules/R__legacy_configvars.java
@@ -3,8 +3,8 @@
 import eu.ha3.matmos.engine.core.interfaces.Data;
 import eu.ha3.matmos.game.data.abstractions.module.Module;
 import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.IDontKnowHowToCode;
-import eu.ha3.matmos.game.system.MAtMod;
 import eu.ha3.util.property.simple.ConfigProperty;
 
 import java.io.File;

diff --git a/main-src/eu/ha3/matmos/game/data/modules/R__meta_option.java b/main-src/eu/ha3/matmos/game/data/modules/R__meta_option.java
@@ -3,7 +3,7 @@
 import eu.ha3.matmos.engine.core.interfaces.Data;
 import eu.ha3.matmos.game.data.abstractions.module.Module;
 import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 
 /*
 --filenotes-placeholder

diff --git a/main-src/eu/ha3/matmos/game/debug/PluggableIntoMAtmos.java b/main-src/eu/ha3/matmos/game/debug/PluggableIntoMAtmos.java
@@ -3,7 +3,7 @@
 import com.google.common.base.Optional;
 import eu.ha3.matmos.expansions.Expansion;
 import eu.ha3.matmos.expansions.debugunit.FolderResourcePackEditableEDU;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.pluggable.PluggableIntoMinecraft;
 import java.io.File;
 import net.minecraft.util.text.TextFormatting;

diff --git a/main-src/eu/ha3/matmos/game/gui/MAtGuiBiomeSlider.java b/main-src/eu/ha3/matmos/game/gui/MAtGuiBiomeSlider.java
@@ -1,6 +1,6 @@
 package eu.ha3.matmos.game.gui;
 
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.mc.gui.HDisplayStringProvider;
 import eu.ha3.mc.gui.HGuiSliderControl;
 import eu.ha3.mc.gui.HSliderListener;

diff --git a/main-src/eu/ha3/matmos/game/gui/MAtGuiExpansionDetails.java b/main-src/eu/ha3/matmos/game/gui/MAtGuiExpansionDetails.java
@@ -6,8 +6,8 @@
 import eu.ha3.matmos.expansions.debugunit.ReadOnlyJasonStringEDU;
 import eu.ha3.matmos.game.debug.PluggableIntoMAtmos;
 import eu.ha3.matmos.game.debug.SoundsJsonGenerator;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.IDontKnowHowToCode;
-import eu.ha3.matmos.game.system.MAtMod;
 import eu.ha3.matmos.game.user.VisualExpansionDebugging;
 import java.io.File;
 import net.minecraft.client.Minecraft;

diff --git a/main-src/eu/ha3/matmos/game/gui/MAtGuiExpansionInfo.java b/main-src/eu/ha3/matmos/game/gui/MAtGuiExpansionInfo.java
@@ -1,7 +1,7 @@
 package eu.ha3.matmos.game.gui;
 
 import eu.ha3.matmos.expansions.Expansion;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;

diff --git a/main-src/eu/ha3/matmos/game/gui/MAtGuiMenu.java b/main-src/eu/ha3/matmos/game/gui/MAtGuiMenu.java
@@ -2,7 +2,7 @@
 
 import eu.ha3.matmos.expansions.Expansion;
 import eu.ha3.matmos.expansions.volume.VolumeUpdatable;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.mc.gui.HDisplayStringProvider;
 import eu.ha3.mc.gui.HGuiSliderControl;
 import eu.ha3.mc.gui.HSliderListener;

diff --git a/main-src/eu/ha3/matmos/game/gui/MAtGuiModules.java b/main-src/eu/ha3/matmos/game/gui/MAtGuiModules.java
@@ -1,7 +1,7 @@
 package eu.ha3.matmos.game.gui;
 
 import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.text.TextFormatting;

diff --git a/main-src/eu/ha3/matmos/game/gui/MAtGuiMore.java b/main-src/eu/ha3/matmos/game/gui/MAtGuiMore.java
@@ -1,6 +1,6 @@
 package eu.ha3.matmos.game.gui;
 
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.mc.gui.HDisplayStringProvider;
 import eu.ha3.mc.gui.HGuiSliderControl;
 import eu.ha3.mc.gui.HSliderListener;

diff --git a/main-src/eu/ha3/matmos/game/mod/LiteModMAtmos.java b/main-src/eu/ha3/matmos/game/mod/LiteModMAtmos.java
@@ -1,6 +1,5 @@
 package eu.ha3.matmos.game.mod;
 
-import eu.ha3.matmos.game.system.MAtMod;
 import eu.ha3.mc.haddon.litemod.TempLiteKey;
 
 /*

diff --git a/...src/eu/ha3/matmos/game/system/MAtMod.java → main-src/eu/ha3/matmos/game/mod/MAtMod.java b/...src/eu/ha3/matmos/game/system/MAtMod.java → main-src/eu/ha3/matmos/game/mod/MAtMod.java
@@ -1,11 +1,14 @@
-package eu.ha3.matmos.game.system;
+package eu.ha3.matmos.game.mod;
 
 import com.google.common.base.Optional;
 import eu.ha3.easy.StopWatchStatistic;
 import eu.ha3.easy.TimeStatistic;
 import eu.ha3.matmos.expansions.Expansion;
 import eu.ha3.matmos.expansions.Stable;
 import eu.ha3.matmos.expansions.volume.VolumeUpdatable;
+import eu.ha3.matmos.game.system.MAtmosUtility;
+import eu.ha3.matmos.game.system.Simulacrum;
+import eu.ha3.matmos.game.system.SoundAccessor;
 import eu.ha3.matmos.game.user.UserControl;
 import eu.ha3.matmos.game.user.VisualDebugger;
 import eu.ha3.matmos.log.MAtLog;
@@ -19,7 +22,6 @@
 import eu.ha3.mc.haddon.supporting.SupportsTickEvents;
 import eu.ha3.mc.quick.chat.Chatter;
 import eu.ha3.mc.quick.update.NotifiableHaddon;
-import eu.ha3.mc.quick.update.UpdateNotifier;
 import eu.ha3.util.property.simple.ConfigProperty;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.SoundCategory;
@@ -43,16 +45,16 @@ public class MAtMod extends HaddonImpl implements SupportsFrameEvents, SupportsT
 	private static final boolean _COMPILE_IS_UNSTABLE = true;
 
 	// Identity
-	protected final String NAME = "MAtmos-UnofficialBeta";
-	protected final int VERSION = 30;
-	protected final String FOR = "1.9";
+	protected final String NAME = "MAtmos";
+	protected final int VERSION = 32;
+	protected final String FOR = "1.10";
 	protected final String ADDRESS = "http://matmos.ha3.eu";
-	protected final Identity identity = new HaddonIdentity(this.NAME, this.VERSION, this.FOR, this.ADDRESS);
+	protected final Identity identity = new HaddonIdentity(NAME, VERSION, FOR, ADDRESS);
 
 	// NotifiableHaddon and UpdateNotifier
 	private final ConfigProperty config = new ConfigProperty();
 	private final Chatter chatter = new Chatter(this, "<MAtmos> ");
-	private final UpdateNotifier updateNotifier = new UpdateNotifier(this, "http://q.mc.ha3.eu/query/matmos-main-version-vn.json?ver=%d");
+	//private final UpdateNotifier updateNotifier = new UpdateNotifier(this, "http://q.mc.ha3.eu/query/matmos-main-version-vn.json?ver=%d");
 
 	// State
 	private boolean isListenerInstalled; 
@@ -93,7 +95,7 @@ public void onLoad()
 		this.userControl = new UserControl(this);
 
 		// Create default configuration
-		this.updateNotifier.fillDefaults(this.config);
+		//this.updateNotifier.fillDefaults(this.config);
 		this.config.setProperty("world.height", 256);
 		this.config.setProperty("dump.sheets.enabled", false);
 		this.config.setProperty("start.enabled", true);
@@ -124,7 +126,7 @@ public void onLoad()
 
 		resetAmbientVolume();
 
-		this.updateNotifier.loadConfig(this.config);
+		//this.updateNotifier.loadConfig(this.config);
 
 		// This registers stuff to Minecraft (key bindings...)
 		this.userControl.load();
@@ -271,7 +273,7 @@ public void onTick()
 		{
 			this.hasFirstTickPassed = true;
 
-			this.updateNotifier.attempt();
+			//this.updateNotifier.attempt();
 
 			if (MAtMod._COMPILE_IS_UNSTABLE)
 			{

diff --git a/main-src/eu/ha3/matmos/game/system/Simulacrum.java b/main-src/eu/ha3/matmos/game/system/Simulacrum.java
@@ -5,6 +5,7 @@
 import eu.ha3.matmos.expansions.ExpansionManager;
 import eu.ha3.matmos.expansions.volume.VolumeUpdatable;
 import eu.ha3.matmos.game.data.ModularDataGatherer;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.user.VisualDebugger;
 import eu.ha3.matmos.log.MAtLog;
 import eu.ha3.mc.haddon.supporting.SupportsFrameEvents;

diff --git a/main-src/eu/ha3/matmos/game/user/UserControl.java b/main-src/eu/ha3/matmos/game/user/UserControl.java
@@ -2,7 +2,7 @@
 
 import eu.ha3.easy.TimeStatistic;
 import eu.ha3.matmos.game.gui.MAtGuiMenu;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.MAtmosUtility;
 import eu.ha3.mc.convenience.Ha3HoldActions;
 import eu.ha3.mc.convenience.Ha3KeyHolding;

diff --git a/main-src/eu/ha3/matmos/game/user/VisualDebugger.java b/main-src/eu/ha3/matmos/game/user/VisualDebugger.java
@@ -5,7 +5,7 @@
 import eu.ha3.matmos.game.data.ModularDataGatherer;
 import eu.ha3.matmos.game.data.abstractions.scanner.Progress;
 import eu.ha3.matmos.game.data.abstractions.scanner.ScannerModule;
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.mc.haddon.supporting.SupportsFrameEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;

diff --git a/main-src/eu/ha3/matmos/game/user/VisualExpansionDebugging.java b/main-src/eu/ha3/matmos/game/user/VisualExpansionDebugging.java
@@ -6,8 +6,8 @@
 import eu.ha3.matmos.engine.core.implem.abstractions.Provider;
 import eu.ha3.matmos.engine.core.interfaces.Dependable;
 import eu.ha3.matmos.engine.core.visualize.Visualized;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.IDontKnowHowToCode;
-import eu.ha3.matmos.game.system.MAtMod;
 import eu.ha3.mc.haddon.supporting.SupportsFrameEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;

diff --git a/main-src/eu/ha3/matmos/game/user/VolumeScroller.java b/main-src/eu/ha3/matmos/game/user/VolumeScroller.java
@@ -1,6 +1,6 @@
 package eu.ha3.matmos.game.user;
 
-import eu.ha3.matmos.game.system.MAtMod;
+import eu.ha3.matmos.game.mod.MAtMod;
 import eu.ha3.matmos.game.system.MAtmosUtility;
 import eu.ha3.mc.convenience.Ha3Scroller;
 import net.minecraft.client.Minecraft;

diff --git a/matmos-packaging/litemod.json b/matmos-packaging/litemod.json
@@ -1,8 +1,8 @@
 {
-  "name": "eu.ha3.mc.matmos",
-  "mcversion": "1.9.4",
-  "version": "r31",
-  "revision": "31",
+  "name": "MAtmos",
+  "mcversion": "1.10",
+  "version": "r32",
+  "revision": "32",
   "author": "Hurricaaane (Ha3)",
   "url": "http://matmos.ha3.eu",
   "description": "MAtmos"