Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/me/ryanhamshire/TekkitCustomizer/MaterialInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
public class MaterialInfo
{
int typeID;
byte data;
int data;
boolean allDataValues;
String description;
String reason;

public MaterialInfo(int typeID, byte data, String description, String reason)
public MaterialInfo(int typeID, int data, String description, String reason)
{
this.typeID = typeID;
this.data = data;
Expand All @@ -45,7 +45,7 @@ public MaterialInfo(int typeID, String description, String reason)
this.reason = reason;
}

private MaterialInfo(int typeID, byte data, boolean allDataValues, String description, String reason)
private MaterialInfo(int typeID, int data, boolean allDataValues, String description, String reason)
{
this.typeID = typeID;
this.data = data;
Expand Down Expand Up @@ -74,7 +74,7 @@ public static MaterialInfo fromString(String string)
{
int typeID = Integer.parseInt(parts[0]);

byte data;
int data;
boolean allDataValues;
if(parts[1].equals("*"))
{
Expand All @@ -84,7 +84,7 @@ public static MaterialInfo fromString(String string)
else
{
allDataValues = false;
data = Byte.parseByte(parts[1]);
data = Integer.parseInt(parts[1]);
}

return new MaterialInfo(typeID, data, allDataValues,
Expand Down