From 840acda91833516a76cbb12aeeb7caed5fc20c5a Mon Sep 17 00:00:00 2001 From: Krypt0n Date: Thu, 18 Jun 2020 15:43:47 +0200 Subject: [PATCH 1/3] adding support for importing *.dds files --- de.peeeq.wurstscript/.project | 23 +++++++++++++++++++ .../wurstscript/utils/AssetsGenerator.java | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 de.peeeq.wurstscript/.project diff --git a/de.peeeq.wurstscript/.project b/de.peeeq.wurstscript/.project new file mode 100644 index 000000000..1367780be --- /dev/null +++ b/de.peeeq.wurstscript/.project @@ -0,0 +1,23 @@ + + + wurstscript + Project de.peeeq.wurstscript created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java index 9e60de076..74f91315e 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java @@ -94,7 +94,7 @@ public int hashCode() { enum Type { MODEL((String s) -> s.endsWith(".mdx") | s.endsWith(".mdl")), ICON((String s) -> s.endsWith(".blp") && s.contains("BTN")), - TEXTURE((String s) -> s.endsWith(".blp")), + TEXTURE((String s) -> s.endsWith(".blp")) | s.endsWith(".dds")), SOUND((String s) -> s.endsWith(".mp3") | s.endsWith(".wav")); Checker checker; From 179f9a6bbb7565f5cafab7e5f19347c42285be7e Mon Sep 17 00:00:00 2001 From: Krypt0n Date: Thu, 18 Jun 2020 15:45:07 +0200 Subject: [PATCH 2/3] Delete .project removed unwanted file --- de.peeeq.wurstscript/.project | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 de.peeeq.wurstscript/.project diff --git a/de.peeeq.wurstscript/.project b/de.peeeq.wurstscript/.project deleted file mode 100644 index 1367780be..000000000 --- a/de.peeeq.wurstscript/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - wurstscript - Project de.peeeq.wurstscript created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - From aa61cfde2f1b85e74af62215e1e2c6221b27879f Mon Sep 17 00:00:00 2001 From: Krypt0n Date: Thu, 18 Jun 2020 18:12:15 +0200 Subject: [PATCH 3/3] fixed syntax error of last commit --- .../main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java index 74f91315e..a71a33dcb 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/AssetsGenerator.java @@ -94,7 +94,7 @@ public int hashCode() { enum Type { MODEL((String s) -> s.endsWith(".mdx") | s.endsWith(".mdl")), ICON((String s) -> s.endsWith(".blp") && s.contains("BTN")), - TEXTURE((String s) -> s.endsWith(".blp")) | s.endsWith(".dds")), + TEXTURE((String s) -> s.endsWith(".blp") | s.endsWith(".dds")), SOUND((String s) -> s.endsWith(".mp3") | s.endsWith(".wav")); Checker checker;