Skip to content

Commit

Permalink
Update mixin extras, loom & fix remapping errors
Browse files Browse the repository at this point in the history
  • Loading branch information
IThundxr committed Dec 12, 2023
1 parent 9a62cd0 commit 200d54b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 26 deletions.
12 changes: 1 addition & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import dev.ithundxr.silk.ChangelogText

plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.3.+" apply false
id "io.github.juuxel.loom-vineflower" version "1.+" apply false // Vineflower, a better decompiler
id "dev.architectury.loom" version "1.4.+" apply false
id "me.modmuss50.mod-publish-plugin" version "0.3.4" apply false // https://github.com/modmuss50/mod-publish-plugin
id "dev.ithundxr.silk" version "0.11.15" // https://github.com/IThundxr/silk
}
Expand All @@ -14,7 +13,6 @@ architectury {

subprojects {
apply plugin: "dev.architectury.loom"
apply plugin: "io.github.juuxel.loom-vineflower"

loom {
silentMojangMappingsLicense()
Expand Down Expand Up @@ -108,14 +106,6 @@ allprojects {
java {
withSourcesJar()
}

configurations.configureEach {
resolutionStrategy.eachDependency {
if (requested.module.name == "fabric-loader") {
useVersion(fabric_loader_version)
}
}
}
}

String getChangelogText() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
import com.simibubi.create.content.trains.entity.Carriage;
import com.simibubi.create.content.trains.entity.CarriageContraption;
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
import com.simibubi.create.content.trains.entity.Navigation;
import com.simibubi.create.content.trains.entity.Train;
import com.simibubi.create.content.trains.entity.*;
import com.simibubi.create.foundation.utility.Pair;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand Down
8 changes: 0 additions & 8 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@ repositories {
} // Cardinal Components (Hex Casting dependency)
}

configurations.configureEach {
resolutionStrategy.eachDependency {
if (requested.module.name == "fabric-loader") {
useVersion(fabric_loader_version)
}
}
}

dependencies {
modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
common(project(path: ":common", configuration: "namedElements")) { transitive = false }
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ parchment_version = 2022.11.27

# Fabric
# https://fabricmc.net/develop/
fabric_loader_version = 0.14.22
fabric_loader_version = 0.15.1
fabric_api_version = 0.76.0+1.19.2

# Forge
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 200d54b

Please sign in to comment.