Skip to content

Commit 3272f28

Browse files
author
Michael Hillcox
committed
Name change and version bump for release
1 parent 53fa378 commit 3272f28

9 files changed

Lines changed: 32 additions & 30 deletions

File tree

‎src/main/java/com/fgtxray/FgtXRay.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.fgtxray.config.DefaultConfig;
2626
import com.fgtxray.config.ConfigHandler;
2727

28-
@Mod(modid= Ref.MOD_ID, name="Fgt X-Ray", version="1.1.0.2")
28+
@Mod(modid= Ref.MOD_ID, name="XRay", version="1.2.0")
2929
public class FgtXRay
3030
{
3131
public static int localPlyX, localPlyY, localPlyZ, localPlyXPrev, localPlyZPrev; // For internal use in the ClientTick thread.
@@ -92,13 +92,13 @@ public void preInit(FMLPreInitializationEvent event)
9292

9393
if( config.getCategoryNames().isEmpty() )
9494
{
95-
System.out.println("[Fgt XRay] Config file not found. Creating now.");
95+
System.out.println("[XRay] Config file not found. Creating now.");
9696
DefaultConfig.create( config );
9797
config.save();
9898
}
9999

100100
ConfigHandler.setup( event ); // Read the config file and setup environment.
101-
System.out.println("[Fgt XRay] PreInit ");
101+
System.out.println("[XRay] PreInit ");
102102
}
103103

104104
@EventHandler

‎src/main/java/com/fgtxray/client/OresSearch.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void add( String oreIdent, String name, int[] color ) // Takes a s
4242
if( splitArray.length != 2 )
4343
{
4444
//System.out.println( String.format( "Can't add %s to searchList. Invalid format.", oreIdent ) );
45-
String notify = String.format( "[Fgt XRay] %s is not a valid identifier. Try id:meta (example 1:0 for stone) or oreName (example oreDiamond or mossyStone)", oreIdent );
45+
String notify = String.format( "[XRay] %s is not a valid identifier. Try id:meta (example 1:0 for stone) or oreName (example oreDiamond or mossyStone)", oreIdent );
4646
mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify));
4747
return;
4848
}
@@ -55,7 +55,7 @@ public static void add( String oreIdent, String name, int[] color ) // Takes a s
5555
catch( NumberFormatException e )
5656
{ // TODO: Some oredict ores are mod:block for some reason...
5757
//System.out.println( String.format( "%s is not a valid id:meta format.", oreIdent ) );
58-
String notify = String.format( "[Fgt XRay] %s contains data other than numbers and the colon. Failed to add.", oreIdent );
58+
String notify = String.format( "[XRay] %s contains data other than numbers and the colon. Failed to add.", oreIdent );
5959
mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify) );
6060
return;
6161
}
@@ -70,7 +70,7 @@ public static void add( String oreIdent, String name, int[] color ) // Takes a s
7070
}
7171
catch( NumberFormatException e )
7272
{
73-
mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString("[Fgt XRay] Doesn't support in-game additions to the ore dictionary yet.. Failed to add.") );
73+
mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString("[XRay] Doesn't support in-game additions to the ore dictionary yet.. Failed to add.") );
7474
return;
7575
}
7676

@@ -79,13 +79,13 @@ public static void add( String oreIdent, String name, int[] color ) // Takes a s
7979
//System.out.println( String.format( "Adding ore: %s", oreIdent ) );
8080
for( OreInfo info : OresSearch.searchList ) {
8181
if( info.getId() == id && info.getMeta() == meta ) {
82-
mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString("[Fgt XRay] This block has already been added to the block list"));
82+
mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString("[XRay] This block has already been added to the block list"));
8383
return;
8484
}
8585
}
8686

8787
OresSearch.searchList.add( new OreInfo( name, id, meta, color, true ) );
88-
String notify = String.format( "[Fgt XRay] successfully added %s.", oreIdent );
88+
String notify = String.format( "[XRay] successfully added %s.", oreIdent );
8989
mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(notify));
9090

9191
ConfigHandler.add(name, oreIdent, color);
@@ -95,7 +95,7 @@ public static List<OreInfo> get() // Return the searchList, create it if needed.
9595
{
9696
if( OresSearch.searchList.isEmpty() )
9797
{
98-
System.out.println( "[Fgt XRay] --- Populating the searchList with the ore dictionary --- ");
98+
System.out.println( "[XRay] --- Populating the searchList with the ore dictionary --- ");
9999
List<OreInfo> temp = new ArrayList<>(); // Temporary array of OreInfos to replace searchList
100100
Map<String, OreInfo> tempOredict = new HashMap<String, OreInfo>(); // Temporary oredict map to replace oredictOres
101101

@@ -115,7 +115,7 @@ public static List<OreInfo> get() // Return the searchList, create it if needed.
115115
String key = entry.getKey();
116116
if( !tempOredict.containsKey( key ) )
117117
{
118-
System.out.println( String.format( "[Fgt XRay] Ore %s doesn't exist in dictionary! Deleting.", key ) );
118+
System.out.println( String.format( "[XRay] Ore %s doesn't exist in dictionary! Deleting.", key ) );
119119
}
120120
}
121121
FgtXRay.oredictOres.clear();
@@ -131,27 +131,27 @@ public static List<OreInfo> get() // Return the searchList, create it if needed.
131131
List<ItemStack> oreDictOres = OreDictionary.getOres( key ); // Get an itemstack array of all the oredict ores for 'key'
132132
if( oreDictOres.size() < 1 )
133133
{
134-
System.out.println( String.format( "[Fgt XRay] Ore %s doesn't exist! Skipping. (We shouldn't have this issue here! Please tell me about this!)", key ) );
134+
System.out.println( String.format( "[XRay] Ore %s doesn't exist! Skipping. (We shouldn't have this issue here! Please tell me about this!)", key ) );
135135
continue;
136136
}
137137
for (ItemStack oreItem : oreDictOres) {
138138
if (checkList(temp, value, oreItem)) {
139-
System.out.println("[Fgt XRay] Duplicate ore found in Ore Dictionary!!! (" + key + ")");
139+
System.out.println("[XRay] Duplicate ore found in Ore Dictionary!!! (" + key + ")");
140140
continue;
141141
}
142142
temp.add(new OreInfo(value.oreName, Item.getIdFromItem(oreItem.getItem()), oreItem.getItemDamage(), value.color, value.draw));
143143
//System.out.println( String.format("[Fgt XRay] Adding OreInfo( %s, %d, %d, %s, %b ) ", value.oreName, Item.getIdFromItem( oreItem.getItem() ), oreItem.getItemDamage(), value.color[0], value.draw ) );
144144
}
145145
}
146-
System.out.println( "[Fgt XRay] --- Done populating searchList! --- ");
147-
System.out.println( "[Fgt XRay] --- Adding custom blocks --- ");
146+
System.out.println( "[XRay] --- Done populating searchList! --- ");
147+
System.out.println( "[XRay] --- Adding custom blocks --- ");
148148

149149
for( OreInfo ore : FgtXRay.customOres ) //TODO: Check if custom already exists
150150
{
151-
System.out.println( String.format( "[Fgt XRay] Adding OreInfo( %s, %d, %d, %b ) ", ore.oreName, ore.id, ore.meta, ore.draw ) );
151+
System.out.println( String.format( "[XRay] Adding OreInfo( %s, %d, %d, %b ) ", ore.oreName, ore.id, ore.meta, ore.draw ) );
152152
temp.add( ore );
153153
}
154-
System.out.println( "[Fgt XRay] --- Done adding custom blocks --- ");
154+
System.out.println( "[XRay] --- Done adding custom blocks --- ");
155155

156156
OresSearch.searchList.clear();
157157
OresSearch.searchList.addAll( temp );

‎src/main/java/com/fgtxray/client/gui/GuiSettings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void initGui()
3636
if( OresSearch.searchList.isEmpty() )
3737
{
3838
// This shouldnt happen. But return if it does.
39-
System.out.println( "[Fgt XRay] Error: searchList is empty inside initGui call!" );
39+
System.out.println( "[XRay] Error: searchList is empty inside initGui call!" );
4040
return;
4141
}
4242

@@ -149,7 +149,7 @@ public void actionPerformed( GuiButton button )
149149
{
150150
for (OreInfo ore : OresSearch.searchList)
151151
{
152-
System.out.println(String.format("[Fgt XRay] OreInfo( %s, %d, %d, 0x%x, %b )", ore.oreName, ore.id, ore.meta, ore.color[0], ore.draw));
152+
System.out.println(String.format("[XRay] OreInfo( %s, %d, %d, 0x%x, %b )", ore.oreName, ore.id, ore.meta, ore.color[0], ore.draw));
153153
}
154154
}
155155
break;

‎src/main/java/com/fgtxray/config/ConfigHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
public class ConfigHandler
1212
{
13-
public static Configuration config = null; // Save the config file handle for use later.
14-
public static Minecraft mc = Minecraft.getMinecraft();
13+
private static Configuration config = null; // Save the config file handle for use later.
14+
private static Minecraft mc = Minecraft.getMinecraft();
1515

1616
public static void setup(FMLPreInitializationEvent event )
1717
{
@@ -61,7 +61,7 @@ public static void add( String oreName, String ore, int[] color )
6161
{
6262
if( config.get("customores."+formattedname, "name", "").getString() == formattedname )
6363
{
64-
String notify = String.format( "[Fgt XRay] %s already exists. Please enter a different name. ", oreName );
64+
String notify = String.format( "[XRay] %s already exists. Please enter a different name. ", oreName );
6565
mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify));
6666
return;
6767
}

‎src/main/java/com/fgtxray/proxy/ClientProxy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void proxyInit()
1919
FgtXRay.keyBind_keys = new KeyBinding[ FgtXRay.keyBind_descriptions.length ];
2020
for( int i = 0; i < FgtXRay.keyBind_descriptions.length; ++i )
2121
{
22-
FgtXRay.keyBind_keys[i] = new KeyBinding( FgtXRay.keyBind_descriptions[i], FgtXRay.keyBind_keyValues[i], "Fgt X-Ray" );
22+
FgtXRay.keyBind_keys[i] = new KeyBinding( FgtXRay.keyBind_descriptions[i], FgtXRay.keyBind_keyValues[i], "X-Ray" );
2323
ClientRegistry.registerKeyBinding( FgtXRay.keyBind_keys[i] );
2424
}
2525

‎src/main/java/com/fgtxray/reference/Ref.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
public class Ref {
8-
public static final String MOD_ID = "fgtxray";
8+
public static final String MOD_ID = "xray";
99
public static final String PREFIX_MOD = MOD_ID+":";
1010
public static final String PREFIX_GUI = PREFIX_MOD+"textures/gui/";
1111
}

src/main/resources/assets/fgtxray/textures/gui/addorebg.png renamed to src/main/resources/assets/xray/textures/gui/addorebg.png

File renamed without changes.

src/main/resources/assets/fgtxray/textures/gui/bg.png renamed to src/main/resources/assets/xray/textures/gui/bg.png

File renamed without changes.

‎src/main/resources/mcmod.info‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
[
22
{
3-
"modid": "fgtxray",
4-
"name": "Fgt X-Ray",
3+
"modid": "xray",
4+
"name": "XRay",
55
"description": "An advanced XRay mod for Minecraft.",
6-
"version": "1.1.0",
7-
"mcversion": "1.11.2",
6+
"version": "1.2.0",
7+
"mcversion": "1.12",
88
"url": "https://github.com/michaelhillcox/XRay-Mod",
99
"updateJSON": "https://raw.githubusercontent.com/MichaelHillcox/XRay-Mod/master/versions.json",
10-
"authorList": ["mcd1992, AoKMiKeY"],
11-
"credits": "Contributors: AoKMiKeY, uaBArt",
10+
"authorList": ["mcd1992, MiKeY"],
11+
"credits": "Contributors: MiKeY, uaBArt",
1212
"logoFile": "",
13-
"screenshots": [],
13+
"screenshots": [
14+
"https://camo.githubusercontent.com/d87b036d1879d3ddca20b89836bec36a96981d61/687474703a2f2f692e696d6775722e636f6d2f4e334b4f4561452e706e67"
15+
],
1416
"dependencies": []
1517
}
1618
]

0 commit comments

Comments
 (0)