Skip to content

Commit

Permalink
Update to 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Provismet committed Oct 24, 2023
1 parent a05fece commit ec36e62
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 43 deletions.
73 changes: 43 additions & 30 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,50 @@ version = project.mod_version
group = project.maven_group

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
exclusiveContent {
forRepository {
maven {
name = "Modrinth"
url = "https://api.modrinth.com/maven"
}
}
filter {
includeGroup "maven.modrinth"
}
}
maven {
name = "QuiltMC"
url = "https://maven.quiltmc.org/repository/release"
}
maven {
name = 'Ladysnake Mods'
url = 'https://maven.ladysnake.org/releases'
}
maven {
url = 'https://maven.cafeteria.dev'
content {
includeGroup 'net.adriantodt.fabricmc'
}
}
maven {
name = "Ladysnake Libs"
url = 'https://ladysnake.jfrog.io/artifactory/mods'
}
maven {
url = 'https://maven.cafeteria.dev'
content {
includeGroup 'net.adriantodt.fabricmc'
}
}
maven {
url "https://maven.jamieswhiteshirt.com/libs-release"
content {
includeGroup "com.jamieswhiteshirt"
}
}
maven {
url "https://jitpack.io"
}
maven {
url "https://maven.shedaniel.me/"
}
maven {
url "https://maven.terraformersmc.com/"
}
mavenLocal()
url "https://maven.jamieswhiteshirt.com/libs-release"
content {
includeGroup "com.jamieswhiteshirt"
}
}
maven {
url "https://masa.dy.fi/maven"
}
maven {
url "https://jitpack.io"
}
maven {
url "https://maven.shedaniel.me/"
}
maven {
url "https://maven.terraformersmc.com/"
}
mavenLocal()
}

dependencies {
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20
yarn_mappings=1.20+build.1
loader_version=0.14.21
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.4
loader_version=0.14.24

# Mod Properties
mod_version = 1.1.1
mod_version = 1.2.0
maven_group = com.provismet
archives_base_name = extrade-origins-addon

# Dependencies
fabric_version=0.83.0+1.20
origins_version=1.10.0
fabric_version=0.90.4+1.20.2
origins_version=1.11.3
extrade_version=1.1.0
reach_version=2.3.2
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@
import io.github.apace100.apoli.power.SetEntityGroupPower;
import io.github.apace100.apoli.power.factory.PowerFactory;
import io.github.apace100.calio.data.SerializableData;
import io.github.apace100.calio.data.SerializableDataTypes;
import net.minecraft.entity.EntityGroup;
import net.minecraft.entity.LivingEntity;

public class SetExtraEntityGroup extends SetEntityGroupPower {
public SetExtraEntityGroup(PowerType<?> type, LivingEntity entity, EntityGroup group) {
super(type, entity, group);
public SetExtraEntityGroup(PowerType<?> type, LivingEntity entity, EntityGroup group, int priority) {
super(type, entity, group, priority);
}

@SuppressWarnings("rawtypes")
public static PowerFactory createFactory () {
return new PowerFactory<>(ExtraDE_OA.powerID("entity_group"),
new SerializableData()
.add("group", SerializableDataTypeOverride.ENTITY_GROUP),
data ->
(type, player) -> new SetEntityGroupPower(type, player, (EntityGroup)data.get("group")))
.allowCondition();
new SerializableData()
.add("group", SerializableDataTypeOverride.ENTITY_GROUP)
.add("priority", SerializableDataTypes.INT, 0),
data -> (type, player) -> new SetEntityGroupPower(type, player,
(EntityGroup)data.get("group"),
data.getInt("priority")
)).allowCondition();
}
}

0 comments on commit ec36e62

Please sign in to comment.