Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
481 changed files with 53410 additions and 51723 deletions

View File

@@ -31,7 +31,7 @@ import org.junit.rules.ExternalResource;
public class DeobTestProperties extends ExternalResource
{
private String rsClient;
private int rsVersion;
private double rsVersion;
private String vanillaClient;
@Override
@@ -42,7 +42,7 @@ public class DeobTestProperties extends ExternalResource
properties.load(resourceAsStream);
rsClient = (String) properties.get("rs.client");
rsVersion = Integer.parseInt((String) properties.get("rs.version"));
rsVersion = Double.parseDouble((String) properties.get("rs.version"));
vanillaClient = (String) properties.get("vanilla.client");
}
@@ -51,7 +51,7 @@ public class DeobTestProperties extends ExternalResource
return rsClient;
}
public int getRsVersion()
public double getRsVersion()
{
return rsVersion;
}

View File

@@ -40,7 +40,7 @@ public class ClientVersionTest
public void test() throws IOException
{
ClientVersion ver = new ClientVersion(new File(properties.getVanillaClient()));
Assert.assertEquals(properties.getRsVersion(), ver.getVersion());
Assert.assertEquals((int) Math.floor(properties.getRsVersion()), ver.getVersion());
}
}