Skip to content

Commit b716bdd

Browse files
DaMatrixDaMatrix
committed
update TerraConstants.VERSION based on mcmod.info
1 parent 93c5d89 commit b716bdd

14 files changed

+58
-71
lines changed

‎src/main/java/net/buildtheearth/terraplusplus/TerraConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import net.minecraftforge.fml.common.Mod;
1010
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1111

12-
@Mod.EventBusSubscriber(modid = TerraMod.MODID)
13-
@Config(modid = TerraMod.MODID)
12+
@Mod.EventBusSubscriber(modid = TerraConstants.MODID)
13+
@Config(modid = TerraConstants.MODID)
1414
public class TerraConfig {
1515
@Name("reduced_console_messages")
1616
@Comment({ "Removes all of TerraPlusPlus' messages which contain various links in the server console",
@@ -36,8 +36,8 @@ public class TerraConfig {
3636

3737
@SubscribeEvent
3838
public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
39-
if (TerraMod.MODID.equals(event.getModID())) {
40-
ConfigManager.sync(TerraMod.MODID, Config.Type.INSTANCE);
39+
if (TerraConstants.MODID.equals(event.getModID())) {
40+
ConfigManager.sync(TerraConstants.MODID, Config.Type.INSTANCE);
4141
Http.configChanged();
4242
}
4343
}

‎src/main/java/net/buildtheearth/terraplusplus/TerraConstants.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import net.minecraft.block.state.IBlockState;
1010

1111
public class TerraConstants {
12-
public static final String CHAT_PREFIX = "&2&lT++ &8&l> ";
13-
public static final String MOD_ID = "terraplusplus";
14-
public static final String VERSION = "1.0";
12+
public static final String MODID = "terraplusplus";
13+
public static String VERSION = "(development snapshot)";
1514

16-
public static final String defaultCommandNode = MOD_ID + ".command.";
17-
public static final String controlCommandNode = MOD_ID + ".commands.";
15+
public static final String CHAT_PREFIX = "&2&lT++ &8&l> ";
16+
public static final String defaultCommandNode = MODID + ".command.";
17+
public static final String controlCommandNode = MODID + ".commands.";
1818
public static final String othersCommandNode = controlCommandNode + "others";
1919

2020
public static final Gson GSON = new GsonBuilder()

‎src/main/java/net/buildtheearth/terraplusplus/TerraMod.java

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import net.buildtheearth.terraplusplus.control.TerraCommand;
44
import net.buildtheearth.terraplusplus.control.TerraTeleport;
5-
import net.buildtheearth.terraplusplus.provider.EarthWorldProvider;
65
import net.buildtheearth.terraplusplus.provider.GenerationEventDenier;
76
import net.buildtheearth.terraplusplus.provider.WaterDenier;
8-
import net.minecraft.world.DimensionType;
9-
import net.minecraftforge.common.DimensionManager;
107
import net.minecraftforge.common.MinecraftForge;
8+
import net.minecraftforge.fml.common.Loader;
119
import net.minecraftforge.fml.common.Mod;
1210
import net.minecraftforge.fml.common.Mod.EventHandler;
11+
import net.minecraftforge.fml.common.ModContainer;
12+
import net.minecraftforge.fml.common.event.FMLConstructionEvent;
1313
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
1414
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
1515
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -22,24 +22,19 @@
2222
import org.apache.logging.log4j.simple.SimpleLogger;
2323
import org.apache.logging.log4j.util.PropertiesUtil;
2424

25-
@Mod(modid = TerraMod.MODID,
25+
@Mod(modid = TerraConstants.MODID,
2626
dependencies = "required-after:cubicchunks; required-after:cubicgen",
2727
acceptableRemoteVersions = "*",
2828
useMetadata = true)
2929
public class TerraMod {
30-
public static final String MODID = TerraConstants.MOD_ID;
31-
public static final String VERSION = "0.1";
32-
public static final String USERAGENT = TerraMod.MODID + '/' + TerraMod.VERSION;
33-
public static final boolean CUSTOM_PROVIDER = false; //could potentially interfere with other mods and is relatively untested, leaving off for now
34-
3530
public static Logger LOGGER = new SimpleLogger("[terra++ bootstrap]", Level.INFO, true, false, true, false, "[yyyy/MM/dd HH:mm:ss:SSS]", null, new PropertiesUtil("log4j2.simplelog.properties"), System.out);
3631

37-
//set custom provider
38-
private static void setupProvider() {
39-
DimensionType type = DimensionType.register("earth", "_earth", 0, EarthWorldProvider.class, true);
40-
DimensionManager.init();
41-
DimensionManager.unregisterDimension(0);
42-
DimensionManager.registerDimension(0, type);
32+
@EventHandler
33+
public void construction(FMLConstructionEvent event) {
34+
ModContainer terra = Loader.instance().getIndexedModList().get(TerraConstants.MODID);
35+
if (!"${version}".equals(terra.getVersion())) {
36+
TerraConstants.VERSION = terra.getVersion();
37+
}
4338
}
4439

4540
@EventHandler
@@ -52,10 +47,6 @@ public void preInit(FMLPreInitializationEvent event) {
5247
if (Side.CLIENT == event.getSide()) {
5348
BTEWorldType.create();
5449
}
55-
56-
if (CUSTOM_PROVIDER) {
57-
setupProvider();
58-
}
5950
}
6051

6152
@EventHandler

‎src/main/java/net/buildtheearth/terraplusplus/control/EarthGui.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.buildtheearth.terraplusplus.control;
22

33
import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.CustomCubicWorldType;
4-
import net.buildtheearth.terraplusplus.TerraMod;
4+
import net.buildtheearth.terraplusplus.TerraConstants;
55
import net.buildtheearth.terraplusplus.config.GlobalParseRegistries;
66
import net.buildtheearth.terraplusplus.generator.EarthGeneratorSettings;
77
import net.buildtheearth.terraplusplus.projection.GeographicProjection;
@@ -202,7 +202,7 @@ protected GuiTextField addTextField(int x, int y, int width, int height) {
202202
@Override
203203
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
204204
this.drawDefaultBackground();
205-
this.drawCenteredString(this.fontRenderer, I18n.format(TerraMod.MODID + ".gui.header"), this.width >> 1, VERTICAL_PADDING >> 1, 0xFFFFFFFF);
205+
this.drawCenteredString(this.fontRenderer, I18n.format(TerraConstants.MODID + ".gui.header"), this.width >> 1, VERTICAL_PADDING >> 1, 0xFFFFFFFF);
206206

207207
//render map texture
208208
GlStateManager.bindTexture(this.texture.getGlTextureId());
@@ -285,7 +285,7 @@ protected static class ProjectionEntry implements Entry {
285285
protected int height = 30;
286286

287287
public ProjectionEntry(EarthGeneratorSettings settings, EarthGui gui, int x, int y, int width) {
288-
gui.addButton(new GuiButton(0, x + (width >> 1), y, width >> 1, 20, I18n.format(TerraMod.MODID + ".gui.transformation.add")) {
288+
gui.addButton(new GuiButton(0, x + (width >> 1), y, width >> 1, 20, I18n.format(TerraConstants.MODID + ".gui.transformation.add")) {
289289
@Override
290290
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
291291
if (super.mousePressed(mc, mouseX, mouseY)) {
@@ -315,7 +315,7 @@ public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
315315

316316
@Override
317317
public void render(EarthGui gui, int x, int y, int width) {
318-
gui.fontRenderer.drawString(I18n.format(TerraMod.MODID + ".gui.projection"), x, y + (20 - 8) / 2, 0xFFFFFFFF, true);
318+
gui.fontRenderer.drawString(I18n.format(TerraConstants.MODID + ".gui.projection"), x, y + (20 - 8) / 2, 0xFFFFFFFF, true);
319319

320320
y += 30;
321321

@@ -341,7 +341,7 @@ protected enum Transformation {
341341
offset {
342342
@Override
343343
protected TransformEntry newSubEntry(ProjectionEntry entry, EarthGui gui, int x, int y, int width) {
344-
return new ParameterizedTransformEntry(this, entry, gui, x, y, width, TerraMod.MODID + ".gui.transformation.offset", "dx", "dy") {
344+
return new ParameterizedTransformEntry(this, entry, gui, x, y, width, TerraConstants.MODID + ".gui.transformation.offset", "dx", "dy") {
345345
@Override
346346
public void initFrom(ProjectionTransform in) {
347347
if (in instanceof OffsetProjectionTransform) {
@@ -364,7 +364,7 @@ protected void appendValue(StringBuilder out, int i) {
364364
scale {
365365
@Override
366366
protected TransformEntry newSubEntry(ProjectionEntry entry, EarthGui gui, int x, int y, int width) {
367-
return new ParameterizedTransformEntry(this, entry, gui, x, y, width, TerraMod.MODID + ".gui.transformation.scale", "x", "y") {
367+
return new ParameterizedTransformEntry(this, entry, gui, x, y, width, TerraConstants.MODID + ".gui.transformation.scale", "x", "y") {
368368
@Override
369369
public void initFrom(ProjectionTransform in) {
370370
if (in instanceof ScaleProjectionTransform) {
@@ -447,7 +447,7 @@ public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
447447
}
448448
});
449449

450-
gui.addButton(new GuiButton(0, x + 60, y, width - 60, 20, I18n.format(TerraMod.MODID + ".gui.transformation." + transformation.name())) {
450+
gui.addButton(new GuiButton(0, x + 60, y, width - 60, 20, I18n.format(TerraConstants.MODID + ".gui.transformation." + transformation.name())) {
451451
@Override
452452
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
453453
if (super.mousePressed(mc, mouseX, mouseY)) {
@@ -545,7 +545,7 @@ public RootEntry(GeographicProjection projection, EarthGui gui, int x, int y, in
545545
String projectionName = GlobalParseRegistries.PROJECTIONS.inverse().get(projection.getClass());
546546
this.initialIndex = this.index = PArrays.indexOf(PROJECTION_NAMES, projectionName);
547547

548-
gui.addButton(new GuiButton(0, x, y, width, 20, I18n.format(this.fieldName = TerraMod.MODID + ".gui.projection." + projectionName)) {
548+
gui.addButton(new GuiButton(0, x, y, width, 20, I18n.format(this.fieldName = TerraConstants.MODID + ".gui.projection." + projectionName)) {
549549
@Override
550550
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
551551
if (super.mousePressed(mc, mouseX, mouseY)) {
@@ -622,7 +622,7 @@ public ToggleEntry(EarthGui gui, int x, int y, int width, boolean value, String
622622
this.touch = touch;
623623
this.value = value;
624624

625-
gui.addButton(new GuiButton(0, x, y, width, 20, I18n.format(TerraMod.MODID + ".gui." + name) + ": " + I18n.format("options." + (value ? "on" : "off"))) {
625+
gui.addButton(new GuiButton(0, x, y, width, 20, I18n.format(TerraConstants.MODID + ".gui." + name) + ": " + I18n.format("options." + (value ? "on" : "off"))) {
626626
@Override
627627
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
628628
if (super.mousePressed(mc, mouseX, mouseY)) {
@@ -655,7 +655,7 @@ protected static class CWGEntry implements Entry {
655655
protected String text;
656656

657657
public CWGEntry(EarthGeneratorSettings settings, EarthGui gui, int x, int y, int width) {
658-
int text = gui.fontRenderer.getStringWidth(I18n.format(TerraMod.MODID + ".gui.cwg")) + 5;
658+
int text = gui.fontRenderer.getStringWidth(I18n.format(TerraConstants.MODID + ".gui.cwg")) + 5;
659659
x += text;
660660
width -= text;
661661

@@ -698,7 +698,7 @@ public int height() {
698698

699699
@Override
700700
public void render(EarthGui gui, int x, int y, int width) {
701-
gui.fontRenderer.drawString(I18n.format(TerraMod.MODID + ".gui.cwg"), x, y + (20 - 8) / 2, 0xFFFFFFFF, true);
701+
gui.fontRenderer.drawString(I18n.format(TerraConstants.MODID + ".gui.cwg"), x, y + (20 - 8) / 2, 0xFFFFFFFF, true);
702702
}
703703

704704
@Override

‎src/main/java/net/buildtheearth/terraplusplus/control/TerraTeleport.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import java.text.DecimalFormat;
44
import java.util.ArrayList;
55
import java.util.Collections;
6-
import java.util.ConcurrentModificationException;
76
import java.util.List;
8-
import java.util.Locale;
97
import java.util.concurrent.CompletableFuture;
108

119
import javax.annotation.Nullable;
@@ -23,15 +21,13 @@
2321
import net.buildtheearth.terraplusplus.util.geo.LatLng;
2422
import net.minecraft.command.CommandException;
2523
import net.minecraft.command.ICommandSender;
26-
import net.minecraft.entity.player.EntityPlayer;
2724
import net.minecraft.entity.player.EntityPlayerMP;
2825
import net.minecraft.server.MinecraftServer;
2926
import net.minecraft.util.math.BlockPos;
3027
import net.minecraft.util.text.TextFormatting;
3128
import net.minecraft.world.World;
3229
import net.minecraft.world.chunk.IChunkProvider;
3330
import net.minecraftforge.fml.common.FMLCommonHandler;
34-
import net.minecraftforge.server.permission.PermissionAPI;
3531

3632
public class TerraTeleport extends Command {
3733

@@ -66,13 +62,13 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
6662
IChunkProvider cp = world.getChunkProvider();
6763

6864
if (!(cp instanceof CubeProviderServer)) {
69-
throw new CommandException(TerraConstants.MOD_ID + ".error.notcc");
65+
throw new CommandException(TerraConstants.MODID + ".error.notcc");
7066
}
7167

7268
ICubeGenerator gen = ((CubeProviderServer) cp).getCubeGenerator();
7369

7470
if (!(gen instanceof EarthGenerator)) {
75-
throw new CommandException(TerraConstants.MOD_ID + ".error.notterra");
71+
throw new CommandException(TerraConstants.MODID + ".error.notterra");
7672
}
7773

7874
EarthGenerator terrain = (EarthGenerator) gen;
@@ -135,7 +131,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
135131
try {
136132
proj = terrain.projection.fromGeo(defaultCoords.getLng(), defaultCoords.getLat());
137133
} catch (Exception e) {
138-
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".error.numbers")));
134+
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".error.numbers")));
139135
return;
140136
}
141137

@@ -147,7 +143,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
147143
.getAsync(defaultCoords.getLng(), defaultCoords.getLat())
148144
.thenApply(a -> a + 1.0d);
149145
} catch (OutOfProjectionBoundsException e) { //out of bounds, notify user
150-
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".error.numbers")));
146+
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".error.numbers")));
151147
return;
152148
}
153149
} else {

‎src/main/java/net/buildtheearth/terraplusplus/control/fragments/terra/TerraConvertFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
4747
x = Double.parseDouble(args[0]);
4848
y = Double.parseDouble(args[1]);
4949
} catch (Exception e) {
50-
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".error.numbers")));
50+
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".error.numbers")));
5151
return;
5252
}
5353

@@ -80,7 +80,7 @@ public String[] getName() {
8080

8181
@Override
8282
public String getPurpose() {
83-
return TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.convert.purpose").getUnformattedComponentText();
83+
return TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.convert.purpose").getUnformattedComponentText();
8484
}
8585

8686
@Override

‎src/main/java/net/buildtheearth/terraplusplus/control/fragments/terra/TerraDistortionFragment.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
4545
}
4646

4747
if(c == null || Double.isNaN(c[0])) {
48-
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.where.notproj")));
48+
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.where.notproj")));
4949
return;
5050
}
5151
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.GRAY, "Distortion:"));
52-
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.format(TerraConstants.MOD_ID + ".commands.terra.tissot", Math.sqrt(Math.abs(c[0])), c[1] * 180.0 / Math.PI)));
52+
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.format(TerraConstants.MODID + ".commands.terra.tissot", Math.sqrt(Math.abs(c[0])), c[1] * 180.0 / Math.PI)));
5353
}
5454

5555
@Override
@@ -59,7 +59,7 @@ public String[] getName() {
5959

6060
@Override
6161
public String getPurpose() {
62-
return TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.distortion.purpose").getUnformattedComponentText();
62+
return TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.distortion.purpose").getUnformattedComponentText();
6363
}
6464

6565
@Override
@@ -69,6 +69,6 @@ public String[] getArguments() {
6969

7070
@Override
7171
public String getPermission() {
72-
return TerraConstants.MOD_ID + ".commands.terra";
72+
return TerraConstants.MODID + ".commands.terra";
7373
}
7474
}

‎src/main/java/net/buildtheearth/terraplusplus/control/fragments/terra/TerraInfoFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public String[] getName() {
2424

2525
@Override
2626
public String getPurpose() {
27-
return TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.info.purpose").getUnformattedComponentText();
27+
return TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.info.purpose").getUnformattedComponentText();
2828
}
2929

3030
@Override
@@ -34,6 +34,6 @@ public String[] getArguments() {
3434

3535
@Override
3636
public String getPermission() {
37-
return TerraConstants.MOD_ID + ".commands.terra";
37+
return TerraConstants.MODID + ".commands.terra";
3838
}
3939
}

‎src/main/java/net/buildtheearth/terraplusplus/control/fragments/terra/TerraWhereFragment.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
5353
if (args.length > 0) {
5454
if(hasPermission(sender, TerraConstants.othersCommandNode)) e = sender.getEntityWorld().getPlayerEntityByName(args[0]);
5555
if (e == null) {
56-
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".error.unknownplayer")));
56+
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".error.unknownplayer")));
5757
return;
5858
}
5959

@@ -77,11 +77,11 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
7777
}
7878
sender.sendMessage(ChatUtil.titleAndCombine(TextFormatting.GRAY, "Location of ", TextFormatting.BLUE, senderName));
7979
if (result == null || Double.isNaN(result[0])) {
80-
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.where.notproj")));
80+
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.where.notproj")));
8181
return;
8282
}
8383
if (!Float.isFinite(azimuth)) {
84-
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.where.notproj")));
84+
sender.sendMessage(ChatUtil.combine(TextFormatting.RED, TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.where.notproj")));
8585
return;
8686

8787
}
@@ -103,7 +103,7 @@ public String[] getName() {
103103

104104
@Override
105105
public String getPurpose() {
106-
return TranslateUtil.translate(TerraConstants.MOD_ID + ".fragment.terra.where.purpose").getUnformattedComponentText();
106+
return TranslateUtil.translate(TerraConstants.MODID + ".fragment.terra.where.purpose").getUnformattedComponentText();
107107
}
108108

109109
@Override
@@ -113,6 +113,6 @@ public String[] getArguments() {
113113

114114
@Override
115115
public String getPermission() {
116-
return TerraConstants.MOD_ID + ".commands.terra";
116+
return TerraConstants.MODID + ".commands.terra";
117117
}
118118
}

0 commit comments

Comments
 (0)