Skip to content
This repository has been archived by the owner on Nov 7, 2022. It is now read-only.

Commit

Permalink
Cleanup old code #4
Browse files Browse the repository at this point in the history
  • Loading branch information
@boomboompower
boomboompower committed Mar 6, 2020
1 parent 861c85b commit e2afdd7
Show file tree
Hide file tree
Showing 16 changed files with 152 additions and 1,473 deletions.
34 changes: 17 additions & 17 deletions gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[[ -n "$JAVA_HOME" ]] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
while [[ -h "$PRG" ]] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
Expand All @@ -65,17 +65,17 @@ cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH=${APP_HOME}/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
if [[ -n "$JAVA_HOME" ]] ; then
if [[ -x "$JAVA_HOME/jre/sh/java" ]] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
if [[ ! -x "$JAVACMD" ]] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
Expand All @@ -90,14 +90,14 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [[ "$cygwin" = "false" && "$darwin" = "false" ]] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
if [[ $? -eq 0 ]] ; then
if [[ "$MAX_FD" = "maximum" || "$MAX_FD" = "max" ]] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
if [[ $? -ne 0 ]] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
Expand All @@ -106,7 +106,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
if ${darwin}; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

Expand All @@ -118,13 +118,13 @@ if $cygwin ; then
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
for dir in ${ROOTDIRSRAW} ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
if [[ "$GRADLE_CYGPATTERN" != "" ]] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
Expand All @@ -133,10 +133,10 @@ if $cygwin ; then
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
if [[ ${CHECK} -ne 0 ]] && [[ ${CHECK2} -eq 0 ]] ; then ### Added a condition
eval `echo args${i}` = `cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
eval `echo args${i}` = "\"$arg\""
fi
i=$((i+1))
done
Expand All @@ -158,7 +158,7 @@ fi
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
eval splitJvmOpts ${DEFAULT_JVM_OPTS} ${JAVA_OPTS} ${GRADLE_OPTS}
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
5 changes: 3 additions & 2 deletions src/main/java/me/boomboompower/skinchanger/SkinChangerModOld.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package me.boomboompower.skinchanger;

import java.util.Random;
import me.boomboompower.skinchanger.utils.models.capes.CapeManager;
import me.boomboompower.skinchanger.config.ConfigLoader;
import me.boomboompower.skinchanger.utils.models.skins.SkinManager;
Expand Down Expand Up @@ -79,13 +80,13 @@ public ConfigLoader getLoader() {
}

public static SkinChangerModOld getInstance() {
return null;
return new SkinChangerModOld();
}

public void setRenderingEnabled(boolean toggledIn) {
}

public boolean isRenderingEnabled() {
return false;
return new Random().nextBoolean();
}
}
29 changes: 19 additions & 10 deletions src/main/java/me/boomboompower/skinchanger/gui/ExperimentalGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,26 @@
import me.boomboompower.skinchanger.SkinChangerModOld;
import me.boomboompower.skinchanger.gui.experimental.GuiExperimentalAllPlayers;
import me.boomboompower.skinchanger.gui.experimental.GuiExperimentalOptifine;
import me.boomboompower.skinchanger.gui.utils.ModernButton;
import me.boomboompower.skinchanger.gui.utils.ModernGui;
import me.boomboompower.skinchanger.utils.ChatColor;

import me.do_you_like.mods.skinchanger.utils.game.ChatColor;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernButton;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernGui;
import org.apache.commons.io.FileUtils;

import java.awt.*;
import java.io.File;
import java.util.Arrays;

public class ExperimentalGui extends ModernGui {










private final SkinChangerModOld mod;

Expand All @@ -39,32 +48,32 @@ public class ExperimentalGui extends ModernGui {
public ExperimentalGui(SkinChangerModOld mod) {
this.mod = mod;
}

@Override
public void initGui() {
public void onGuiOpen() {
this.buttonList.add(new ModernButton(0, this.width / 2 - 75, this.height / 2 - 22, 150, 20,
"Rending: " + (SkinChangerModOld.getInstance().isRenderingEnabled() ? ChatColor.GREEN + "On" : ChatColor.GRAY + "Off")));
"Rending: " + (SkinChangerModOld.getInstance().isRenderingEnabled() ? ChatColor.GREEN + "On" : ChatColor.GRAY + "Off")));
this.buttonList.add(new ModernButton(1, this.width / 2 - 75, this.height / 2 + 2, 150, 20, "All player utils"));
this.buttonList.add(new ModernButton(2, this.width / 2 - 75, this.height / 2 + 26, 150, 20, "Optifine utils"));
this.buttonList.add(this.skinCache = new ModernButton(3, this.width / 2 - 75, this.height / 2 + 50, 150, 20, "Delete skin cache"));

this.skinCache.setBackEnabled(new Color(255, 0, 0, 75));
this.skinCache.setEnabledColor(new Color(255, 0, 0, 75));
}

@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
public void onRender(int mouseX, int mouseY, float partialTicks) {
drawDefaultBackground();

super.drawScreen(mouseX, mouseY, partialTicks);

if (this.skinCache.isMouseOver()) {
if (this.skinCache.isHovered()) {
drawHoveringText(Arrays.asList("This button is dangerous and", ChatColor.DARK_RED.toString() + ChatColor.BOLD + "may" + ChatColor.RESET + " be bad for your game"), mouseX, mouseY);
}
}

@Override
public void buttonPressed(ModernButton button) {
switch (button.id) {
switch (button.getId()) {
case 0:
SkinChangerModOld
.getInstance().setRenderingEnabled(!SkinChangerModOld.getInstance().isRenderingEnabled());
Expand Down
55 changes: 19 additions & 36 deletions src/main/java/me/boomboompower/skinchanger/gui/SettingsGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

import me.boomboompower.skinchanger.SkinChangerModOld;
import me.boomboompower.skinchanger.utils.fake.FakePlayer;
import me.boomboompower.skinchanger.gui.utils.ModernButton;
import me.boomboompower.skinchanger.gui.utils.ModernGui;
import me.boomboompower.skinchanger.gui.utils.ModernTextBox;
import me.boomboompower.skinchanger.utils.ChatColor;
import me.boomboompower.skinchanger.utils.models.skins.PlayerSkinType;

import me.do_you_like.mods.skinchanger.utils.game.ChatColor;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernButton;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernGui;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernTextBox;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Keyboard;
Expand Down Expand Up @@ -59,7 +59,7 @@ public SettingsGui(SkinChangerModOld modIn, String message) {
}

@Override
public void initGui() {
public void onGuiOpen() {
Keyboard.enableRepeatEvents(true);

this.textList.add(textField = new ModernTextBox(0, this.width / 2 - 150, this.height / 2 - 22, 300, 20));
Expand All @@ -80,7 +80,7 @@ public void initGui() {
}

@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
public void onRender(int mouseX, int mouseY, float partialTicks) {
drawDefaultBackground();

this.fontRendererObj.drawString("Skin Settings", this.width / 2 - 118, this.height / 2 + 8, Color.WHITE.getRGB(), false);
Expand All @@ -95,42 +95,15 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
}

if (this.previewCape) {
drawCenteredString(this.mc.fontRendererObj,ChatColor.WHITE + "Hold Left-Alt to flip the cape!", this.width / 2, this.height / 2 + 100, Color.WHITE.getRGB());
drawCenteredString(this.mc.fontRendererObj, ChatColor.WHITE + "Hold Left-Alt to flip the cape!", this.width / 2, this.height / 2 + 100, Color.WHITE.getRGB());
}

super.drawScreen(mouseX, mouseY, partialTicks);
}

@Override
public void buttonPressed(ModernButton button) {
if (button.id == 8) {
System.out.println(String.format("Current index: %s / %s", this.mod.getSkinManager().getSkinType().ordinal(), PlayerSkinType.values().length));

this.mod.getSkinManager().setSkinType(this.mod.getSkinManager().getSkinType().getNextSkin());

PlayerSkinType type = this.mod.getSkinManager().getSkinType();
button.setText("Skin Type: " + type.getDisplayName());

return;
}

// if (!textField.getText().isEmpty()) {
// this.mod.getWebsiteUtils().runAsync(() -> {
// if (button.id == 1) {
// String id = this.mod.getMojangHooker().getIdFromUsername(textField.getText());
//
// textField.setText(this.mod.getMojangHooker().hasSlimSkin(id) + "");
// } else if (button.id == 2) {
// String id = this.mod.getMojangHooker().getIdFromUsername(textField.getText());
//
// textField.setText(this.mod.getMojangHooker().getIdFromUsername(id));
// } else if (button.id == 3) {
// fakePlayer.getPlayerInfo().setLocationCape(this.mod.getMojangHooker().getSkinFromId(this.mod.getMojangHooker().getIdFromUsername("boomboompower")));
// }
// });
// }

switch (button.id) {
switch (button.getId()) {
case 1:
this.previewCape = false;
fakePlayer.getPlayerInfo().setLocationCape(null);
Expand Down Expand Up @@ -177,13 +150,23 @@ public void buttonPressed(ModernButton button) {
break;
case 7:
this.mc.displayGuiScreen(new ExperimentalGui(this.mod));
break;
case 8:
System.out.println(String.format("Current index: %s / %s", this.mod.getSkinManager().getSkinType().ordinal(), PlayerSkinType.values().length));

this.mod.getSkinManager().setSkinType(this.mod.getSkinManager().getSkinType().getNextSkin());

PlayerSkinType type = this.mod.getSkinManager().getSkinType();
button.setText("Skin Type: " + type.getDisplayName());

break;
}
}

@Override
public void onGuiClosed() {
public void onGuiClose() {
Keyboard.enableRepeatEvents(false);

this.mod.getLoader().save();
}
}
22 changes: 11 additions & 11 deletions src/main/java/me/boomboompower/skinchanger/gui/experimental/GuiExperimentalAllPlayers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
package me.boomboompower.skinchanger.gui.experimental;

import me.boomboompower.skinchanger.SkinChangerModOld;
import me.boomboompower.skinchanger.gui.utils.ModernButton;
import me.boomboompower.skinchanger.gui.utils.ModernGui;
import me.boomboompower.skinchanger.gui.utils.ModernTextBox;
import me.boomboompower.skinchanger.utils.ChatColor;

import me.do_you_like.mods.skinchanger.methods.impl.mixins.SkinChangerTweaker;

import me.do_you_like.mods.skinchanger.utils.game.ChatColor;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernButton;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernGui;
import me.do_you_like.mods.skinchanger.utils.gui.impl.ModernTextBox;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityOtherPlayerMP;
import net.minecraft.entity.Entity;
Expand All @@ -50,33 +50,33 @@ public class GuiExperimentalAllPlayers extends ModernGui {
public GuiExperimentalAllPlayers(SkinChangerModOld theMod) {
this.mod = theMod;
}

@Override
public void initGui() {
public void onGuiOpen() {
Keyboard.enableRepeatEvents(true);

this.textList.add(this.textField = new ModernTextBox(0, this.width / 2 - 150, this.height / 2 - 22, 300, 20));

this.buttonList.add(new ModernButton(0, this.width / 2 - 75, this.height / 2 + 26, 150, 20, "Give skin to everyone"));
this.buttonList.add(this.resetButton = new ModernButton(2, this.width / 2 - 75, this.height / 2 + 74, 150, 20, "Reset all skins"));

this.resetButton.setBackEnabled(new Color(255, 0, 0, 75));
this.resetButton.setEnabledColor(new Color(255, 0, 0, 75));
}

@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
public void onRender(int mouseX, int mouseY, float partialTicks) {
drawDefaultBackground();

super.drawScreen(mouseX, mouseY, partialTicks);

if (this.resetButton.isMouseOver()) {
if (this.resetButton.isHovered()) {
drawHoveringText(Arrays.asList("This button is dangerous and", ChatColor.DARK_RED.toString() + ChatColor.BOLD + "may" + ChatColor.RESET + " be bad for your game"), mouseX, mouseY);
}
}

@Override
public void buttonPressed(ModernButton button) {
switch (button.id) {
switch (button.getId()) {
case 0:
if (SkinChangerTweaker.MIXINS_ENABLED) {
forcedAllSkins = this.mod.getSkinManager().getSkin(this.textField.getText());
Expand Down Expand Up @@ -108,7 +108,7 @@ public void buttonPressed(ModernButton button) {
}

@Override
public void onGuiClosed() {
public void onGuiClose() {
Keyboard.enableRepeatEvents(false);
SkinChangerModOld.getInstance().getLoader().save();
}
Expand Down
Loading

0 comments on commit e2afdd7

Please sign in to comment.