2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 16:49:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Only Enable Custom Settings Tab If "-qol/-fixes" Arg Is Used (#575)

Browse Source
This commit is contained in:
Josh Shippam
2023-02-03 00:30:56 +00:00
committed by GitHub
parent 628d8b98da
commit c42dc29f73
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Client/src/main/java/ClientSettings.java
+2 -1
View File
@@ -7,7 +7,6 @@ import java.math.BigInteger;
*/ */
public class ClientSettings { public class ClientSettings {
public static String SNOW_MONTH = ".12"; public static String SNOW_MONTH = ".12";
/** /**
* The Servers Name * The Servers Name
@@ -43,6 +42,8 @@ public class ClientSettings {
public static final String NAV_MANUAL_LINK = SERVER_WEBSITE; public static final String NAV_MANUAL_LINK = SERVER_WEBSITE;
public static final String NAV_RULES_LINK = SERVER_WEBSITE + "kbase/rules.php"; public static final String NAV_RULES_LINK = SERVER_WEBSITE + "kbase/rules.php";
public static boolean CUSTOM_SETTINGS_TAB = false;
// smooths out lines and sprites on the minimap // smooths out lines and sprites on the minimap
public static boolean BILINEAR_MINIMAP_FILTERING = false; public static boolean BILINEAR_MINIMAP_FILTERING = false;
2006Scape Client/src/main/java/Game.java
+20 -9
View File
@@ -1808,7 +1808,7 @@ public class Game extends RSApplet {
invBack.method361(0, 0); invBack.method361(0, 0);
if (invOverlayInterfaceID == -1) { if (invOverlayInterfaceID == -1) {
if (tabInterfaceIDs[tabID] != -1) { if (tabInterfaceIDs[tabID] != -1) {
if (tabID == 7) { if (tabID == 7 && ClientSettings.CUSTOM_SETTINGS_TAB) {
try { try {
int centerX = 95; int centerX = 95;
int currentY = 10; int currentY = 10;
@@ -1830,10 +1830,13 @@ public class Game extends RSApplet {
aTextDrawingArea_1271.textCenterShadow(Color.WHITE.hashCode(), centerX, WorldController.drawDistance + " tiles", currentY + textBottom, true); aTextDrawingArea_1271.textCenterShadow(Color.WHITE.hashCode(), centerX, WorldController.drawDistance + " tiles", currentY + textBottom, true);
drawButton(customSettingShowExperiencePerHour, centerX - 73, currentY += 40, 146); drawButton(customSettingShowExperiencePerHour, centerX - 73, currentY += 40, 146);
aTextDrawingArea_1271.textCenterShadow(customSettingShowExperiencePerHour ? Color.YELLOW.hashCode() : Color.YELLOW.hashCode(), centerX, "show exp info", currentY + textMiddle, true); aTextDrawingArea_1271.textCenterShadow(Color.YELLOW.hashCode(), centerX, "show exp info", currentY + textMiddle, true);
drawButton(showInfo, centerX - 73, currentY += 40, 146); drawButton(showInfo, centerX - 73, currentY += 40, 146);
aTextDrawingArea_1271.textCenterShadow(showInfo ? Color.YELLOW.hashCode() : Color.YELLOW.hashCode(), centerX, "show debug info", currentY + textMiddle, true); aTextDrawingArea_1271.textCenterShadow(Color.YELLOW.hashCode(), centerX, "show debug info", currentY + textMiddle, true);
drawButton(customSettingVisualFixes, centerX - 73, currentY += 40, 146);
aTextDrawingArea_1271.textCenterShadow(Color.YELLOW.hashCode(), centerX, "visual fixes", currentY + textMiddle, true);
} catch (Exception e) { } } catch (Exception e) { }
} }
} }
@@ -5607,12 +5610,13 @@ public class Game extends RSApplet {
} }
int customTabAction = 0; int customTabAction = 0;
boolean customSettingVisiblePlayerNames = true; static boolean customSettingVisiblePlayerNames = false;
int customSettingMinItemValue = 1000; int customSettingMinItemValue = 1;
boolean customSettingShowExperiencePerHour = false; boolean customSettingShowExperiencePerHour = false;
long customSettingShowExperiencePerHourStartExp = 0; long customSettingShowExperiencePerHourStartExp = 0;
long customSettingShowExperiencePerHourStart = System.currentTimeMillis(); long customSettingShowExperiencePerHourStart = System.currentTimeMillis();
int customSettingShowExperiencePerHourStartLevels = 0; int customSettingShowExperiencePerHourStartLevels = 0;
boolean customSettingVisualFixes = true;
public void processTabClick() { public void processTabClick() {
if (super.clickMode3 == 1) { if (super.clickMode3 == 1) {
@@ -5651,7 +5655,7 @@ public class Game extends RSApplet {
tabID = 6; tabID = 6;
tabAreaAltered = true; tabAreaAltered = true;
} }
if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) { if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1 && ClientSettings.CUSTOM_SETTINGS_TAB) {
/* Unused tab bottom left */ /* Unused tab bottom left */
needDrawTabArea = true; needDrawTabArea = true;
tabID = 7; tabID = 7;
@@ -5690,7 +5694,7 @@ public class Game extends RSApplet {
if (invOverlayInterfaceID == -1) { if (invOverlayInterfaceID == -1) {
if (tabInterfaceIDs[tabID] != -1) { if (tabInterfaceIDs[tabID] != -1) {
// Handle our custom tab // Handle our custom tab
if (tabID == 7 && super.saveClickX >= 575 && super.saveClickX <= 720 && super.saveClickY >= 210 && super.saveClickY <= 465) { if (tabID == 7 && ClientSettings.CUSTOM_SETTINGS_TAB && super.saveClickX >= 575 && super.saveClickX <= 720 && super.saveClickY >= 210 && super.saveClickY <= 465) {
int startY = 217 + 3; int startY = 217 + 3;
if (super.saveClickY >= startY && super.saveClickY <= (startY + 30)) { if (super.saveClickY >= startY && super.saveClickY <= (startY + 30)) {
customSettingVisiblePlayerNames = !customSettingVisiblePlayerNames; customSettingVisiblePlayerNames = !customSettingVisiblePlayerNames;
@@ -5724,6 +5728,13 @@ public class Game extends RSApplet {
if (super.saveClickY >= startY && super.saveClickY <= (startY + 30)) { if (super.saveClickY >= startY && super.saveClickY <= (startY + 30)) {
showInfo= !showInfo; showInfo= !showInfo;
} }
startY += 40;
if (super.saveClickY >= startY && super.saveClickY <= (startY + 30)) {
customSettingVisualFixes = !customSettingVisualFixes;
ClientSettings.BILINEAR_MINIMAP_FILTERING = !ClientSettings.BILINEAR_MINIMAP_FILTERING;
ClientSettings.FIX_TRANSPARENCY_OVERFLOW = !ClientSettings.FIX_TRANSPARENCY_OVERFLOW;
ClientSettings.FULL_512PX_VIEWPORT = !ClientSettings.FULL_512PX_VIEWPORT;
}
} }
} }
} }
@@ -7971,7 +7982,7 @@ public class Game extends RSApplet {
backBase2.method361(0, 0); backBase2.method361(0, 0);
if (invOverlayInterfaceID == -1) { if (invOverlayInterfaceID == -1) {
if (tabInterfaceIDs[tabID] != -1) { if (tabInterfaceIDs[tabID] != -1) {
if (tabID == 7) { if (tabID == 7 && ClientSettings.CUSTOM_SETTINGS_TAB) {
redStone1_3.method361(42, 0); redStone1_3.method361(42, 0);
} }
if (tabID == 8) { if (tabID == 8) {
@@ -7993,7 +8004,7 @@ public class Game extends RSApplet {
redStone1_4.method361(229, 0); redStone1_4.method361(229, 0);
} }
} }
if (tabInterfaceIDs[7] != -1 && (anInt1054 != 7 || loopCycle % 20 < 10)) { if (tabInterfaceIDs[7] != -1 && (anInt1054 != 7 || loopCycle % 20 < 10) && ClientSettings.CUSTOM_SETTINGS_TAB) {
sideIcons[10].method361(47, 2); sideIcons[10].method361(47, 2);
} }
if (tabInterfaceIDs[8] != -1 && (anInt1054 != 8 || loopCycle % 20 < 10)) { if (tabInterfaceIDs[8] != -1 && (anInt1054 != 8 || loopCycle % 20 < 10)) {
2006Scape Client/src/main/java/Main.java
+2
View File
@@ -28,9 +28,11 @@ public final class Main {
break; break;
case "-qol": case "-qol":
case "-fixes": case "-fixes":
ClientSettings.CUSTOM_SETTINGS_TAB = true;
ClientSettings.BILINEAR_MINIMAP_FILTERING = true; ClientSettings.BILINEAR_MINIMAP_FILTERING = true;
ClientSettings.FIX_TRANSPARENCY_OVERFLOW = true; ClientSettings.FIX_TRANSPARENCY_OVERFLOW = true;
ClientSettings.FULL_512PX_VIEWPORT = true; ClientSettings.FULL_512PX_VIEWPORT = true;
Game.customSettingVisiblePlayerNames = true;
break; break;
case "-no-nav": case "-no-nav":
case"-disable-nav": case"-disable-nav":