Anvilcraft/HexCasting
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

actually launching on fabric

Browse source
This commit is contained in:
Talia-12 2023-07-08 23:38:13 +10:00
parent 05d0f928dd
commit 47fc2532d0
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Fabric/src/main/java/at/petrak/hexcasting/fabric/mixin/client/FabricModelManagerMixin.java
View file

@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import java.util.Map;
@ -22,11 +23,12 @@ public class FabricModelManagerMixin {
private Map<ResourceLocation, BakedModel> bakedRegistry;
@Inject(at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/resources/model/ModelBakery;" +
"getBakedTopLevelModels()Ljava/util/Map;", shift = At.Shift.AFTER), method = "Lnet/minecraft/client/" +
"resources/model/ModelManager;apply(Lnet/minecraft/client/resources/model/ModelManager$ReloadState;" +
"Lnet/minecraft/util/profiling/ProfilerFiller;)V")
private void onModelBake(ModelBakery modelLoader, ResourceManager resourceManager, ProfilerFiller profiler,
CallbackInfo ci) {
"getBakedTopLevelModels()Ljava/util/Map;", shift = At.Shift.AFTER),
method = "Lnet/minecraft/client/resources/model/ModelManager;apply(" +
"Lnet/minecraft/client/resources/model/ModelManager$ReloadState;" +
"Lnet/minecraft/util/profiling/ProfilerFiller;)V",
locals = LocalCapture.CAPTURE_FAILEXCEPTION)
private void onModelBake(ModelManager.ReloadState reloadState, ProfilerFiller profiler, CallbackInfo ci, ModelBakery modelLoader) {
RegisterClientStuff.onModelBake(modelLoader, this.bakedRegistry);
}
}

10
Fabric/src/main/resources/fabric.mod.json
View file

@ -49,16 +49,15 @@
"minecraft": "=1.20.1",
"java": ">=17",
"fabricloader": ">=0.14",
"fabric": ">=0.64",
"fabric-language-kotlin": ">=1.7.4+kotlin.1.6.21",
"fabric": ">=0.84",
"fabric-language-kotlin": ">=1.9.5+kotlin.1.8.22",
"cardinal-components": "~5.2.1",
"paucal": "0.6.x",
"cloth-config": "11.0.x",
"patchouli": ">=1.20.1-80"
},
"suggests": {
"gravitychanger": "0.7.21+fabric",
"pehkui": "3.6.0+1.14.4-1.19"
"pehkui": "3.7.6"
},
"custom": {
"cardinal-components": [
@ -72,7 +71,8 @@
"hexcasting:pigment",
"hexcasting:iota_holder",
"hexcasting:media_holder",
"hexcasting:hex_holder"
"hexcasting:hex_holder",
"hexcasting:variant_item"
]
}
}

3
Fabric/src/main/resources/fabricasting.accesswidener
View file

@ -13,4 +13,5 @@ accessible field net/minecraft/client/renderer/RenderType$CompositeState textur
accessible class net/minecraft/client/renderer/RenderStateShard$EmptyTextureStateShard
accessible method net/minecraft/world/item/context/UseOnContext <init> (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/BlockHitResult;)V
accessible method net/minecraft/world/damagesource/DamageSources source (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/damagesource/DamageSource;
accessible method net/minecraft/world/damagesource/DamageSources source (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource;
accessible method net/minecraft/world/damagesource/DamageSources source (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource;
accessible class net/minecraft/client/resources/model/ModelManager$ReloadState

2
Forge/src/main/resources/META-INF/mods.toml
View file

@ -38,6 +38,6 @@ side = "BOTH"
[[dependencies.hexcasting]]
modId = "patchouli"
mandatory = true
versionRange = "[1.19.2-77,)"
versionRange = "[1.20.1-80,)"
ordering = "NONE"
side = "BOTH"

2
gradle.properties
View file

@ -10,7 +10,7 @@ jetbrainsAnnotationsVersion=23.0.0
minecraftVersion=1.20.1
kotlinVersion=1.7.20
modVersion=0.11.1-0
modVersion=0.11.1-1
paucalVersion=0.6.0
patchouliVersion=80