Skip to content

Commit aa26855

Browse files
SollaceSollace
committed
Update to 1.10
1 parent 76d71c7 commit aa26855

23 files changed

+38
-40
lines changed

Diff for: ‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313
}
1414
dependencies {
15-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
15+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
1616
}
1717
}
1818
configurations {

Diff for: ‎gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ description=MAtmos, a Minecraft mod.
55
url=http://presencefootsteps.ha3.eu
66
organization=
77
buildType=SNAPSHOT
8-
buildVersion=1.9.4
9-
mcVersion=1.9.4
10-
mcMappings=snapshot_20160518
8+
buildVersion=1.10
9+
mcVersion=1.10
10+
mcMappings=snapshot_20160623

Diff for: ‎main-src/eu/ha3/matmos/game/data/ModularDataGatherer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import eu.ha3.matmos.game.data.abstractions.scanner.Progress;
1515
import eu.ha3.matmos.game.data.abstractions.scanner.ScannerModule;
1616
import eu.ha3.matmos.game.data.modules.*;
17+
import eu.ha3.matmos.game.mod.MAtMod;
1718
import eu.ha3.matmos.game.system.IDontKnowHowToCode;
18-
import eu.ha3.matmos.game.system.MAtMod;
1919
import eu.ha3.matmos.log.MAtLog;
2020

2121
import java.util.*;

Diff for: ‎main-src/eu/ha3/matmos/game/data/modules/L__meta_mod.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import eu.ha3.matmos.engine.core.interfaces.Data;
44
import eu.ha3.matmos.game.data.abstractions.module.Module;
55
import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
6-
import eu.ha3.matmos.game.system.MAtMod;
6+
import eu.ha3.matmos.game.mod.MAtMod;
77

88
/*
99
--filenotes-placeholder

Diff for: ‎main-src/eu/ha3/matmos/game/data/modules/M__w_biome.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import eu.ha3.matmos.engine.core.interfaces.Data;
44
import eu.ha3.matmos.game.data.abstractions.module.Module;
55
import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
6-
import eu.ha3.matmos.game.system.MAtMod;
6+
import eu.ha3.matmos.game.mod.MAtMod;
77
import eu.ha3.matmos.game.system.MAtmosUtility;
88
import net.minecraft.client.Minecraft;
99
import net.minecraft.util.math.BlockPos;

Diff for: ‎main-src/eu/ha3/matmos/game/data/modules/M__w_general.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,15 @@ protected void doProcess()
2929
setValue("time_modulo24k", (int) (info.getWorldTime() % 24000L));
3030
setValue("rain", w.isRaining());
3131
//setValue("thunder", info.isThundering());
32-
// dag edit getWeightedThunderStrength(..) - > getThunderStrength(..)
3332
setValue("thunder", w.getThunderStrength(0f) > 0.9f);
3433
setValue("dimension", player.dimension);
35-
// dag edit .skylightSubtracted -> getSkylightSubtracted()
3634
setValue("light_subtracted", w.getSkylightSubtracted());
3735
setValue("remote", w.isRemote);
3836
setValue("moon_phase", w.getMoonPhase());
3937
setValue("can_rain_on", w.canSeeSky(player.getPosition()));
4038

41-
// dag edit + ..canSpawnLightningBolt()
42-
// solly edit + .canSpawnLightningBolt() -> .canRain()
4339
// If snowy biome is False. If biome disables rain is False
44-
setValue("biome_can_rain", w.getBiomeGenForCoords(player.getPosition()).canRain());
40+
setValue("biome_can_rain", w.getBiome(player.getPosition()).canRain());
4541

4642
setValue("rain_force1k", Math.round(w.getRainStrength(0f) * 1000));
4743
setValue("thunder_force1k", Math.round(w.getThunderStrength(0f) * 1000));

Diff for: ‎main-src/eu/ha3/matmos/game/data/modules/R__legacy_configvars.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import eu.ha3.matmos.engine.core.interfaces.Data;
44
import eu.ha3.matmos.game.data.abstractions.module.Module;
55
import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
6+
import eu.ha3.matmos.game.mod.MAtMod;
67
import eu.ha3.matmos.game.system.IDontKnowHowToCode;
7-
import eu.ha3.matmos.game.system.MAtMod;
88
import eu.ha3.util.property.simple.ConfigProperty;
99

1010
import java.io.File;

Diff for: ‎main-src/eu/ha3/matmos/game/data/modules/R__meta_option.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import eu.ha3.matmos.engine.core.interfaces.Data;
44
import eu.ha3.matmos.game.data.abstractions.module.Module;
55
import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
6-
import eu.ha3.matmos.game.system.MAtMod;
6+
import eu.ha3.matmos.game.mod.MAtMod;
77

88
/*
99
--filenotes-placeholder

Diff for: ‎main-src/eu/ha3/matmos/game/debug/PluggableIntoMAtmos.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.base.Optional;
44
import eu.ha3.matmos.expansions.Expansion;
55
import eu.ha3.matmos.expansions.debugunit.FolderResourcePackEditableEDU;
6-
import eu.ha3.matmos.game.system.MAtMod;
6+
import eu.ha3.matmos.game.mod.MAtMod;
77
import eu.ha3.matmos.pluggable.PluggableIntoMinecraft;
88
import java.io.File;
99
import net.minecraft.util.text.TextFormatting;

Diff for: ‎main-src/eu/ha3/matmos/game/gui/MAtGuiBiomeSlider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package eu.ha3.matmos.game.gui;
22

3-
import eu.ha3.matmos.game.system.MAtMod;
3+
import eu.ha3.matmos.game.mod.MAtMod;
44
import eu.ha3.mc.gui.HDisplayStringProvider;
55
import eu.ha3.mc.gui.HGuiSliderControl;
66
import eu.ha3.mc.gui.HSliderListener;

Diff for: ‎main-src/eu/ha3/matmos/game/gui/MAtGuiExpansionDetails.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import eu.ha3.matmos.expansions.debugunit.ReadOnlyJasonStringEDU;
77
import eu.ha3.matmos.game.debug.PluggableIntoMAtmos;
88
import eu.ha3.matmos.game.debug.SoundsJsonGenerator;
9+
import eu.ha3.matmos.game.mod.MAtMod;
910
import eu.ha3.matmos.game.system.IDontKnowHowToCode;
10-
import eu.ha3.matmos.game.system.MAtMod;
1111
import eu.ha3.matmos.game.user.VisualExpansionDebugging;
1212
import java.io.File;
1313
import net.minecraft.client.Minecraft;

Diff for: ‎main-src/eu/ha3/matmos/game/gui/MAtGuiExpansionInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package eu.ha3.matmos.game.gui;
22

33
import eu.ha3.matmos.expansions.Expansion;
4-
import eu.ha3.matmos.game.system.MAtMod;
4+
import eu.ha3.matmos.game.mod.MAtMod;
55
import net.minecraft.client.Minecraft;
66
import net.minecraft.client.gui.GuiButton;
77
import net.minecraft.client.gui.GuiScreen;

Diff for: ‎main-src/eu/ha3/matmos/game/gui/MAtGuiMenu.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import eu.ha3.matmos.expansions.Expansion;
44
import eu.ha3.matmos.expansions.volume.VolumeUpdatable;
5-
import eu.ha3.matmos.game.system.MAtMod;
5+
import eu.ha3.matmos.game.mod.MAtMod;
66
import eu.ha3.mc.gui.HDisplayStringProvider;
77
import eu.ha3.mc.gui.HGuiSliderControl;
88
import eu.ha3.mc.gui.HSliderListener;

Diff for: ‎main-src/eu/ha3/matmos/game/gui/MAtGuiModules.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package eu.ha3.matmos.game.gui;
22

33
import eu.ha3.matmos.game.data.abstractions.module.ModuleProcessor;
4-
import eu.ha3.matmos.game.system.MAtMod;
4+
import eu.ha3.matmos.game.mod.MAtMod;
55
import net.minecraft.client.gui.GuiButton;
66
import net.minecraft.client.gui.GuiScreen;
77
import net.minecraft.util.text.TextFormatting;

Diff for: ‎main-src/eu/ha3/matmos/game/gui/MAtGuiMore.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package eu.ha3.matmos.game.gui;
22

3-
import eu.ha3.matmos.game.system.MAtMod;
3+
import eu.ha3.matmos.game.mod.MAtMod;
44
import eu.ha3.mc.gui.HDisplayStringProvider;
55
import eu.ha3.mc.gui.HGuiSliderControl;
66
import eu.ha3.mc.gui.HSliderListener;

Diff for: ‎main-src/eu/ha3/matmos/game/mod/LiteModMAtmos.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package eu.ha3.matmos.game.mod;
22

3-
import eu.ha3.matmos.game.system.MAtMod;
43
import eu.ha3.mc.haddon.litemod.TempLiteKey;
54

65
/*

Diff for: ‎main-src/eu/ha3/matmos/game/system/MAtMod.java renamed to ‎main-src/eu/ha3/matmos/game/mod/MAtMod.java

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
package eu.ha3.matmos.game.system;
1+
package eu.ha3.matmos.game.mod;
22

33
import com.google.common.base.Optional;
44
import eu.ha3.easy.StopWatchStatistic;
55
import eu.ha3.easy.TimeStatistic;
66
import eu.ha3.matmos.expansions.Expansion;
77
import eu.ha3.matmos.expansions.Stable;
88
import eu.ha3.matmos.expansions.volume.VolumeUpdatable;
9+
import eu.ha3.matmos.game.system.MAtmosUtility;
10+
import eu.ha3.matmos.game.system.Simulacrum;
11+
import eu.ha3.matmos.game.system.SoundAccessor;
912
import eu.ha3.matmos.game.user.UserControl;
1013
import eu.ha3.matmos.game.user.VisualDebugger;
1114
import eu.ha3.matmos.log.MAtLog;
@@ -19,7 +22,6 @@
1922
import eu.ha3.mc.haddon.supporting.SupportsTickEvents;
2023
import eu.ha3.mc.quick.chat.Chatter;
2124
import eu.ha3.mc.quick.update.NotifiableHaddon;
22-
import eu.ha3.mc.quick.update.UpdateNotifier;
2325
import eu.ha3.util.property.simple.ConfigProperty;
2426
import net.minecraft.client.Minecraft;
2527
import net.minecraft.util.SoundCategory;
@@ -43,16 +45,16 @@ public class MAtMod extends HaddonImpl implements SupportsFrameEvents, SupportsT
4345
private static final boolean _COMPILE_IS_UNSTABLE = true;
4446

4547
// Identity
46-
protected final String NAME = "MAtmos-UnofficialBeta";
47-
protected final int VERSION = 30;
48-
protected final String FOR = "1.9";
48+
protected final String NAME = "MAtmos";
49+
protected final int VERSION = 32;
50+
protected final String FOR = "1.10";
4951
protected final String ADDRESS = "http://matmos.ha3.eu";
50-
protected final Identity identity = new HaddonIdentity(this.NAME, this.VERSION, this.FOR, this.ADDRESS);
52+
protected final Identity identity = new HaddonIdentity(NAME, VERSION, FOR, ADDRESS);
5153

5254
// NotifiableHaddon and UpdateNotifier
5355
private final ConfigProperty config = new ConfigProperty();
5456
private final Chatter chatter = new Chatter(this, "<MAtmos> ");
55-
private final UpdateNotifier updateNotifier = new UpdateNotifier(this, "http://q.mc.ha3.eu/query/matmos-main-version-vn.json?ver=%d");
57+
//private final UpdateNotifier updateNotifier = new UpdateNotifier(this, "http://q.mc.ha3.eu/query/matmos-main-version-vn.json?ver=%d");
5658

5759
// State
5860
private boolean isListenerInstalled;
@@ -93,7 +95,7 @@ public void onLoad()
9395
this.userControl = new UserControl(this);
9496

9597
// Create default configuration
96-
this.updateNotifier.fillDefaults(this.config);
98+
//this.updateNotifier.fillDefaults(this.config);
9799
this.config.setProperty("world.height", 256);
98100
this.config.setProperty("dump.sheets.enabled", false);
99101
this.config.setProperty("start.enabled", true);
@@ -124,7 +126,7 @@ public void onLoad()
124126

125127
resetAmbientVolume();
126128

127-
this.updateNotifier.loadConfig(this.config);
129+
//this.updateNotifier.loadConfig(this.config);
128130

129131
// This registers stuff to Minecraft (key bindings...)
130132
this.userControl.load();
@@ -271,7 +273,7 @@ public void onTick()
271273
{
272274
this.hasFirstTickPassed = true;
273275

274-
this.updateNotifier.attempt();
276+
//this.updateNotifier.attempt();
275277

276278
if (MAtMod._COMPILE_IS_UNSTABLE)
277279
{

Diff for: ‎main-src/eu/ha3/matmos/game/system/Simulacrum.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import eu.ha3.matmos.expansions.ExpansionManager;
66
import eu.ha3.matmos.expansions.volume.VolumeUpdatable;
77
import eu.ha3.matmos.game.data.ModularDataGatherer;
8+
import eu.ha3.matmos.game.mod.MAtMod;
89
import eu.ha3.matmos.game.user.VisualDebugger;
910
import eu.ha3.matmos.log.MAtLog;
1011
import eu.ha3.mc.haddon.supporting.SupportsFrameEvents;

Diff for: ‎main-src/eu/ha3/matmos/game/user/UserControl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import eu.ha3.easy.TimeStatistic;
44
import eu.ha3.matmos.game.gui.MAtGuiMenu;
5-
import eu.ha3.matmos.game.system.MAtMod;
5+
import eu.ha3.matmos.game.mod.MAtMod;
66
import eu.ha3.matmos.game.system.MAtmosUtility;
77
import eu.ha3.mc.convenience.Ha3HoldActions;
88
import eu.ha3.mc.convenience.Ha3KeyHolding;

Diff for: ‎main-src/eu/ha3/matmos/game/user/VisualDebugger.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import eu.ha3.matmos.game.data.ModularDataGatherer;
66
import eu.ha3.matmos.game.data.abstractions.scanner.Progress;
77
import eu.ha3.matmos.game.data.abstractions.scanner.ScannerModule;
8-
import eu.ha3.matmos.game.system.MAtMod;
8+
import eu.ha3.matmos.game.mod.MAtMod;
99
import eu.ha3.mc.haddon.supporting.SupportsFrameEvents;
1010
import net.minecraft.client.Minecraft;
1111
import net.minecraft.client.gui.FontRenderer;

Diff for: ‎main-src/eu/ha3/matmos/game/user/VisualExpansionDebugging.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import eu.ha3.matmos.engine.core.implem.abstractions.Provider;
77
import eu.ha3.matmos.engine.core.interfaces.Dependable;
88
import eu.ha3.matmos.engine.core.visualize.Visualized;
9+
import eu.ha3.matmos.game.mod.MAtMod;
910
import eu.ha3.matmos.game.system.IDontKnowHowToCode;
10-
import eu.ha3.matmos.game.system.MAtMod;
1111
import eu.ha3.mc.haddon.supporting.SupportsFrameEvents;
1212
import net.minecraft.client.Minecraft;
1313
import net.minecraft.client.gui.FontRenderer;

Diff for: ‎main-src/eu/ha3/matmos/game/user/VolumeScroller.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package eu.ha3.matmos.game.user;
22

3-
import eu.ha3.matmos.game.system.MAtMod;
3+
import eu.ha3.matmos.game.mod.MAtMod;
44
import eu.ha3.matmos.game.system.MAtmosUtility;
55
import eu.ha3.mc.convenience.Ha3Scroller;
66
import net.minecraft.client.Minecraft;

Diff for: ‎matmos-packaging/litemod.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "eu.ha3.mc.matmos",
3-
"mcversion": "1.9.4",
4-
"version": "r31",
5-
"revision": "31",
2+
"name": "MAtmos",
3+
"mcversion": "1.10",
4+
"version": "r32",
5+
"revision": "32",
66
"author": "Hurricaaane (Ha3)",
77
"url": "http://matmos.ha3.eu",
88
"description": "MAtmos"

0 commit comments

Comments
 (0)