Skip to content

Commit 5dc2b92

Browse files
committed
Reinclude removed compat files & update github actions
1 parent 88cd601 commit 5dc2b92

4 files changed

Lines changed: 81 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
# Use these Java versions
1414
java: [
15-
21 # Minimum supported by Minecraft
15+
25 # Minimum supported by Minecraft
1616
]
1717
# and run on both Linux and Windows
1818
os: [ubuntu-24.04, windows-latest]
@@ -32,7 +32,7 @@ jobs:
3232
- name: build
3333
run: ./gradlew build
3434
- name: capture build artifacts
35-
if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
35+
if: ${{ runner.os == 'Linux' && matrix.java == '25' }} # Only upload artifacts built from latest java on one OS
3636
uses: actions/upload-artifact@v4
3737
with:
3838
path: build/for-publishing/
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package me.cg360.mod.bridging.compat.impl;
2+
3+
import me.cg360.mod.bridging.compat.SpecialHandlers;
4+
import me.cg360.mod.bridging.compat.handler.BankStorageHandler;
5+
import me.cg360.mod.bridging.compat.handler.PlaceableItemHandler;
6+
import net.minecraft.resources.Identifier;
7+
8+
public class BankStorageCompat {
9+
10+
public BankStorageCompat() {
11+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_1"), BankStorageHandler.INSTANCE);
12+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_2"), BankStorageHandler.INSTANCE);
13+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_3"), BankStorageHandler.INSTANCE);
14+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_4"), BankStorageHandler.INSTANCE);
15+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_5"), BankStorageHandler.INSTANCE);
16+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_6"), BankStorageHandler.INSTANCE);
17+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_7"), BankStorageHandler.INSTANCE);
18+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("bankstorage", "bank_link"), BankStorageHandler.INSTANCE);
19+
}
20+
21+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package me.cg360.mod.bridging.compat.impl;
2+
3+
import me.cg360.mod.bridging.compat.SpecialHandlers;
4+
import me.cg360.mod.bridging.compat.handler.DankStorageHandler;
5+
import net.minecraft.resources.Identifier;
6+
7+
public class DankStorageCompat {
8+
9+
public DankStorageCompat() {
10+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_1"), DankStorageHandler.INSTANCE);
11+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_2"), DankStorageHandler.INSTANCE);
12+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_3"), DankStorageHandler.INSTANCE);
13+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_4"), DankStorageHandler.INSTANCE);
14+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_5"), DankStorageHandler.INSTANCE);
15+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_6"), DankStorageHandler.INSTANCE);
16+
SpecialHandlers.registerSpecialHandler(Identifier.fromNamespaceAndPath("dankstorage", "dank_7"), DankStorageHandler.INSTANCE);
17+
}
18+
19+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package me.cg360.mod.bridging.compat.impl;
2+
3+
import me.cg360.mod.bridging.BridgingMod;
4+
import me.cg360.mod.bridging.raytrace.BridgingStateTracker;
5+
import me.cg360.mod.bridging.util.GameSupport;
6+
import mod.crend.dynamiccrosshairapi.DynamicCrosshairApi;
7+
import mod.crend.dynamiccrosshairapi.crosshair.Crosshair;
8+
import mod.crend.dynamiccrosshairapi.crosshair.CrosshairContext;
9+
import mod.crend.dynamiccrosshairapi.interaction.InteractionType;
10+
import net.minecraft.world.phys.HitResult;
11+
12+
public class DynamicCrosshairCompat implements DynamicCrosshairApi {
13+
14+
@Override
15+
public String getNamespace() {
16+
return "bridgingmod";
17+
}
18+
19+
@Override
20+
public boolean forceInvalidate(CrosshairContext context) {
21+
return BridgingMod.getConfig().isBridgingEnabled()
22+
&& GameSupport.isHoldingPlaceable(context.getPlayer())
23+
&& context.getHitResult().getType() == HitResult.Type.MISS;
24+
}
25+
26+
@Override
27+
public boolean forceCheck() {
28+
return true;
29+
}
30+
31+
@Override
32+
public Crosshair computeFromItem(CrosshairContext context) {
33+
if (BridgingStateTracker.getLastTickTarget() != null) {
34+
return new Crosshair(InteractionType.PLACE_BLOCK);
35+
}
36+
37+
return null;
38+
}
39+
}

0 commit comments

Comments
 (0)