Skip to content

Commit 7b0677e

Browse files
committed
Add Module::getTitle & InvMove::hasMod, bump to 0.8.2
1 parent c14d1a4 commit 7b0677e

File tree

14 files changed

+59
-4
lines changed

14 files changed

+59
-4
lines changed

.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ classes/
1717
.metadata
1818
.vscode
1919
.settings
20-
*.launch
20+
*.launch
21+
22+
publish_all.sh
23+
publish_curseforge_version.sh
24+
publish_modrinth_version.sh

crossversion/common/src/main/java/me/pieking1215/invmove/InvMove.java

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public static void registerModule(Module module) {
6060

6161
public abstract Optional<String> modidFromClass(Class<?> c);
6262
public abstract String modNameFromModid(String modid);
63+
public abstract boolean hasMod(String modid);
6364
public abstract File configDir();
6465
protected abstract void registerKeybind(KeyMapping key);
6566

crossversion/common/src/main/java/me/pieking1215/invmove/InvMoveConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static Screen setupCloth(Screen parent){
9393
MOVEMENT.cfg.addTo(movement, eb, "config.invmove");
9494

9595
for (Module module : InvMove.instance().modules) {
96-
SubCategoryBuilder cat = eb.startSubCategory(InvMove.instance().translatableComponent("key.invmove.module." + module.getId()));
96+
SubCategoryBuilder cat = eb.startSubCategory(module.getTitle());
9797
module.getMovementConfig().addTo(cat, eb, "config.invmove." + module.getId() + "");
9898
movement.addEntry(cat.build());
9999
}
@@ -130,7 +130,7 @@ public static Screen setupCloth(Screen parent){
130130
BACKGROUND.cfg.addTo(background, eb, "config.invmove");
131131

132132
for (Module module : InvMove.instance().modules) {
133-
SubCategoryBuilder cat = eb.startSubCategory(InvMove.instance().translatableComponent("key.invmove.module." + module.getId()));
133+
SubCategoryBuilder cat = eb.startSubCategory(module.getTitle());
134134
module.getBackgroundConfig().addTo(cat, eb, "config.invmove." + module.getId() + "");
135135
background.addEntry(cat.build());
136136
}

crossversion/common/src/main/java/me/pieking1215/invmove/InvMoveNoOp.java

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ public String modNameFromModid(String modid) {
1717
return "???";
1818
}
1919

20+
@Override
21+
public boolean hasMod(String modid) {
22+
return false;
23+
}
24+
2025
@Override
2126
public File configDir() {
2227
return null;

crossversion/common/src/main/java/me/pieking1215/invmove/module/Module.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
package me.pieking1215.invmove.module;
22

3+
import me.pieking1215.invmove.InvMove;
34
import me.pieking1215.invmove.module.config.ModuleConfig;
45
import net.minecraft.client.gui.screens.Screen;
6+
import net.minecraft.network.chat.Component;
57

68
public interface Module {
79
@SuppressWarnings("SameReturnValue")
810
String getId();
11+
default Component getTitle() {
12+
return InvMove.instance().translatableComponent("key.invmove.module." + getId());
13+
}
914
Movement shouldAllowMovement(Screen screen);
1015
Background shouldHideBackground(Screen screen);
1116
ModuleConfig getMovementConfig();

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4096M
22
org.gradle.parallel=true
33

44
archives_base_name=InvMove
5-
mod_version=0.8.1
5+
mod_version=0.8.2
66
maven_artifact_id=InvMove
77

88
mod_description=Lets you move while in inventories.

mc1.16/fabric/src/main/java/me/pieking1215/invmove/fabric/InvMoveFabric.java

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ public String modNameFromModid(String modid) {
3131
return FabricLoader.getInstance().getModContainer(modid).map(con -> con.getMetadata().getName()).orElse(modid);
3232
}
3333

34+
@Override
35+
public boolean hasMod(String modid) {
36+
return FabricLoader.getInstance().isModLoaded(modid);
37+
}
38+
3439
@Override
3540
public File configDir() {
3641
return FabricLoader.getInstance().getConfigDir().toFile();

mc1.16/forge/src/main/java/me/pieking1215/invmove/forge/InvMoveForgeClient.java

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ public String modNameFromModid(String modid) {
6868
return ModList.get().getModContainerById(modid).map(con -> con.getModInfo().getDisplayName()).orElse(modid);
6969
}
7070

71+
@Override
72+
public boolean hasMod(String modid) {
73+
return ModList.get().isLoaded(modid);
74+
}
75+
7176
@Override
7277
public File configDir() {
7378
return FMLPaths.CONFIGDIR.get().toFile();

mc1.18/fabric/src/main/java/me/pieking1215/invmove/fabric/InvMoveFabric.java

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ public String modNameFromModid(String modid) {
3232
return FabricLoader.getInstance().getModContainer(modid).map(con -> con.getMetadata().getName()).orElse(modid);
3333
}
3434

35+
@Override
36+
public boolean hasMod(String modid) {
37+
return FabricLoader.getInstance().isModLoaded(modid);
38+
}
39+
3540
@Override
3641
public File configDir() {
3742
return FabricLoader.getInstance().getConfigDir().toFile();

mc1.18/forge/src/main/java/me/pieking1215/invmove/forge/InvMoveForgeClient.java

+5
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ public String modNameFromModid(String modid) {
6161
return ModList.get().getModContainerById(modid).map(con -> con.getModInfo().getDisplayName()).orElse(modid);
6262
}
6363

64+
@Override
65+
public boolean hasMod(String modid) {
66+
return ModList.get().isLoaded(modid);
67+
}
68+
6469
@Override
6570
public File configDir() {
6671
return FMLPaths.CONFIGDIR.get().toFile();

mc1.18/quilt/src/main/java/me/pieking1215/invmove/quilt/InvMoveQuilt.java

+5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ public String modNameFromModid(String modid) {
4343
return QuiltLoader.getModContainer(modid).map(con -> con.metadata().name()).orElse(modid);
4444
}
4545

46+
@Override
47+
public boolean hasMod(String modid) {
48+
return QuiltLoader.isModLoaded(modid);
49+
}
50+
4651
@Override
4752
public File configDir() {
4853
return QuiltLoader.getConfigDir().toFile();

mc1.19/fabric/src/main/java/me/pieking1215/invmove/fabric/InvMoveFabric.java

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ public String modNameFromModid(String modid) {
3636
return FabricLoader.getInstance().getModContainer(modid).map(con -> con.getMetadata().getName()).orElse(modid);
3737
}
3838

39+
@Override
40+
public boolean hasMod(String modid) {
41+
return FabricLoader.getInstance().isModLoaded(modid);
42+
}
43+
3944
@Override
4045
public File configDir() {
4146
return FabricLoader.getInstance().getConfigDir().toFile();

mc1.19/forge/src/main/java/me/pieking1215/invmove/forge/InvMoveForgeClient.java

+5
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ public String modNameFromModid(String modid) {
6262
return ModList.get().getModContainerById(modid).map(con -> con.getModInfo().getDisplayName()).orElse(modid);
6363
}
6464

65+
@Override
66+
public boolean hasMod(String modid) {
67+
return ModList.get().isLoaded(modid);
68+
}
69+
6570
@Override
6671
public File configDir() {
6772
return FMLPaths.CONFIGDIR.get().toFile();

mc1.19/quilt/src/main/java/me/pieking1215/invmove/quilt/InvMoveQuilt.java

+5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ public String modNameFromModid(String modid) {
4343
return QuiltLoader.getModContainer(modid).map(con -> con.metadata().name()).orElse(modid);
4444
}
4545

46+
@Override
47+
public boolean hasMod(String modid) {
48+
return QuiltLoader.isModLoaded(modid);
49+
}
50+
4651
@Override
4752
public File configDir() {
4853
return QuiltLoader.getConfigDir().toFile();

0 commit comments

Comments
 (0)