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

IT LAUNCHES and then immediately crashes

Browse source
This commit is contained in:
gamma-delta 2022-05-15 11:49:28 -05:00
parent 4332c37afa
commit d64bd20868
8 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/build.gradle
View file

@ -5,7 +5,7 @@ plugins {
id 'org.jetbrains.kotlin.jvm' version '1.6.21'
}
version = getVersion("common")
archivesBaseName = getArtifactID("common")
minecraft {
version(minecraftVersion)
@ -27,7 +27,7 @@ dependencies {
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
compileOnly "at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion-common"
compileOnly "at.petra-k.paucal:paucal-common-$minecraftVersion:$paucalVersion"
compileOnly "vazkii.patchouli:Patchouli-xplat:$minecraftVersion-$patchouliVersion"
}

1
Common/src/main/java/at/petrak/hexcasting/common/items/colorizer/ItemUUIDColorizer.java
View file

@ -13,7 +13,6 @@ import java.util.Random;
import java.util.UUID;
public class ItemUUIDColorizer extends Item implements ColorizerItem {
public ItemUUIDColorizer(Properties pProperties) {
super(pProperties);
}

4
Fabric/build.gradle
View file

@ -2,7 +2,7 @@ plugins {
id 'fabric-loom' version "$loomVersion"
}
version = getVersion("fabric")
archivesBaseName = getArtifactID("fabric")
loom {
mixin.defaultRefmapName = "hexcasting.refmap.json"
@ -46,7 +46,7 @@ dependencies {
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
compileOnly project(":Common")
modImplementation "at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion-fabric"
modImplementation "at.petra-k.paucal:paucal-fabric-$minecraftVersion:$paucalVersion"
modImplementation "vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion-FABRIC"
modImplementation "me.zeroeightsix:fiber:$fiberVersion"

9
Fabric/src/main/java/at/petrak/hexcasting/fabric/mixin/FabricVillagerTurnIntoWitchMixin.java
View file

@ -1,5 +1,7 @@
package at.petrak.hexcasting.fabric.mixin;
import at.petrak.hexcasting.common.misc.Brainsweeping;
import net.minecraft.world.entity.monster.Witch;
import net.minecraft.world.entity.npc.Villager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@ -9,8 +11,9 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@Mixin(Villager.class)
public class FabricVillagerTurnIntoWitchMixin {
@Inject(method = "thunderHit", locals = LocalCapture.PRINT, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;addFreshEntityWithPassengers(Lnet/minecraft/world/entity/Entity;)V"))
public void onThunderHit(CallbackInfo cb) {
// todo
@Inject(method = "thunderHit", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;addFreshEntityWithPassengers(Lnet/minecraft/world/entity/Entity;)V"))
public void onThunderHit(CallbackInfo cb, Witch newWitch) {
var self = (Villager) (Object) this;
Brainsweeping.copyBrainsweepFromVillager(self, newWitch);
}
}

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

@ -40,7 +40,7 @@
"java": ">=17",
"fabric-language-kotlin": ">=1.7.4+kotlin.1.6.21",
"patchouli": ">=1.18.2-66",
"paucal": ">=0.4.0"
"paucal": "*"
},
"custom": {

6
Forge/build.gradle
View file

@ -21,7 +21,7 @@ apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: 'org.spongepowered.mixin'
version = getVersion("forge")
archivesBaseName = getArtifactID("forge")
// Adds the Kotlin Gradle plugin
buildscript {
@ -150,8 +150,8 @@ dependencies {
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
compileOnly fg.deobf("at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion-forge")
runtimeOnly fg.deobf("at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion-forge")
compileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
runtimeOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
compileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion:api")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")

22
build.gradle
View file

@ -38,16 +38,8 @@ def isRelease() {
}
}
String getVersion(String platform) {
def v = "${modVersion}"
if (!isRelease() && System.getenv('BUILD_NUMBER') != null) {
v += "-prerelease-" + System.getenv('BUILD_NUMBER')
} else if (System.getenv('TAG_NAME') != null) {
v = System.getenv('TAG_NAME').substring(1)
println 'Version overridden to tag version ' + version
}
v += "-" + platform
return v
String getArtifactID(String platform) {
return "${modID}-${platform}-${minecraftVersion}"
}
subprojects {
@ -57,8 +49,14 @@ subprojects {
apply plugin: 'maven-publish'
group = "at.petra-k.$modID" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "${modID}-${minecraftVersion}"
// Version is fixed up in each gradle
version = "${modVersion}"
if (!isRelease() && System.getenv('BUILD_NUMBER') != null) {
version += "-prerelease-" + System.getenv('BUILD_NUMBER')
} else if (System.getenv('TAG_NAME') != null) {
version = System.getenv('TAG_NAME').substring(1)
println 'Version overridden to tag version ' + version
}
// archivesBaseName set in each gradle
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
java.withSourcesJar()

2
gradle.properties
View file

@ -9,6 +9,6 @@ modName=Hex Casting
minecraftVersion=1.18.2
modVersion=0.9.0
paucalVersion=0.4.0-prerelease-17
paucalVersion=0.4.0-prerelease-23
patchouliVersion=67
jeiVersion=9.5.3.143