Skip to content

Commit 37f1355

Browse files
committed
finish migrating over Advanced-Rocketry#2284# Closes Advanced-Rocketry#2284
1 parent b5690b4 commit 37f1355

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,13 @@
140140
import java.util.Map.Entry;
141141

142142

143-
@Mod(modid="advancedrocketry", name="Advanced Rocketry", version="@MAJOR@.@MINOR@.@REVIS@.@BUILD@", dependencies="required-after:libvulpes@[%LIBVULPESVERSION%,)")
143+
@Mod(modid="advancedrocketry")
144144
public class AdvancedRocketry {
145145

146-
147146
@SidedProxy(clientSide="zmaster587.advancedRocketry.client.ClientProxy", serverSide="zmaster587.advancedRocketry.common.CommonProxy")
148147
public static CommonProxy proxy;
149148

150-
public final static String version = "@MAJOR@.@MINOR@.@REVIS@@BUILD@";
149+
public static String version;
151150

152151
@Instance(value = Constants.modId)
153152
public static AdvancedRocketry instance;
@@ -282,6 +281,8 @@ public void register(RegistryEvent.Register<Biome> evt)
282281
@EventHandler
283282
public void preInit(FMLPreInitializationEvent event)
284283
{
284+
version = event.getModMetadata().version;
285+
285286
//Init API
286287
DimensionManager.planetWorldProvider = WorldProviderPlanet.class;
287288
AdvancedRocketryAPI.atomsphereSealHandler = SealableBlockHandler.INSTANCE;

src/main/java/zmaster587/advancedRocketry/api/ARConfiguration.java

-7
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ else if(Asteroid.class.isAssignableFrom(type))
167167
out.writeFloat(asteroid.richnessVariability); //variability of richness
168168
out.writeFloat(asteroid.probability); //probability of the asteroid spawning
169169
out.writeFloat(asteroid.timeMultiplier);
170-
out.writeItemStack(asteroid.baseStack);
171170

172171
out.writeInt(asteroid.stackProbabilities.size());
173172
for(int i = 0; i < asteroid.stackProbabilities.size(); i++)
@@ -246,12 +245,6 @@ else if(Asteroid.class.isAssignableFrom(type))
246245
asteroid.richnessVariability = in.readFloat(); //variability of richness
247246
asteroid.probability = in.readFloat(); //probability of the asteroid spawning
248247
asteroid.timeMultiplier = in.readFloat();
249-
try {
250-
asteroid.baseStack = in.readItemStack();
251-
} catch (IOException e) {
252-
e.printStackTrace();
253-
}
254-
255248

256249
int size = in.readInt();
257250
for(int i = 0; i < size; i++)

src/main/java/zmaster587/advancedRocketry/backwardCompat/ModelFormatException.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
public class ModelFormatException extends Exception {
66

7-
public ModelFormatException(String string, IOException e) {
8-
// TODO Auto-generated constructor stub
7+
public ModelFormatException(String format, IOException e) {
8+
super(format, e);
99
}
1010

1111
public ModelFormatException(String format, NumberFormatException e) {
12-
// TODO Auto-generated constructor stub
12+
super(format, e);
1313
}
1414

15-
public ModelFormatException(String string) {
16-
// TODO Auto-generated constructor stub
15+
public ModelFormatException(String msg) {
16+
super(msg);
1717
}
1818

1919
}

src/main/resources/mcmod.info

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
[
22
{
3-
"modid": "advancedRocketry",
3+
"modid": "advancedrocketry",
44
"name": "Advanced Rocketry",
55
"description": "A space mod for minecraft, adds planets, rockets, and some machines",
6-
"version": "${version}",
7-
"mcversion": "${mcversion}",
6+
"version": "${advRocketryVersion}",
7+
"mcversion": "${mcVersion}",
88
"url": "http://minecraft.curseforge.com/projects/advanced-rocketry",
99
"updateUrl": "",
1010
"authorList": ["zmaster587"],
1111
"credits": "",
1212
"logoFile": "",
1313
"screenshots": [],
14-
"dependencies": []
14+
"useDependencyInformation": true,
15+
"requiredMods": ["libvulpes@${libVulpesVersion}"],
16+
"dependencies": ["libvulpes"]
1517
}
1618
]

0 commit comments

Comments
 (0)