Skip to content

Commit 5b39b25

Browse files
squeegliisqueeglii
committed
Re-enabled DynamicCrosshair & Dank Storage Compat
1 parent b7f4044 commit 5b39b25

11 files changed

Lines changed: 38 additions & 30 deletions

File tree

‎changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## Changelog for 2.6.6 - 26.1 Only
2+
3+
- Re-enabled DynamicCrosshair & Dank Storage compatibility.
4+
15
## Changelog for 2.6.5 - 26.1 Only
26

37
- Removed compatibility for BankStorage, Dank Storage, & DynamicCrosshair

‎common/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ dependencies {
1212

1313
api "dev.isxander:yet-another-config-lib:${project.yacl_version}-fabric"
1414

15-
//todo: re-enable when updated to 26.1 \/\/\/
1615

17-
//compileOnly("maven.modrinth:dynamiccrosshair:${rootProject.dynamiccrosshair_version_artifact}-fabric:api")
16+
17+
compileOnly("maven.modrinth:dynamiccrosshair:${rootProject.dynamiccrosshair_version_artifact}-fabric:api")
1818

1919
// optional compat
20-
//compileOnly("curse.maven:dankstorage-335673:${rootProject.dank_storage_file_id}")
21-
//compileOnly("maven.modrinth:bank-storage:${rootProject.bank_storage_file_id}")
20+
compileOnly("curse.maven:dankstorage-335673:${rootProject.dank_storage_file_id}")
21+
//compileOnly("maven.modrinth:bank-storage:${rootProject.bank_storage_file_id}") //todo: re-enable when updated to 26.1
2222
}

common/src/main/java/me/cg360/mod/bridging/compat/handler/DankStorageHandler.java.old renamed to common/src/main/java/me/cg360/mod/bridging/compat/handler/DankStorageHandler.java

File renamed without changes.

common/src/main/java/me/cg360/mod/bridging/compat/impl/DankStorageCompat.java.old renamed to common/src/main/java/me/cg360/mod/bridging/compat/impl/DankStorageCompat.java

File renamed without changes.

common/src/main/java/me/cg360/mod/bridging/compat/impl/DynamicCrosshairCompat.java.old renamed to common/src/main/java/me/cg360/mod/bridging/compat/impl/DynamicCrosshairCompat.java

File renamed without changes.

‎fabric/src/main/java/me/cg360/mod/bridging/entrypoint/fabric/BridgingModFabric.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
import me.cg360.mod.bridging.BridgingKeyMappings;
44
import me.cg360.mod.bridging.BridgingMod;
55
import me.cg360.mod.bridging.ModIds;
6+
import me.cg360.mod.bridging.compat.impl.DankStorageCompat;
67
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
78
import net.fabricmc.loader.api.FabricLoader;
8-
import net.minecraft.client.KeyMapping;
9-
10-
//import me.cg360.mod.bridging.compat.impl.BankStorageCompat;
11-
//import me.cg360.mod.bridging.compat.impl.DankStorageCompat;
129

1310
public class BridgingModFabric {
1411

@@ -21,8 +18,8 @@ public void init() {
2118
}
2219

2320
if(FabricLoader.getInstance().isModLoaded(ModIds.DANK_STORAGE)) {
24-
BridgingMod.getLogger().warn("Dank Storage Compat disabled. Submit an issue with BridgingMod if it is now on 26.1");
25-
//new DankStorageCompat();
21+
//BridgingMod.getLogger().warn("Dank Storage Compat disabled. Submit an issue with BridgingMod if it is now on 26.1");
22+
new DankStorageCompat();
2623
}
2724

2825
if(FabricLoader.getInstance().isModLoaded(ModIds.BANK_STORAGE)) {

‎fabric/src/main/resources/fabric.mod.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"authors": [ "CG360" ],
99
"contact": {
1010
"sources": "https://github.com/squeeglii/BridgingMod",
11-
"issues": "https://github.com/squeeglii/BridgingMod/issues"
11+
"issues": "https://github.com/squeeglii/BridgingMod/issues",
12+
"discord": "https://discord.gg/94c45XagEH"
1213
},
1314

1415
"license": "MIT",
@@ -21,6 +22,9 @@
2122
],
2223
"modmenu": [
2324
"me.cg360.mod.bridging.compat.fabric.ModMenuIntegration"
25+
],
26+
"dynamiccrosshair": [
27+
"me.cg360.mod.bridging.compat.impl.DynamicCrosshairCompat"
2428
]
2529
},
2630
"mixins": [

‎gradle.properties‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ neoforge_loader_version_range=[2.0,)
1313
neoforge_compatibility_range=[26.1,)
1414

1515
# Mod Properties
16-
mod_version = 2.6.5
16+
mod_version = 2.6.6
1717
maven_group = me.cg360
1818
archives_base_name = BridgingMod
1919

@@ -27,23 +27,22 @@ modmenu_version=18.0.0-alpha.8
2727
yacl_version=3.9.1+26.1
2828

2929
# Compatibility Dependencies
30-
# these are *broken* - with remapping, these need updating to 26.1 to compile.
30+
dynamiccrosshair_version=9.12
31+
dynamiccrosshair_version_artifact=9.12+26.1
32+
33+
dank_storage_file_id=7853310
34+
35+
#----------------------
36+
# the following are *broken* - with remapping, these need updating to 26.1 to compile.
3137
# Make sure on update:
3238
# [ ] compatibility classes are renamed from .java.old -> .java
3339
# [ ] inits in fabric & neoforge base classes are updated
3440
# [ ] dependencies in fabric.mod.json & neoforge.mod.toml are readded
3541
# [ ] dynamic crosshair entrypoint is readded to fabric.mod.json
3642
# [ ] dependencies in build.gradle are updated.
3743

38-
#dynamiccrosshair_version=9.11
39-
#dynamiccrosshair_version_artifact=9.5+1.21.6
40-
# this is broken ^
41-
# the classifiers on newly published api jars is broken. It should be at the beginning of the artifact version,
42-
# but it's at the end. This changed for 9.6+ and now I can't find a way
43-
# to get gradle to find it.
44-
45-
#dank_storage_file_id=6060949
4644
#bank_storage_file_id=LC7UDnPb
45+
#----------------------
4746

4847
## Publishing configuration
4948
debug_publishing=false

‎neoforge/src/main/java/me/cg360/mod/bridging/entrypoint/neoforge/BridgingModNeoForge.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import me.cg360.mod.bridging.BridgingKeyMappings;
44
import me.cg360.mod.bridging.BridgingMod;
55
import me.cg360.mod.bridging.ModIds;
6-
//import me.cg360.mod.bridging.compat.impl.BankStorageCompat;
7-
//import me.cg360.mod.bridging.compat.impl.DankStorageCompat;
8-
//import me.cg360.mod.bridging.compat.impl.DynamicCrosshairCompat;
6+
import me.cg360.mod.bridging.compat.impl.DankStorageCompat;
7+
import me.cg360.mod.bridging.compat.impl.DynamicCrosshairCompat;
98
import me.cg360.mod.bridging.config.BridgingConfigUI;
109
import net.neoforged.api.distmarker.Dist;
1110
import net.neoforged.bus.api.IEventBus;
@@ -38,13 +37,13 @@ public void init(FMLClientSetupEvent event) {
3837
);
3938

4039
if(ModList.get().isLoaded(ModIds.DYNAMIC_CROSSHAIR)) {
41-
BridgingMod.getLogger().warn("Dynamic Crosshair support disabled. Submit an issue with BridgingMod if it is now on 26.1");
42-
//InterModComms.sendTo(ModIds.DYNAMIC_CROSSHAIR, "register_api", DynamicCrosshairCompat::new);
40+
//BridgingMod.getLogger().warn("Dynamic Crosshair support disabled. Submit an issue with BridgingMod if it is now on 26.1");
41+
InterModComms.sendTo(ModIds.DYNAMIC_CROSSHAIR, "register_api", DynamicCrosshairCompat::new);
4342
}
4443

4544
if(ModList.get().isLoaded(ModIds.DANK_STORAGE)) {
46-
BridgingMod.getLogger().warn("Dank Storage Compat disabled. Submit an issue with BridgingMod if it is now on 26.1");
47-
//new DankStorageCompat();
45+
//BridgingMod.getLogger().warn("Dank Storage Compat disabled. Submit an issue with BridgingMod if it is now on 26.1");
46+
new DankStorageCompat();
4847
}
4948

5049
if(ModList.get().isLoaded(ModIds.BANK_STORAGE)) {

‎neoforge/src/main/resources/META-INF/neoforge.mods.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ modId = "yet_another_config_lib_v3"
3535
mandatory = true
3636
versionRange = "[${yacl_version},)"
3737
ordering = "NONE"
38+
side = "CLIENT"
39+
40+
[[dependencies.bridgingmod]]
41+
modId = "dynamiccrosshair"
42+
type = "optional"
43+
versionRange = "[${dynamiccrosshair_version},)"
44+
ordering = "AFTER"
3845
side = "CLIENT"

0 commit comments

Comments
 (0)