fixing actions and textures

Feuermagier · May 23, 2020 · bf4c716 · bf4c716
1 parent fca42c7
commit bf4c716
Show file tree

Hide file tree

Showing 37 changed files with 430 additions and 719 deletions.
diff --git a/src/basic/NameSupplier.java b/src/basic/NameSupplier.java
@@ -1,16 +1,13 @@
 package basic;
 
-import java.util.function.Supplier;
-
-public interface NameSupplier extends Supplier<String> {
+public interface NameSupplier {
 
 	public abstract String name();
 
-	@Override
-	default String get() {
+	default String getName() {
 		String name = this.name();
 		if (name.endsWith("$")) {
-			name.substring(0, name.length() - 1);
+			return name.substring(0, name.length() - 1);
 		}
 		return name;
 	}

diff --git a/src/converter/Converter.java b/src/converter/Converter.java
@@ -38,7 +38,7 @@ public Converter(ConvertTask converterData) {
 
 	public Converter open(File fileFolder, ConvertTask converterData) throws IOException {
 		Place place = converterData.getPlace();
-		SkinManager.init(converterData.getTexturePack(), converterData.getOption()
+		Skins.init(converterData.getTexturePack(), converterData.getOption()
 				.getScale());
 		Position start = place.getStart();
 		Position end = place.getEnd();
@@ -89,7 +89,7 @@ public void addMcaSection(Section section) {
 		Position target = toWrite.getSecond();
 		for (Position offset : toWrite.getFirst()) {
 			Position writePos = Position.add(target, offset);
-			this.blockContent.setMaterial(writePos, section.getBlock(offset));
+			this.blockContent.setBlock(writePos, section.getBlock(offset));
 			this.blockContent.setIsNextToAir(writePos, false);
 		}
 	}