Skip to content

Commit

Permalink
Add more things (and ability to import from world creation screen)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Boxadactle
Boxadactle committed Aug 29, 2023
1 parent 5620db0 commit 4fd6b66
Show file tree
Hide file tree
Showing 9 changed files with 158 additions and 69 deletions.
27 changes: 27 additions & 0 deletions common/src/main/java/dev/boxadactle/mcshare/MCShare.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

import dev.boxadactle.boxlib.util.ClientUtils;
import dev.boxadactle.boxlib.util.ModLogger;
import dev.boxadactle.boxlib.util.function.EmptyMethod;
import dev.boxadactle.mcshare.gui.importing.WorldImportScreen;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.tabs.GridLayoutTab;
import net.minecraft.client.gui.components.tabs.Tab;
import net.minecraft.client.gui.layouts.GridLayout;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;

import java.nio.file.Path;

Expand All @@ -27,4 +35,23 @@ public static void init() {
public static Path getWorldFolder() {
return Path.of(ClientUtils.getClient().gameDirectory.getAbsolutePath(), "saves");
}

public static class ImportTab extends GridLayoutTab {

Screen parent;

public ImportTab(Screen parent) {
super(Component.translatable("screen.mcshare.importworld"));

this.parent = parent;

GridLayout.RowHelper gridlayout$rowhelper = this.layout.rowSpacing(8).createRowHelper(1);

gridlayout$rowhelper.addChild(Button.builder(Component.translatable("button.mcshare.import"), this::openImportScreen).width(210).build());
}

private void openImportScreen(Button b) {
ClientUtils.setScreen(new WorldImportScreen(parent));
}
}
}
52 changes: 24 additions & 28 deletions common/src/main/java/dev/boxadactle/mcshare/gui/exporting/ExportingScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public class ExportingScreen extends Screen {

Screen parent;

boolean isFinished = false;
boolean isError = false;
boolean isFinished;
boolean isError;
String error;

Button finish;
Expand All @@ -33,27 +33,6 @@ protected ExportingScreen(Screen parent, LevelStorageSource.LevelStorageAccess a
path = filePath;
}

@Override
protected void init() {
int number = BConfigHelper.buttonWidth(BConfigHelper.ButtonType.SMALL);
finish = addRenderableWidget(Button.builder(GuiUtils.DONE, b -> onClose())
.bounds(width / 2 - number - 1, height / 2 + 40, number, 20)
.build()
);

openFile = addRenderableWidget(Button.builder(Component.translatable("button.mcshare.open"), this::openFile)
.bounds(width / 2 + 1, height / 2 + 40, number, 20)
.build()
);
}

@Override
public void tick() {
finish.visible = isFinished;
openFile.visible = isFinished;
openFile.active = !isError;
}

@Override
public void render(GuiGraphics guiGraphics, int i, int j, float f) {
renderBackground(guiGraphics);
Expand All @@ -71,18 +50,35 @@ private void openFile(Button b) {
Util.getPlatform().openFile(path.getParent().toFile());
}

public void setFinished(boolean finished) {
isFinished = finished;
public void setFinished() {
isFinished = true;

activateButtons(true);
}

public void setErrored(boolean errored, String error) {
isError = errored;
public void setErrored(String error) {
isError = true;
this.error = error;

activateButtons(false);
}

private void activateButtons(boolean bl) {
int number = BConfigHelper.buttonWidth(BConfigHelper.ButtonType.SMALL);
addRenderableWidget(Button.builder(GuiUtils.DONE, b -> onClose())
.bounds(width / 2 - number - 1, height / 2 + 40, number, 20)
.build()
);

addRenderableWidget(Button.builder(Component.translatable("button.mcshare.open"), this::openFile)
.bounds(width / 2 + 1, height / 2 + 40, number, 20)
.build()
).active = bl;
}

@Override
public boolean shouldCloseOnEsc() {
return isFinished;
return isFinished || isError;
}

@Override
Expand Down
68 changes: 36 additions & 32 deletions common/src/main/java/dev/boxadactle/mcshare/gui/importing/ImportingScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
import dev.boxadactle.boxlib.config.gui.BConfigHelper;
import dev.boxadactle.boxlib.util.GuiUtils;
import dev.boxadactle.mcshare.MCShare;
import dev.boxadactle.mcshare.mixin.ParentAccessor;
import dev.boxadactle.mcshare.mixin.CreateWorldParentAccessor;
import dev.boxadactle.mcshare.mixin.SelectWorldParentAccessor;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
import net.minecraft.network.chat.Component;

Expand All @@ -20,9 +23,6 @@ public class ImportingScreen extends Screen {

String error;

Button finish;
Button playWorld;

String worldName;

protected ImportingScreen(Screen parent, String name) {
Expand All @@ -32,28 +32,6 @@ protected ImportingScreen(Screen parent, String name) {
worldName = name;
}

@Override
protected void init() {
int number = BConfigHelper.buttonWidth(BConfigHelper.ButtonType.SMALL);

finish = addRenderableWidget(Button.builder(GuiUtils.DONE, b -> onClose())
.bounds(width / 2 - number - 1, height - 40, number, 20)
.build()
);

playWorld = addRenderableWidget(Button.builder(Component.translatable("button.mcshare.play"), this::playWorld)
.bounds(width / 2 + 1, height - 40, number, 20)
.build()
);
}

@Override
public void tick() {
finish.visible = isFinished;
playWorld.visible = isFinished;
playWorld.active = !isError;
}

@Override
public void render(GuiGraphics guiGraphics, int i, int j, float f) {
renderBackground(guiGraphics);
Expand All @@ -73,23 +51,49 @@ private void playWorld(Button button) {
this.minecraft.createWorldOpenFlows().loadLevel(this, worldName.replace(MCShare.WORLD_EXTENSION, ""));
}

public void setFinished(boolean finished) {
isFinished = finished;
public void setFinished() {
isFinished = true;

activateButtons(true);
}

public void setErrored(boolean error, String errorMessage) {
isError = error;
public void setErrored(String errorMessage) {
isError = true;
this.error = errorMessage;

activateButtons(false);
}

private void activateButtons(boolean bl) {
int number = BConfigHelper.buttonWidth(BConfigHelper.ButtonType.SMALL);

addRenderableWidget(Button.builder(GuiUtils.DONE, b -> onClose())
.bounds(width / 2 - number - 1, height - 40, number, 20)
.build()
);

addRenderableWidget(Button.builder(Component.translatable("button.mcshare.play"), this::playWorld)
.bounds(width / 2 + 1, height - 40, number, 20)
.build()
).active = bl;
}

@Override
public boolean shouldCloseOnEsc() {
return isFinished;
return isFinished || isError;
}

@Override
public void onClose() {
minecraft.setScreen(new SelectWorldScreen(((ParentAccessor)parent).getParent()));
if (parent instanceof SelectWorldScreen) {
minecraft.setScreen(new SelectWorldScreen(((SelectWorldParentAccessor) parent).getParent()));
} else if (parent instanceof CreateWorldScreen) {
minecraft.setScreen(new SelectWorldScreen(((CreateWorldParentAccessor) parent).getParent()));
}
else {
MCShare.LOGGER.error("Parent was not an instance of {} or {}", SelectWorldScreen.class, CreateWorldScreen.class);
minecraft.setScreen(new TitleScreen());
}
}

}
14 changes: 14 additions & 0 deletions common/src/main/java/dev/boxadactle/mcshare/mixin/CreateWorldParentAccessor.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package dev.boxadactle.mcshare.mixin;

import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(CreateWorldScreen.class)
public interface CreateWorldParentAccessor {

@Accessor("lastScreen")
Screen getParent();

}
37 changes: 37 additions & 0 deletions common/src/main/java/dev/boxadactle/mcshare/mixin/CreateWorldScreenMixin.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package dev.boxadactle.mcshare.mixin;

import dev.boxadactle.mcshare.MCShare;
import net.minecraft.client.gui.components.tabs.Tab;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;

import java.util.Arrays;

@Mixin(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen.class)
public abstract class CreateWorldScreenMixin extends Screen {

protected CreateWorldScreenMixin(Component component) {
super(component);
}

// some IDEs will show this return value as an error
@ModifyArg(
method = "init",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/components/tabs/TabNavigationBar$Builder;addTabs([Lnet/minecraft/client/gui/components/tabs/Tab;)Lnet/minecraft/client/gui/components/tabs/TabNavigationBar$Builder;",
ordinal = 0
)
)
private Tab[] addImportTab(Tab[] args) {
Tab[] cloned = Arrays.copyOf(args, args.length + 1);

cloned[cloned.length - 1] = new MCShare.ImportTab(this);

return cloned;
}

}
2 changes: 1 addition & 1 deletion ...adactle/mcshare/mixin/ParentAccessor.java → ...hare/mixin/SelectWorldParentAccessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(SelectWorldScreen.class)
public interface ParentAccessor {
public interface SelectWorldParentAccessor {

@Accessor("lastScreen")
Screen getParent();
Expand Down
15 changes: 11 additions & 4 deletions common/src/main/java/dev/boxadactle/mcshare/util/WorldExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,19 @@ public static void startExport(ExportOptions options) {
zipFile.addFolder(options.worldPath.toFile(), parameters);

MCShare.LOGGER.info("Finished!");
options.screen.setFinished(true);
options.screen.setFinished();
} catch (Exception e) {
MCShare.LOGGER.error("Error occurred when exporting!");
MCShare.LOGGER.printStackTrace(e);
if (e.getMessage().toLowerCase().contains("locked a portion of the file")) {
MCShare.LOGGER.warn("File has been locked, either you are on windows or this is a bug!");
options.screen.setFinished();
}

options.screen.setErrored(true, e.getMessage());
else {
MCShare.LOGGER.error("Error occurred when exporting!");
MCShare.LOGGER.printStackTrace(e);

options.screen.setErrored(e.getMessage());
}
}
}

Expand Down
8 changes: 5 additions & 3 deletions common/src/main/java/dev/boxadactle/mcshare/util/WorldImporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ public static void startImport(ImportOptions options) {

file.extractAll(p.toString());

options.screen.setFinished(true);
options.screen.setFinished();

MCShare.LOGGER.info("Finished!");
} catch (Exception e) {
MCShare.LOGGER.error("An error occured!");
MCShare.LOGGER.error("An error occured while importing!");
MCShare.LOGGER.printStackTrace(e);

options.screen.setErrored(true, e.getMessage());
options.screen.setErrored(e.getMessage());
}
}

Expand Down
4 changes: 3 additions & 1 deletion common/src/main/resources/mcshare-common.mixins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
"package": "dev.boxadactle.mcshare.mixin",
"compatibilityLevel": "JAVA_17",
"client": [
"CreateWorldParentAccessor",
"CreateWorldScreenMixin",
"EditWorldScreenMixin",
"ParentAccessor",
"SelectWorldParentAccessor",
"SelectWorldScreenMixin"
],
"injectors": {
Expand Down

0 comments on commit 4fd6b66

Please sign in to comment.