Skip to content

Commit 3a3a814

Browse files
committed
feat: add similar behaviour for smelting spirits.
1 parent a9ed815 commit 3a3a814

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed

build.gradle

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,10 @@ repositories {
112112
includeGroup "curse.maven"
113113
}
114114
}
115-
maven {
116-
name = "Modrinth"
117-
url = "https://api.modrinth.com/maven"
118-
content {
119-
includeGroup "maven.modrinth"
120-
}
121-
}
122115
maven {
123116
name = "OctoStudios"
124117
url = uri("https://maven.octo-studios.com/releases")
125118
}
126-
mavenCentral()
127-
mavenLocal()
128119
maven {
129120
url "https://dl.cloudsmith.io/public/klikli-dev/mods/maven/"
130121
content {
@@ -135,19 +126,20 @@ repositories {
135126
name = "TerraformersMC"
136127
url = "https://maven.terraformersmc.com/"
137128
}
129+
mavenCentral()
130+
mavenLocal()
131+
138132
}
139133

140134
dependencies {
141135
implementation "com.hollingsworth.ars_nouveau:ars_nouveau-${mc_version}:${ars_version}"
142-
// implementation "maven.modrinth:occultism:${occultism_version}"
143-
implementation "com.klikli_dev:occultism-1.21.1-neoforge:1.161.0"
136+
implementation "com.klikli_dev:occultism-1.21.1-neoforge:${occultism_version}"
144137
implementation "net.tslat.smartbrainlib:SmartBrainLib-neoforge-1.21.1:${smartbrainlib}"
145138

146139
compileOnly "mezz.jei:jei-1.21-common-api:${jei_version}"
147140
compileOnly "mezz.jei:jei-1.21-neoforge-api:${jei_version}"
148141
localRuntime "mezz.jei:jei-1.21-neoforge:${jei_version}"
149142

150-
localRuntime "maven.modrinth:modonomicon:${modonomicon}"
151143
}
152144

153145
tasks.withType(ProcessResources).configureEach {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ loader_version_range=[4,)
2525
#
2626
ars_version=5.3.6.853
2727
ars_version_range=[5.0,6)
28-
occultism_version=1.21-neoforge-1.136.1
29-
occultism_version_range=[1.21-neoforge-1.136.1,)
28+
occultism_version=1.171.0
29+
occultism_version_range=[1.71.0,)
3030
jei_version=19.5.0.44
3131
smartbrainlib=1.16.1
3232
modonomicon=1.21.1-1.110.1

src/main/java/com/mystchonky/arsocultas/common/event/OccultismEvents.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.hollingsworth.arsnouveau.common.block.tile.MobJarTile;
44
import com.klikli_dev.occultism.common.entity.job.CrusherJob;
5+
import com.klikli_dev.occultism.common.entity.job.SmelterJob;
56
import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity;
67
import com.mystchonky.arsocultas.ArsOcultas;
78
import com.mystchonky.arsocultas.common.mob_jar.SpiritBehaviour;
@@ -23,8 +24,25 @@ public static void crusherJob(CrusherJob.CrusherJobEvent event) {
2324
event.setResult(remainder);
2425
}
2526
});
27+
}
28+
}
29+
}
2630

31+
@SubscribeEvent
32+
public static void smelterJob(SmelterJob.SmelterJobEvent event) {
33+
var entity = event.getEntity();
34+
var level = event.getEntity().level();
35+
if (entity instanceof SpiritEntity spirit) {
36+
if (level.getBlockEntity(spirit.blockPosition()) instanceof MobJarTile jar) {
37+
jar.dispatchBehavior(behavior -> {
38+
if (behavior instanceof SpiritBehaviour<? extends SpiritEntity> spiritBehaviour) {
39+
var remainder = spiritBehaviour.tryItemNearbyTransfer(jar, level, event.getResult());
40+
event.setResult(remainder);
41+
}
42+
});
2743
}
2844
}
2945
}
46+
47+
3048
}

0 commit comments

Comments
 (0)