Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit ad8b216

Browse files
committed
Update v1.3.3
- Made Client save options - Made Client save keybindings - Fixed off-center ModMenu - Fixed crosshair food bar color change - Added option to keybind none - Fixed font options area - Fixed Toggle Sprint & Sneak not disabling - Made ModMenu Keybinding adjustable - Made Freelook on 1.8.9 use injection instead of overwrites - Fixed compatibility issues with optifine due to overwrite - Updated License to LGPL
1 parent a9baee9 commit ad8b216

File tree

199 files changed

+1617
-1208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+1617
-1208
lines changed

1.7.10/buildscript/forge-1.7.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
apply plugin: 'forge'
44

5-
version = "1.3.2"
5+
version = "1.3.3"
66
group = "dev.cloudmc"
77
archivesBaseName = "cloudmc"
88

1.7.10/src/main/java/dev/cloudmc/Cloud.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2022 DupliCAT
3-
* GNU General Public License v3.0
3+
* GNU Lesser General Public License v3.0
44
*/
55

66
package dev.cloudmc;
@@ -35,7 +35,7 @@ public class Cloud {
3535

3636
public static final String modID = "cloudmc";
3737
public static final String modName = "Cloud";
38-
public static final String modVersion = "1.3.2 [1.7.10]";
38+
public static final String modVersion = "1.3.3 [1.7.10]";
3939

4040
public Minecraft mc = Minecraft.getMinecraft();
4141

@@ -67,9 +67,7 @@ public void init(FMLInitializationEvent event) throws IOException {
6767
try {
6868
ConfigLoader.loadConfig();
6969
}
70-
catch (Exception e) {
71-
ConfigSaver.saveConfig();
72-
}
70+
catch (Exception ignored) {}
7371

7472
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
7573
try {

1.7.10/src/main/java/dev/cloudmc/config/Config.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright (c) 2022 DupliCAT
3+
* GNU Lesser General Public License v3.0
4+
*/
5+
16
package dev.cloudmc.config;
27

38
import dev.cloudmc.feature.setting.Setting;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,47 @@
1+
/*
2+
* Copyright (c) 2022 DupliCAT
3+
* GNU Lesser General Public License v3.0
4+
*/
5+
16
package dev.cloudmc.config;
27

8+
import dev.cloudmc.feature.option.Option;
9+
310
import java.util.ArrayList;
411

512
public class ConfigArray {
613

714
private ArrayList<Config> configList;
15+
private ArrayList<Option> options;
16+
private boolean darkMode;
817

918
public ConfigArray() {
1019
configList = new ArrayList<>();
20+
options = new ArrayList<>();
21+
darkMode = false;
1122
}
1223

1324
public void addConfig(Config config) {
1425
configList.add(config);
1526
}
1627

28+
public void addConfigOption(Option option){
29+
options.add(option);
30+
}
31+
32+
public void setDarkMode(boolean toggled){
33+
darkMode = toggled;
34+
}
35+
36+
public boolean isDarkMode(){
37+
return darkMode;
38+
}
39+
1740
public ArrayList<Config> getConfig() {
1841
return configList;
1942
}
43+
44+
public ArrayList<Option> getOptions() {
45+
return options;
46+
}
2047
}

1.7.10/src/main/java/dev/cloudmc/config/ConfigLoader.java

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
/*
2+
* Copyright (c) 2022 DupliCAT
3+
* GNU Lesser General Public License v3.0
4+
*/
5+
16
package dev.cloudmc.config;
27

38
import com.google.gson.Gson;
49
import dev.cloudmc.Cloud;
510
import dev.cloudmc.feature.mod.Mod;
11+
import dev.cloudmc.gui.ClientStyle;
612
import dev.cloudmc.helpers.DirHelper;
713

814
import java.awt.*;
@@ -29,7 +35,7 @@ public static void loadConfig() throws FileNotFoundException {
2935
mod.setToggled(configArray.getConfig().get(i).isToggled());
3036
for (int j = 0; j < configArray.getConfig().get(i).getSettings().size(); j++) {
3137
switch (configArray.getConfig().get(i).getSettings().get(j).getMode()) {
32-
case "Checkbox":
38+
case "CheckBox":
3339
boolean toggled = configArray.getConfig().get(i).getSettings().get(j).isCheckToggled();
3440
Cloud.INSTANCE.settingManager.getSettingsByMod(mod).get(j).setCheckToggled(toggled);
3541
break;
@@ -49,6 +55,10 @@ public static void loadConfig() throws FileNotFoundException {
4955
boolean[] cells = configArray.getConfig().get(i).getSettings().get(j).getCells();
5056
Cloud.INSTANCE.settingManager.getSettingsByMod(mod).get(j).setCells(cells);
5157
break;
58+
case "Keybinding":
59+
int key = configArray.getConfig().get(i).getSettings().get(j).getKey();
60+
Cloud.INSTANCE.settingManager.getSettingsByMod(mod).get(j).setKey(key);
61+
break;
5262
}
5363
}
5464

@@ -57,5 +67,36 @@ public static void loadConfig() throws FileNotFoundException {
5767
Cloud.INSTANCE.hudEditor.getHudMod(mod.getName()).setY(configArray.getConfig().get(i).getPositions()[1]);
5868
}
5969
}
70+
71+
for(int i = 0; i < configArray.getOptions().size(); i++){
72+
switch (configArray.getOptions().get(i).getMode()) {
73+
case "CheckBox":
74+
boolean toggled = configArray.getOptions().get(i).isCheckToggled();
75+
Cloud.INSTANCE.optionManager.getOptions().get(i).setCheckToggled(toggled);
76+
break;
77+
case "Slider":
78+
float amount = configArray.getOptions().get(i).getCurrentNumber();
79+
Cloud.INSTANCE.optionManager.getOptions().get(i).setCurrentNumber(amount);
80+
break;
81+
case "ModePicker":
82+
String mode = configArray.getOptions().get(i).getCurrentMode();
83+
Cloud.INSTANCE.optionManager.getOptions().get(i).setCurrentMode(mode);
84+
break;
85+
case "ColorPicker":
86+
Color color = configArray.getOptions().get(i).getColor();
87+
Cloud.INSTANCE.optionManager.getOptions().get(i).setColor(color);
88+
break;
89+
case "CellGrid":
90+
boolean[] cells = configArray.getOptions().get(i).getCells();
91+
Cloud.INSTANCE.optionManager.getOptions().get(i).setCells(cells);
92+
break;
93+
case "Keybinding":
94+
int key = configArray.getOptions().get(i).getKey();
95+
Cloud.INSTANCE.optionManager.getOptions().get(i).setKey(key);
96+
break;
97+
}
98+
}
99+
100+
ClientStyle.setDarkMode(configArray.isDarkMode());
60101
}
61102
}

1.7.10/src/main/java/dev/cloudmc/config/ConfigSaver.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
/*
2+
* Copyright (c) 2022 DupliCAT
3+
* GNU Lesser General Public License v3.0
4+
*/
5+
16
package dev.cloudmc.config;
27

38
import com.google.gson.Gson;
49
import dev.cloudmc.Cloud;
510
import dev.cloudmc.feature.mod.Mod;
11+
import dev.cloudmc.feature.option.Option;
12+
import dev.cloudmc.gui.ClientStyle;
613
import dev.cloudmc.helpers.DirHelper;
714

815
import java.io.File;
@@ -39,6 +46,12 @@ public static void saveConfig() throws IOException {
3946
configArray.addConfig(config);
4047
}
4148

49+
for(Option option : Cloud.INSTANCE.optionManager.getOptions()){
50+
configArray.addConfigOption(option);
51+
}
52+
53+
configArray.setDarkMode(ClientStyle.isDarkMode());
54+
4255
String json = new Gson().toJson(configArray);
4356
writer.write(json);
4457
writer.close();

1.7.10/src/main/java/dev/cloudmc/feature/mod/Mod.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2022 DupliCAT
3-
* GNU General Public License v3.0
3+
* GNU Lesser General Public License v3.0
44
*/
55

66
package dev.cloudmc.feature.mod;
@@ -12,7 +12,6 @@ public class Mod {
1212

1313
private String name;
1414
private String description;
15-
private int optionalKey;
1615
private boolean toggled;
1716

1817
public Mod(String name, String description) {
@@ -46,14 +45,6 @@ public void setDescription(String description) {
4645
this.description = description;
4746
}
4847

49-
public int getOptionalKey() {
50-
return optionalKey;
51-
}
52-
53-
public void setOptionalKey(int optionalKey) {
54-
this.optionalKey = optionalKey;
55-
}
56-
5748
public boolean isToggled() {
5849
return toggled;
5950
}

1.7.10/src/main/java/dev/cloudmc/feature/mod/ModManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2022 DupliCAT
3-
* GNU General Public License v3.0
3+
* GNU Lesser General Public License v3.0
44
*/
55

66
package dev.cloudmc.feature.mod;

1.7.10/src/main/java/dev/cloudmc/feature/mod/impl/ArmorMod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2022 DupliCAT
3-
* GNU General Public License v3.0
3+
* GNU Lesser General Public License v3.0
44
*/
55

66
package dev.cloudmc.feature.mod.impl;

1.7.10/src/main/java/dev/cloudmc/feature/mod/impl/BlockInfoMod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2022 DupliCAT
3-
* GNU General Public License v3.0
3+
* GNU Lesser General Public License v3.0
44
*/
55

66
package dev.cloudmc.feature.mod.impl;

0 commit comments

Comments
 (0)