Stable Beta 0.8.5.9

Author: wanomaniac

README.md

@@ -1,7 +1,10 @@
-# Server Mod Menu
+# Server Mod Menu - 0.8.5.9
 ### A direct fork of [ModMenu](https://github.com/TerraformersMC/ModMenu) made for downloading and getting details of server mods
 ![An image](https://cdn.modrinth.com/data/mdAdBC85/images/bab950bf491ccdb79a2b7b5001cf3ebc86f847cb.png)
 
+## Do you need to update?
+I recommand you download this update just because of the added measures to downloads that fail. 
+
 ## Running and using this mod
 It's pretty easy, download the mod's jar file and run minecraft.
 No extra nonsense or dependencies to install just like the original modmenu mod.
@@ -17,11 +20,9 @@ Since this mod needs to see the mods, i created a secondary server side mod name
 You can download the appropriate version of [SCMC](https://github.com/SkellyBuilds/scmc) for your server, make sure to read the documentation so that you don't make your members download unnecessary server side mods that aren't flagged as server side only.
 
 ## ChangeLog
-* Fixed the calculations for Showing [Number] servers
-* Added different (buggy) colors for optional & required mods for the mod list.
-* Optional mods are an thing now (As of SCMC version 0.9.2.7) and they are now natively supported to servermodmenu
-* Bug fixes
-* ***Added SRV support! Learn more [here](https://github.com/SkellyBuilds/scmc/wiki/Getting-started-using-SCMC#how-do-i-use-different-ports-properly)***
+You wouldn't be seeing much BIG changelogs other than bug fixes and added adjustments as the first release itself had everything 
+* Adding measures to prevent downloading or setting the wrong variables when a download fails
+* A bit of GUI fixes.
 
 ## Stuff that hasn't been worked on
 * **Translations - Switching the language that isn't EN_US will pretty make the mod chaotic. I will plan on making a crowdin as well but for now. Sorry :(**

gradle.properties

@@ -8,7 +8,7 @@ yarn_mappings=1.20.1+build.2
 loader_version=0.16.0
 fabric_version=0.92.2+1.20.1
 quilt_loader_version=0.17.7
-mod_version=0.8.3.9
+mod_version=0.8.5.9
 # Project Metadata
 project_name=Server Mod Menu
 project_url=https://modrinth.com/mod/servermodmenu

src/main/java/com/skellybuilds/servermodmenu/gui/ModsScreen.java

@@ -90,8 +90,6 @@ public class ModsScreen extends Screen {
 	private ServerList serverList;
 	public AtomicInteger amountofvmods = new AtomicInteger();
 
-
-
 	public ModsScreen(Screen previousScreen) {
 		super(Text.translatable("servermodmenu.title"));
 		this.previousScreen = previousScreen;
@@ -123,8 +121,19 @@ private boolean NThreadsFinished(){
 	}
 
 	public void switchToConfirm(){
-		MinecraftClient.getInstance().setScreen(new ConfirmationScreen(this, this::resCB, this::backCB, Text.literal("Do you wish to close the game?")
-			.formatted(Formatting.ITALIC).formatted(Formatting.GREEN)));
+			this.client.execute(() -> {
+				 this.client.setScreen(new ConfirmationScreen(this, this::resCB, this::backCB, Text.literal("All of your mods have finished downloading! Do you wish to close the game?")
+					.formatted(Formatting.ITALIC).formatted(Formatting.GREEN)));
+			});
+
+	}
+
+	public void switchToConfirmCS(String CSText){
+		this.client.execute(() -> {
+			this.client.setScreen(new ConfirmationScreen(this, this::resCB, this::backCB, Text.literal(CSText)
+				.formatted(Formatting.ITALIC).formatted(Formatting.GREEN)));
+		});
+
 	}
 
 	@Override
@@ -165,8 +174,6 @@ public void calcServersSize(){
 	@Override
 	protected void init() {
 
-
-
 		serverList = new ServerList(client);
 		serverList.loadFile();
 
@@ -230,62 +237,90 @@ protected void init() {
 
 		// Downloads all from each server. Yep, may take time!
 		ButtonWidget downloadAllSButton = new TexturedButtonWidget(paneWidth / 2 + searchBoxWidth / 2 - 20 / 2 + 41, 22, 20, 20, 0, 0, 20, DOWNLOSD_BUTTON_LOCATION, 32, 64, button -> {
+
 			final SoundManager[] tempmgr = new SoundManager[1];
 			boolean change = false;
-
+button.active = false;
 Thread finalT = new Thread(() -> {
-	for (ModListEntry child : modList.children()) {
-
+	AtomicBoolean isERRORD = new AtomicBoolean(false);
+	AtomicBoolean isSUCONCE = new AtomicBoolean(false);
+	modList.children().forEach((child) -> {
 		if(child.isFirst){
 			EntryButton mButton = ModMenu.buttonEntries.get(child.serverName);
-			if(!change) {
+			mButton.active = false;
+		}
+	});
+
+	modList.children().forEach((child) -> {
+		if(child.isFirst) {
+			EntryButton mButton = ModMenu.buttonEntries.get(child.serverName);
+			if (!change) {
 				tempmgr[0] = mButton.SOUNDMANAGER;
 			}
-			Thread mWa = new Thread(() -> {
-				mButton.visible = false;
-				boolean e = child.downloadA(mButton);
-				while(true){
-					if(e){
-						break;
-					}
+			child.downloadA(mButton);
+			boolean isDT0 = false;
+			boolean isDTFW = false;
+			while (true) {
+				if(MainNetwork.isDthreadDone(child.serverName)){
+					isDT0 = true;
+				}
+				if(isDT0 && !isDTFW){
 					try {
-						Thread.sleep(750);
-					} catch (InterruptedException ex) {
-						LOGGER.error(ex.toString());
+						Thread.sleep(2950);
+					} catch (InterruptedException e) {
+						LOGGER.error("Interrupted: {}", e.toString());
+					}
+					if(MainNetwork.isDthreadDone(child.serverName)){
+						if(Objects.equals(MainNetwork.networkErrors.get(child.serverName), "ERR")){
+							button.active = true;
+							button.visible = true;
+							mButton.active = true;
+							mButton.visible = true;
+							tempmgr[0].play(PositionedSoundInstance.master(SoundEvents.ENTITY_VILLAGER_NO, 1.0F));
+							isERRORD.set(true);
+							break;
+						} else {
+							isDTFW = true;
+							isSUCONCE.set(true);
+						}
+					} else isDT0 = false;
+				} else {
+					if(!isDTFW) {
+						try {
+							Thread.sleep(750);
+						} catch (InterruptedException e) {
+							LOGGER.error("Interrupted: {}", e.toString());
+						}
+					} else {
+						break;
 					}
 				}
-			});
-			mWa.start();
-
-			while(true){
-				if(mWa.getState() != Thread.State.RUNNABLE){
-					break;
-				}
-				try {
-					Thread.sleep(850);
-				} catch (InterruptedException e) {
-					LOGGER.error(e.toString());
-				}
+			}
+			if(!isERRORD.get() && !isSUCONCE.get()) {
+				mButton.visible = false;
 			}
 		}
+	});
+
+	// if no errors & downloaded a server sucessfully
+	if(!isERRORD.get() && isSUCONCE.get()) {
+		tempmgr[0].play(PositionedSoundInstance.master(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0F));
+		button.visible = false;
+		switchToConfirm();
+	} // a server downlaoded successfully but another one failed!
+	else if(isERRORD.get() && isSUCONCE.get()) {
+		tempmgr[0].play(PositionedSoundInstance.master(SoundEvents.ENTITY_PLAYER_BIG_FALL, 1.0F));
+		//button.visible = false;
+		switchToConfirmCS("A server's mod successfully were downloaded but another one failed!!! Do you wish to close the game?");
+	} // All servers failed to download!!!
+	else if(isERRORD.get() && !isSUCONCE.get()){
+		tempmgr[0].play(PositionedSoundInstance.master(SoundEvents.ENTITY_PLAYER_DEATH, 1.0F));
 	}
 });
 
 finalT.start();
 
-while(true) {
-	if(finalT.getState() != Thread.State.RUNNABLE){
-		ModMenu.isAllDFB = true;
-		if(tempmgr[0] == null) break;
-		tempmgr[0].play(PositionedSoundInstance.master(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0F));
-		break;
-	}
-	try {
-		Thread.sleep(850);
-	} catch (InterruptedException e) {
-		LOGGER.error(e.toString());
-	}
-}
+
 
 		}){
 			@Override
@@ -351,21 +386,29 @@ public void renderButton(DrawContext DrawContext, int mouseX, int mouseY, float
 
 				orgw.start();
 
+				AtomicBoolean isNE = new AtomicBoolean(false);
+
 				Thread bla = new Thread(() -> {
 					while (true) {
 						if (orgw.getState() != Thread.State.RUNNABLE) {
-							ModMenu.idsDLD.add(selected.getSMod().id);
-							selected.smod.isDownloaded = true;
+							if(Objects.equals(MainNetwork.networkErrors.get(selected.serverName), "ERR")){
 							button.active = true;
-							if(!ModMenu.isAllDFB){
-								List<Boolean> isAllt = new ArrayList<>();
-								ModMenu.buttonEntries.forEach((name, mButton) -> {
-									if(!mButton.visible)
-										isAllt.add(true);
-								});
-
-								if(isAllt.size() == ModMenu.buttonEntries.size())
-									ModMenu.isAllDFB = true;
+							button.visible = true;
+								isNE.set(true);
+							} else {
+								ModMenu.idsDLD.add(selected.getSMod().id);
+								selected.smod.isDownloaded = true;
+								button.active = true;
+								if (!ModMenu.isAllDFB) {
+									List<Boolean> isAllt = new ArrayList<>();
+									ModMenu.buttonEntries.forEach((name, mButton) -> {
+										if (!mButton.visible)
+											isAllt.add(true);
+									});
+
+									if (isAllt.size() == ModMenu.buttonEntries.size())
+										ModMenu.isAllDFB = true;
+								}
 							}
 					break;
 						}
@@ -377,7 +420,7 @@ public void renderButton(DrawContext DrawContext, int mouseX, int mouseY, float
 
 				do {
 					if (bla.getState() != Thread.State.RUNNABLE) {
-						switchToConfirm();
+						if(!isNE.get()) switchToConfirm();
 						break;
 					}
 				} while (true);
@@ -424,6 +467,7 @@ public void render(DrawContext DrawContext, int mouseX, int mouseY, float delta)
 						}
 
 						visible = true;
+						active = true;
 
 						super.render(DrawContext, mouseX, mouseY, delta);
 						return;

src/main/java/com/skellybuilds/servermodmenu/gui/widget/ModListWidget.java

@@ -42,6 +42,8 @@ public class ModListWidget extends AlwaysSelectedEntryListWidget<ModListEntry> i
 	private boolean scrolling;
 	private final FabricIconHandler iconHandler = new FabricIconHandler();
 	private boolean isInit = false;
+	private double scrollAm;
+	private int origT;
 
 	public ModListWidget(MinecraftClient client, int width, int height, int y1, int y2, int entryHeight, String searchTerm, ModListWidget list, ModsScreen parent) {
 		super(client, width, height, y1, y2, entryHeight);
@@ -161,6 +163,10 @@ protected boolean removeEntry(ModListEntry entry) {
 		return super.removeEntry(entry);
 	}
 
+	protected void removeAllEntries(){
+		children().forEach(super::removeEntry);
+	}
+
 	@Override
 	protected ModListEntry remove(int index) {
 		if(getEntry(index).useSMOD()) addedMods.remove(getEntry(index).smod);
@@ -191,6 +197,8 @@ private void filter(String searchTerm, boolean refresh, boolean search) {
 		this.clearEntries();
 		SaddedMods.clear();
 		addedMods.clear();
+		this.removeAllEntries();
+
 		if (useSMod) {
 
 
@@ -224,15 +232,17 @@ private void filter(String searchTerm, boolean refresh, boolean search) {
 				AtomicBoolean isHidden = new AtomicBoolean(false);
 				boolean isF = true;
 				for (SMod mod : matched) {
-					if(isF){
+
+
+
 						ModMenuConfig.HIDDEN_SERVERS.getValue().forEach((name) -> {
 							if(Objects.equals(name, serverName)){
 								if(!ModMenuConfig.SHOWHIDDENSERVERS.getValue()){
 									isHidden.set(true);
 								}
 							}
 						});
-					}
+
 
 				if(matched.isEmpty()){
 					if(isHidden.get() && ModMenuConfig.SHOWHIDDENSERVERS.getValue() || !isHidden.get()) {
@@ -245,23 +255,38 @@ private void filter(String searchTerm, boolean refresh, boolean search) {
 
 					if(isHidden.get() && ModMenuConfig.SHOWHIDDENSERVERS.getValue() || !isHidden.get()) {
 						this.addEntry(new IndependentEntry(mod, this, serverName, isF, false, addMoreY.get()));
+
+					}
+
+					if(isHidden.get() && ModMenuConfig.SHOWHIDDENSERVERS.getValue() || !isHidden.get()){
+						isF = false;
 					}
-					isF = false;
 				}
 
 				addMoreY.set(true);
 
+
+
 				if(children().size() > 1) {
 					setSelected(getEntry(0));
 				} else {
 					setSelected(null);
 				}
 
-				if (getScrollAmount() > Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4))) {
-					setScrollAmount(Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4)));
-				}
+
 			});
 
+//			if(children().size() > 2){
+//				if(addMoreY.get()){
+//					int wa2 = children().stream().filter((ra) -> ra.isFirst).toList().size()-1;
+//
+//					this.top = this.top - 6 * wa2;
+//				}
+//			}
+
+			if (getScrollAmount() > Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4))) {
+				setScrollAmount(Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4)));
+			}
 			parent.calcServersSize();
 
 			isInit = true;
@@ -359,20 +384,19 @@ protected void renderList(DrawContext DrawContext, int mouseX, int mouseY, float
 		ModListEntry entry = this.getEntry(index);
 
 
-		int entryTop = entry.isFirst ? this.getRowTop(index) + 12 : this.getRowTop(index) + 15;
+		int entryTop = this.getRowTop(index) + 12;
 		//int entryBottom = entry.isFirst ? this.getRowTop(index) + this.itemHeight + 8 : this.getRowTop(index) + this.itemHeight ;
 
-		if(entry.moreY) entryTop = entryTop + 17;
+		//if(entry.moreY) entryTop = entryTop + 17;
 
 
 		int entryHeight = this.itemHeight - 4;
 
-//		if(entry.moreY){
-//			this.bottom = this.bottom + 7;
-//		}
-
 		int rowWidth = this.getRowWidth();
 		int entryLeft;
+		if(entry.moreY){
+		//	rowWidth = rowWidth + 8;
+		}
 		if (this.isSelectedEntry(index) && !entry.renderSvnNO) {
 
 			entryLeft = getRowLeft() - 2 + entry.getXOffset();