parent
7ae21d5d9f
commit
58f2284231
|
@ -40,7 +40,8 @@ public class LicenseWindow {
|
|||
createLicense("Args4j", "args4j.txt"),
|
||||
createLicense("Gson", "gson.txt"),
|
||||
createLicense("JNBT", "jnbt.txt"),
|
||||
createLicense("MiG Layout", "miglayout.txt"));
|
||||
createLicense("MiG Layout", "miglayout.txt"),
|
||||
createLicense("Modern UI Icons", "modernUIIcons.txt"));
|
||||
return result.toArray(new License[result.size()]);
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,9 @@ import amidst.logging.Log;
|
|||
@Immutable
|
||||
public enum RecognisedVersion {
|
||||
// @formatter:off
|
||||
UNKNOWN(null), // Make sure this is the first entry, so UNKNOWN.isAtLeast(...) returns always true, since an unknown version is most likely a new snapshot.
|
||||
v15w44b("qtoombkapb[Llq;mn[J[[Jmj"),
|
||||
V15w43c("qsoombkapb[Llq;mn[J[[Jmj"),
|
||||
V15w31c("oxnvlnjt[Llg;lz[J[[Jlv"),
|
||||
V1_8_8("orntlljs[Lle;lx[J[[Jlt"), // 1.8.4, 1.8.5, 1.8.6, 1.8.7, and 1.8.8 all have the same typeDump version ID. They are all security issue fixes.
|
||||
V1_8_3("osnulmjt[Llf;ly[J[[Jlu"), // 1.8.3 and 1.8.2 have the same typeDump version ID - probably because 1.8.2 -> 1.8.3 was a fix for a server-side bug (https://mojang.com/2015/02/minecraft-1-8-2-is-now-available/)
|
||||
|
@ -65,8 +67,7 @@ public enum RecognisedVersion {
|
|||
V1_9pre3("to"),
|
||||
V1_9pre2("sv"),
|
||||
V1_9pre1("sq"),
|
||||
Vbeta_1_8_1("[Bhwqpyrrviqswdbzdqurkhqrgviwbomnabjrxmafvoeacfer[J[Jaddmkbb"), // Had to rename from V1_8_1 - should it just be removed?
|
||||
UNKNOWN(null); // Make sure this is the last entry, so UNKNOWN.isAtLeast(...) returns always false.
|
||||
Vbeta_1_8_1("[Bhwqpyrrviqswdbzdqurkhqrgviwbomnabjrxmafvoeacfer[J[Jaddmkbb"); // Had to rename from V1_8_1 - should it just be removed?
|
||||
// @formatter:on
|
||||
|
||||
public static RecognisedVersion from(Field[] fields) {
|
||||
|
|
|
@ -13,7 +13,17 @@ public class TempleLocationChecker extends AllValidLocationChecker {
|
|||
private static List<Biome> getValidBiomesAtMiddleOfChunk(
|
||||
RecognisedVersion recognisedVersion) {
|
||||
// @formatter:off
|
||||
if (recognisedVersion.isAtLeast(RecognisedVersion.V1_4_2)) {
|
||||
if (recognisedVersion.isAtLeast(RecognisedVersion.V15w43c)) {
|
||||
return Arrays.asList(
|
||||
Biome.desert,
|
||||
Biome.desertHills,
|
||||
Biome.jungle,
|
||||
Biome.jungleHills,
|
||||
Biome.swampland,
|
||||
Biome.icePlains,
|
||||
Biome.coldTaiga
|
||||
);
|
||||
} else if (recognisedVersion.isAtLeast(RecognisedVersion.V1_4_2)) {
|
||||
return Arrays.asList(
|
||||
Biome.desert,
|
||||
Biome.desertHills,
|
||||
|
|
|
@ -21,7 +21,8 @@ public enum DefaultWorldIconTypes {
|
|||
VILLAGE("Village"),
|
||||
SPAWN("Default World Spawn"),
|
||||
WITCH("Witch Hut"),
|
||||
OCEAN_MONUMENT("Ocean Monument");
|
||||
OCEAN_MONUMENT("Ocean Monument"),
|
||||
IGLOO("Igloo");
|
||||
// @formatter:on
|
||||
|
||||
private final String name;
|
||||
|
|
|
@ -22,10 +22,12 @@ public class TempleWorldIconTypeProvider implements WorldIconTypeProvider {
|
|||
chunkY);
|
||||
if (biome == Biome.swampland) {
|
||||
return DefaultWorldIconTypes.WITCH;
|
||||
} else if (biome.getName().contains("Jungle")) {
|
||||
} else if (biome == Biome.jungle || biome == Biome.jungleHills) {
|
||||
return DefaultWorldIconTypes.JUNGLE;
|
||||
} else if (biome.getName().contains("Desert")) {
|
||||
} else if (biome == Biome.desert || biome == Biome.desertHills) {
|
||||
return DefaultWorldIconTypes.DESERT;
|
||||
} else if (biome == Biome.icePlains || biome == Biome.coldTaiga) {
|
||||
return DefaultWorldIconTypes.IGLOO;
|
||||
} else {
|
||||
Log.e("No known structure for this biome type: "
|
||||
+ biome.getName());
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
# License
|
||||
|
||||
Please carefully understand the license and download the latest icons at ModernUIIcons.com.
|
||||
|
||||
## Understand Your Rights
|
||||
No Attribution and No Derived Works
|
||||
http://creativecommons.org/licenses/by-nd/3.0/ *
|
||||
|
||||
- If your project is open source include this license file in the source.
|
||||
- Nothing is needed in the front facing project (UNLESS you
|
||||
are using any of the icons listed below in the attribution section).
|
||||
- Commercial use is not only allowed but encouraged. If it is an icon
|
||||
in the attribution list below, you still need to attribute those!
|
||||
- Do not distribute the entire package (I've allowed this dozens of
|
||||
times for open source projects, but email me first).
|
||||
|
||||
## Creator
|
||||
- Austin Andrews (@templarian)
|
||||
|
||||
## Contributor**
|
||||
- Jay Zawrotny (@JayZawrotny)
|
||||
- A Bunch
|
||||
- Oren Nachman
|
||||
- appbar.chevron.down
|
||||
- appbar.chevron.up
|
||||
- appbar.chevron.left
|
||||
- appbar.chevron.right
|
||||
|
||||
## Derived Works
|
||||
- Alex Peattie
|
||||
- Social: http://www.alexpeattie.com/projects/justvector_icons/
|
||||
|
||||
## Attribution***
|
||||
- Kris Vandermotten (@kvandermotten)
|
||||
- appbar.medical.pulse
|
||||
- Constantin Kichinsky (@kichinsky)
|
||||
- appbar.currency.rubles
|
||||
- appbar.currency.grivna
|
||||
- Massimo Savazzi (@msavazzi)
|
||||
- List of missing exported icons
|
||||
- Proletkult Graphik, from The Noun Project
|
||||
- appbar.draw.pen (inspired)
|
||||
- Olivier Guin, from The Noun Project
|
||||
- appbar.draw.marker
|
||||
- Gibran Bisio, from The Noun Project
|
||||
- appbar.draw.bucket
|
||||
Andrew Forrester, from The Noun Project
|
||||
- appbar.fingerprint
|
||||
|
||||
* The license is for attribution, but this is not required.
|
||||
** Developers and designers that emailed Templarian the source .design icons to be added into the package. PNGs also accepted, but may take longer to be added.
|
||||
*** Icons I've copied so closely you want to attribute them and are also under the CC license.
|
||||
|
||||
Contact
|
||||
- http://templarian.com/
|
||||
- admin[@]templarian[.]com
|
||||
|
||||
* Does not apply to copyrighted logos
|
||||
- Skype
|
||||
- Facebook
|
||||
- Twitter
|
||||
- etc...
|
Binary file not shown.
After Width: | Height: | Size: 3.0 KiB |
Loading…
Reference in New Issue