Skip to content

Commit e8f275a

Browse files
author
micheal65536
committed
Allow mod to be loaded on the client
1 parent 036d68f commit e8f275a

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ dependencies {
2727
}
2828

2929
loom {
30-
splitEnvironmentSourceSets()
31-
3230
mods {
3331
"vienna" {
3432
sourceSet sourceSets.main
35-
sourceSet sourceSets.client
3633
}
3734
}
3835
}
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
11
package micheal65536.vienna.fabric;
22

3+
import net.fabricmc.api.ClientModInitializer;
34
import net.fabricmc.api.DedicatedServerModInitializer;
5+
import net.fabricmc.api.ModInitializer;
46
import org.slf4j.Logger;
57
import org.slf4j.LoggerFactory;
68

7-
public class Main implements DedicatedServerModInitializer
9+
public class Main implements ModInitializer, DedicatedServerModInitializer, ClientModInitializer
810
{
911
public static final Logger LOGGER = LoggerFactory.getLogger("vienna");
1012

13+
@Override
14+
public void onInitialize()
15+
{
16+
// empty
17+
}
18+
1119
@Override
1220
public void onInitializeServer()
1321
{
1422
// empty
1523
}
24+
25+
@Override
26+
public void onInitializeClient()
27+
{
28+
// empty
29+
}
1630
}

src/main/java/micheal65536/vienna/fabric/health/mixins/HungerManagerMixin.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,13 @@
44
import net.minecraft.entity.player.PlayerEntity;
55
import org.spongepowered.asm.mixin.Mixin;
66
import org.spongepowered.asm.mixin.Overwrite;
7-
import org.spongepowered.asm.mixin.gen.Accessor;
87

98
@Mixin(HungerManager.class)
109
public class HungerManagerMixin
1110
{
1211
@Overwrite
1312
public void update(PlayerEntity player)
1413
{
15-
// TODO: these probably aren't necessary, I just have them here because it allows regular unmodified client to eat
16-
((HungerManagerAccessor) this).setFoodLevel(10);
17-
((HungerManagerAccessor) this).setSaturationLevel(0.0f);
18-
((HungerManagerAccessor) this).setExhaustion(0.0f);
19-
}
20-
21-
@Mixin(HungerManager.class)
22-
public interface HungerManagerAccessor
23-
{
24-
@Accessor
25-
void setFoodLevel(int foodLevel);
26-
27-
@Accessor
28-
void setSaturationLevel(float saturationLevel);
29-
30-
@Accessor
31-
void setExhaustion(float exhaustion);
14+
// empty
3215
}
3316
}

src/main/resources/fabric.mod.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@
77
"authors": [
88
"micheal65536"
99
],
10-
"environment": "server",
10+
"environment": "*",
1111
"entrypoints": {
12+
"main": [
13+
"micheal65536.vienna.fabric.Main"
14+
],
1215
"server": [
1316
"micheal65536.vienna.fabric.Main"
17+
],
18+
"client": [
19+
"micheal65536.vienna.fabric.Main"
1420
]
1521
},
1622
"mixins": [

src/main/resources/vienna.mixins.health.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"required": true,
33
"package": "micheal65536.vienna.fabric.health.mixins",
44
"compatibilityLevel": "JAVA_17",
5-
"server": [
5+
"mixins": [
66
"HungerManagerMixin",
7-
"HungerManagerMixin$HungerManagerAccessor",
87
"PlayerEntityMixin"
98
],
109
"injectors": {

0 commit comments

Comments
 (0)