Skip to content

Commit b66cbe7

Browse files
ROMVoid95ROMVoid95
committed
1.0.0
1 parent 4efc2a6 commit b66cbe7

23 files changed

+271
-423
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## Delete Current Config For This Mod Before Running This Update
2+
3+
[Added]
4+
5+
- Option to choose addon for Separate Galaxy feature
6+
- Default addon for Seperate Galaxy is now "none"
7+
- Warning in crash-log if Separate Galaxy is enabled
8+
9+
10+
[Changed/Removed]
11+
12+
- Parse loaded Addons from FML Loader
13+
- Modpack Crashlog Data

‎CHANGELOG.txt‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ forge_version=14.23.5.2847
1414
mcp=snapshot_20171003
1515

1616
## Mod Versioning
17-
versionMajor=0
18-
versionMinor=4
17+
versionMajor=1
18+
versionMinor=0
1919
versionRev=0
2020

2121
## Cureforge Upload Configs
2222
cf_project_id=359766
2323
cf_release_type=release
24-
cf_changelog_filename=CHANGELOG.txt
25-
cf_changelog_type=text
24+
cf_changelog_filename=CHANGELOG.md
25+
cf_changelog_type=markdown
2626
cf_versions=1.12.2
2727
cf_use_custom_display_name=false
2828
#dep_has_ats=false

‎src/main/java/net/rom/gctweaks/GalacticTweaks.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
import java.util.Map;
44

55
import net.minecraftforge.common.MinecraftForge;
6-
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
76
import net.minecraftforge.fml.common.Mod;
87
import net.minecraftforge.fml.common.Mod.EventHandler;
98
import net.minecraftforge.fml.common.Mod.Instance;
109
import net.minecraftforge.fml.common.SidedProxy;
1110
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
1211
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
1312
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
14-
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1513
import net.minecraftforge.fml.common.network.NetworkCheckHandler;
1614
import net.minecraftforge.fml.common.network.NetworkRegistry;
1715
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
@@ -21,7 +19,7 @@
2119
import net.rom.gctweaks.core.utils.I18nHelper;
2220
import net.rom.gctweaks.core.utils.LogHelper;
2321

24-
@Mod(modid = Ref.MOD_ID, name = Ref.MOD_NAME, version = Ref.MOD_VERSION, dependencies = Ref.MOD_DEPENDENCIES, certificateFingerprint = Ref.MOD_FINGERPRINT, guiFactory = "net.rom.gctweaks.core.config.GuiConfigFactory", useMetadata = true)
22+
@Mod(modid = Ref.MOD_ID, name = Ref.MOD_NAME, version = Ref.MOD_VERSION, dependencies = Ref.DEPS, certificateFingerprint = Ref.MOD_FINGERPRINT, useMetadata = true)
2523
public class GalacticTweaks {
2624

2725
@Instance(Ref.MOD_ID)
@@ -66,10 +64,4 @@ private void syncConfig() {
6664
ModuleController.modules.forEach(Module::syncConfig);
6765

6866
}
69-
70-
@SubscribeEvent
71-
public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
72-
if (event.getModID().equals(Ref.MOD_ID))
73-
syncConfig();
74-
}
7567
}

‎src/main/java/net/rom/gctweaks/ModuleController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ModuleController {
1313

1414
public static void registerModules() {
1515
modules.add(new GalacticraftModule("Galacticraft Module"));
16-
modules.add(new ModpackModule("Modpack Module"));
16+
modules.add(new ModpackModule());
1717
}
1818

1919

‎src/main/java/net/rom/gctweaks/Ref.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ public class Ref {
1515
public static final String MOD_FORGE = "forge";
1616
public static final String MOD_FORGE_VERSION = "@FORGE_VERSION@";
1717
public static final String MOD_FORGE_VERSION_MIN = "14.23.5.2847";
18-
public static final String MOD_GC = "required-after:galacticraftcore@[4.0.2.261,];required-after:galacticraftplanets;after:extraplanets";
18+
public static final String A = "after:asmodeuscore@[0.0.17,];";
19+
public static final String B = "after:extraplanets;";
20+
public static final String C = "after:galaxyspace;";
21+
22+
public static final String MOD_GC = "required-after:galacticraftcore@[4.0.2.261,];required-after:galacticraftplanets;";
1923

2024
// Dependencies
21-
public static final String MOD_DEPENDENCIES = "required:forge@[" + MOD_FORGE_VERSION_MIN + ",);" + MOD_GC + ";";
25+
public static final String DEPS = "required:forge@[" + MOD_FORGE_VERSION_MIN + ",);" + MOD_GC + ";" + A + B + C;
2226

2327
}

‎src/main/java/net/rom/gctweaks/core/Feature.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
package net.rom.gctweaks.core;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
63
import net.minecraftforge.common.config.Configuration;
74
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
8-
import scala.actors.threadpool.Arrays;
95

106
/**
117
* The Abstract Class Feature.
128
*/
139
public abstract class Feature {
1410

15-
public List<String> categoryList = new ArrayList<String>(Arrays.asList(category()));
16-
1711
/**
1812
* @return the category
1913
*/

‎src/main/java/net/rom/gctweaks/core/GCPlanets.java‎

Lines changed: 29 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,62 @@
11
package net.rom.gctweaks.core;
22

3-
import com.mjr.extraplanets.Config;
4-
import com.mjr.extraplanets.Constants;
53
import com.mjr.extraplanets.planets.ExtraPlanets_Planets;
6-
import com.mjr.extraplanets.planets.Ceres.TeleportTypeCeres;
7-
import com.mjr.extraplanets.planets.Ceres.WorldProviderCeres;
8-
import com.mjr.extraplanets.planets.Ceres.worldgen.CeresBiomes;
9-
import com.mjr.extraplanets.planets.Eris.TeleportTypeEris;
10-
import com.mjr.extraplanets.planets.Eris.WorldProviderEris;
11-
import com.mjr.extraplanets.planets.Eris.worldgen.ErisBiomes;
12-
import com.mjr.extraplanets.planets.Jupiter.TeleportTypeJupiter;
13-
import com.mjr.extraplanets.planets.Jupiter.WorldProviderJupiter;
14-
import com.mjr.extraplanets.planets.Jupiter.worldgen.JupiterBiomes;
15-
import com.mjr.extraplanets.planets.Mercury.TeleportTypeMercury;
16-
import com.mjr.extraplanets.planets.Mercury.WorldProviderMercury;
17-
import com.mjr.extraplanets.planets.Mercury.worldgen.MercuryBiomes;
18-
import com.mjr.extraplanets.planets.Neptune.TeleportTypeNeptune;
19-
import com.mjr.extraplanets.planets.Neptune.WorldProviderNeptune;
20-
import com.mjr.extraplanets.planets.Neptune.worldgen.NeptuneBiomes;
21-
import com.mjr.extraplanets.planets.Pluto.TeleportTypePluto;
22-
import com.mjr.extraplanets.planets.Pluto.WorldProviderPluto;
23-
import com.mjr.extraplanets.planets.Pluto.worldgen.PlutoBiomes;
24-
import com.mjr.extraplanets.planets.Saturn.TeleportTypeSaturn;
25-
import com.mjr.extraplanets.planets.Saturn.WorldProviderSaturn;
26-
import com.mjr.extraplanets.planets.Saturn.worldgen.SaturnBiomes;
27-
import com.mjr.extraplanets.planets.Uranus.TeleportTypeUranus;
28-
import com.mjr.extraplanets.planets.Uranus.WorldProviderUranus;
29-
import com.mjr.extraplanets.planets.Uranus.worldgen.UranusBiomes;
304

31-
import micdoodle8.mods.galacticraft.api.GalacticraftRegistry;
5+
import galaxyspace.systems.SolarSystem.SolarSystemBodies;
326
import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
337
import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody.ScalableDistance;
348
import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry;
359
import micdoodle8.mods.galacticraft.api.galaxies.Planet;
3610
import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem;
37-
import micdoodle8.mods.galacticraft.api.world.AtmosphereInfo;
3811
import micdoodle8.mods.galacticraft.api.world.EnumAtmosphericGas;
3912
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
40-
import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper;
41-
import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedEnderman;
42-
import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton;
43-
import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSpider;
44-
import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie;
4513
import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule;
4614
import net.minecraft.util.ResourceLocation;
47-
import net.minecraft.world.biome.Biome.SpawnListEntry;
48-
import net.rom.gctweaks.GalacticTweaks;
4915

5016
public class GCPlanets {
5117
public static Planet FAKE_OVERWORLD;
5218
public static Planet FAKE_ASTEROIDS;
53-
54-
public static void init() {
19+
20+
public static void initEp() {
21+
buildEp();
5522
build();
5623
}
5724

58-
/**
59-
* This method contains statements from the ExtraPlanets_Planets class from the ExtraPlanets Mod
60-
*
61-
* They are provided here to ensure the moved planets still contain their world features.
62-
*
63-
* All credits for each statement goes to MJRLegends
64-
* https://github.com/MJRLegends/ExtraPlanets/blob/dev_1.12.2/src/main/java/com/mjr/extraplanets/planets/ExtraPlanets_Planets.java
65-
*/
66-
private static void build() {
67-
GalacticTweaks.logger.debug(GCSystems.EP_SYSTEM.getName());
68-
69-
try {
70-
GalacticTweaks.logger.debug(GCSystems.EP_SYSTEM.getName());
71-
} catch (Exception e) {
72-
73-
}
74-
75-
buildFakeEarth(FAKE_OVERWORLD, "fakeOverworld", GCSystems.EP_SYSTEM, GalacticraftCore.planetOverworld.getPhaseShift(), GalacticraftCore.planetOverworld.getRelativeDistanceFromCenter().scaledDistance);
76-
buildAsteroids(FAKE_ASTEROIDS, "fakeRocks", GCSystems.EP_SYSTEM, AsteroidsModule.planetAsteroids.getPhaseShift(), 1.375F);
77-
78-
25+
public static void initGs () {
26+
buildGs();
27+
build();
28+
}
29+
30+
private static void buildEp () {
7931
ExtraPlanets_Planets.MERCURY.setParentSolarSystem(GCSystems.EP_SYSTEM);
80-
8132
ExtraPlanets_Planets.CERES.setParentSolarSystem(GCSystems.EP_SYSTEM);
82-
8333
ExtraPlanets_Planets.JUPITER.setParentSolarSystem(GCSystems.EP_SYSTEM);
84-
8534
ExtraPlanets_Planets.SATURN.setParentSolarSystem(GCSystems.EP_SYSTEM);
86-
8735
ExtraPlanets_Planets.URANUS.setParentSolarSystem(GCSystems.EP_SYSTEM);
88-
8936
ExtraPlanets_Planets.NEPTUNE.setParentSolarSystem(GCSystems.EP_SYSTEM);
90-
9137
ExtraPlanets_Planets.PLUTO.setParentSolarSystem(GCSystems.EP_SYSTEM);
92-
9338
ExtraPlanets_Planets.ERIS.setParentSolarSystem(GCSystems.EP_SYSTEM);
94-
39+
}
40+
41+
private static void buildGs() {
42+
SolarSystemBodies.planetMercury.setParentSolarSystem(GCSystems.EP_SYSTEM);
43+
SolarSystemBodies.planetCeres.setParentSolarSystem(GCSystems.EP_SYSTEM);
44+
SolarSystemBodies.planetJupiter.setParentSolarSystem(GCSystems.EP_SYSTEM);
45+
SolarSystemBodies.planetSaturn.setParentSolarSystem(GCSystems.EP_SYSTEM);
46+
SolarSystemBodies.planetUranus.setParentSolarSystem(GCSystems.EP_SYSTEM);
47+
SolarSystemBodies.planetNeptune.setParentSolarSystem(GCSystems.EP_SYSTEM);
48+
SolarSystemBodies.planetPluto.setParentSolarSystem(GCSystems.EP_SYSTEM);
49+
//SolarSystemBodies.planetEris.setParentSolarSystem(GCSystems.EP_SYSTEM);
50+
}
9551

52+
private static void build () {
9653

54+
buildFakeEarth(FAKE_OVERWORLD, "fakeOverworld", GCSystems.EP_SYSTEM, GalacticraftCore.planetOverworld
55+
.getPhaseShift(), GalacticraftCore.planetOverworld.getRelativeDistanceFromCenter().scaledDistance);
56+
buildAsteroids(FAKE_ASTEROIDS, "fakeRocks", GCSystems.EP_SYSTEM, AsteroidsModule.planetAsteroids
57+
.getPhaseShift(), 1.375F);
9758
}
98-
59+
9960
public static void buildAsteroids (Planet planet, String planetName, SolarSystem solarSystem, float randomPhase, float au) {
10061
planet = new Planet(planetName).setParentSolarSystem(solarSystem);
10162
planet.setRelativeDistanceFromCenter(new CelestialBody.ScalableDistance(au, au));
@@ -106,7 +67,7 @@ public static void buildAsteroids (Planet planet, String planetName, SolarSystem
10667
planet.setUnreachable();
10768
GalaxyRegistry.registerPlanet(planet);
10869
}
109-
70+
11071
public static void buildFakeEarth (Planet planet, String planetName, SolarSystem solarSystem, float randomPhase, float au) {
11172
planet = new Planet(planetName).setParentSolarSystem(solarSystem);
11273
planet.setRelativeDistanceFromCenter(new ScalableDistance(au, au));

‎src/main/java/net/rom/gctweaks/core/GCSystems.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ private static void build() {
2727
starSol4.setBodyIcon(new ResourceLocation(micdoodle8.mods.galacticraft.core.Constants.ASSET_PREFIX, "textures/gui/celestialbodies/sun.png"));
2828
EP_SYSTEM.setMainStar(starSol4);
2929
GalaxyRegistry.registerSolarSystem(EP_SYSTEM);
30-
31-
// OTHER = new SolarSystem("otherSystem", EXTRAPLANETS.getName()).setMapPosition(new Vector3(1.0F, -1.0F, 0.0F));
32-
// Star starOther = (Star) new Star("othersys").setParentSolarSystem(OTHER).setTierRequired(-1);
33-
// starOther.setBodyIcon(new ResourceLocation(micdoodle8.mods.galacticraft.core.Constants.ASSET_PREFIX, "textures/gui/celestialbodies/sun.png"));
34-
// OTHER.setMainStar(starOther);
35-
// GalaxyRegistry.registerSolarSystem(OTHER);
3630

3731
}
3832
}

‎src/main/java/net/rom/gctweaks/core/Module.java‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,74 @@
88
import net.minecraftforge.common.config.Configuration;
99
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
1010
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
11-
import net.rom.gctweaks.GalacticTweaks;
1211

1312
public abstract class Module {
14-
private List<Feature> features = new ArrayList<>();
15-
private String name;
16-
private Configuration config;
13+
private List<Feature> features = new ArrayList<>();
14+
private List<NoConfigFeature> features2 = new ArrayList<>();
15+
private String name;
16+
private Configuration config;
17+
private boolean setConfig;
1718

1819
public Module(String name) {
19-
this.name = name;
20+
this.setConfig = true;
21+
this.name = name;
2022
addFeatures();
2123
}
2224

23-
public abstract void addFeatures();
25+
public Module() {
26+
this.setConfig = false;
27+
addFeatures();
28+
}
29+
30+
public abstract void addFeatures ();
2431

25-
public void preInit() {
32+
public void preInit () {
2633
features.stream().filter(Feature::usesEvents).forEach(MinecraftForge.EVENT_BUS::register);
27-
features.stream().filter(Feature::usesEvents).forEach(feature -> GalacticTweaks.logger.info("Registered Event Handler class {}", feature.getClass().getName()));
2834
features.forEach(Feature::preInit);
35+
features2.stream().filter(NoConfigFeature::usesEvents).forEach(MinecraftForge.EVENT_BUS::register);
36+
features2.forEach(NoConfigFeature::preInit);
2937
}
3038

31-
public void proxyPreInit() {
39+
public void proxyPreInit () {
3240
features.stream().filter(Feature::sidedProxy).forEach(MinecraftForge.EVENT_BUS::register);
3341
features.forEach(Feature::proxyPreInit);
42+
features2.stream().filter(NoConfigFeature::sidedProxy).forEach(MinecraftForge.EVENT_BUS::register);
43+
features2.forEach(NoConfigFeature::proxyPreInit);
3444
}
3545

36-
public void setupConfig(FMLPreInitializationEvent event) {
37-
File file = new File(event.getModConfigurationDirectory().toString() + "/GalacticTweaks/" + name + ".cfg");
38-
config = new Configuration(file, "3");
39-
config.load();
40-
GalacticTweaks.logger.bigInfo("Loaded Version: %s | Defined Version: %s", config.getLoadedConfigVersion(), config.getDefinedConfigVersion());
41-
46+
public void setupConfig (FMLPreInitializationEvent event) {
47+
if (setConfig) {
48+
File file = new File(event.getModConfigurationDirectory().toString() + "/GalacticTweaks/" + name + ".cfg");
49+
config = new Configuration(file, "3");
50+
config.load();
51+
}
4252
}
4353

44-
public void init() {
54+
public void init () {
4555
features.forEach(Feature::init);
56+
features2.forEach(NoConfigFeature::init);
4657
}
4758

48-
public void postInit() {
59+
public void postInit () {
4960
features.forEach(Feature::postInit);
61+
features2.forEach(NoConfigFeature::postInit);
5062
}
5163

52-
public void proxyInit() {
64+
public void proxyInit () {
5365
features.forEach(Feature::proxyInit);
66+
features2.forEach(NoConfigFeature::proxyInit);
5467
}
5568

56-
public void proxyPostInit() {
69+
public void proxyPostInit () {
5770
features.forEach(Feature::proxyPostInit);
71+
features2.forEach(NoConfigFeature::proxyPostInit);
5872
}
5973

60-
public Configuration getConfig() {
74+
public Configuration getConfig () {
6175
return config;
6276
}
6377

64-
public void syncConfig() {
78+
public void syncConfig () {
6579
features.forEach(feature -> {
6680
feature.syncConfig(config, feature.category());
6781
config.addCustomCategoryComment(feature.category()[0], feature.comment());
@@ -70,11 +84,16 @@ public void syncConfig() {
7084
});
7185
}
7286

73-
protected void registerFeature(Feature feature) {
87+
protected void registerFeature (Feature feature) {
7488
features.add(feature);
7589
}
7690

77-
public void registerPacket(SimpleNetworkWrapper network) {
91+
protected void registerFeature (NoConfigFeature feature) {
92+
features2.add(feature);
93+
}
94+
95+
public void registerPacket (SimpleNetworkWrapper network) {
7896
features.forEach(feature -> feature.registerPacket(network));
97+
features2.forEach(feature -> feature.registerPacket(network));
7998
}
8099
}

0 commit comments

Comments
 (0)