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

Merge branch '1.17' of https://github.com/DimensionalDevelopment/DimDoors into 1.17

Browse source
This commit is contained in:
SD 2021-04-13 21:02:25 +05:30
commit a3650576a9
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build.gradle
View file

@ -45,6 +45,11 @@ repositories {
url = "https://dl.bintray.com/ladysnake/libs" url = "https://dl.bintray.com/ladysnake/libs"
} }
maven {
name = 'Ladysnake Mods'
url = 'https://ladysnake.jfrog.io/artifactory/mods'
}
maven { maven {
url = "https://maven.shedaniel.me/" url = "https://maven.shedaniel.me/"
} }
@ -123,12 +128,12 @@ dependencies {
// includeCompile("io.github.BoogieMonster1O1", "OpenWorlds", "c57e3ef") // includeCompile("io.github.BoogieMonster1O1", "OpenWorlds", "c57e3ef")
includeCompile("io.github.cottonmc", "LibGui", "4.0.0-alpha.1+21w11a") includeCompile("io.github.cottonmc", "LibGui", "4.0.0-alpha.1+21w11a")
includeCompile("me.shedaniel.cloth", "cloth-config-fabric", "5.0.16") includeCompile("me.shedaniel.cloth", "cloth-config-fabric", "5.0.16")
includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-base", "3.0.0-nightly.21w06a") includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-base", "3.0.0-nightly.21w14a")
includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-item", "3.0.0-nightly.21w06a") includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-item", "3.0.0-nightly.21w14a")
includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-level", "3.0.0-nightly.21w06a") includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-level", "3.0.0-nightly.21w14a")
includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-util", "3.0.0-nightly.21w06a") includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-util", "3.0.0-nightly.21w14a")
includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-world", "3.0.0-nightly.21w06a") includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-world", "3.0.0-nightly.21w14a")
includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-chunk", "3.0.0-nightly.21w06a") includeCompile("io.github.onyxstudios.Cardinal-Components-API", "cardinal-components-chunk", "3.0.0-nightly.21w14a")
includeCompile("me.sargunvohra.mcmods", "autoconfig1u", "3.3.1") includeCompile("me.sargunvohra.mcmods", "autoconfig1u", "3.3.1")
includeCompile("dev.hephaestus", "seedy-behavior", "1.0.1") includeCompile("dev.hephaestus", "seedy-behavior", "1.0.1")

2
src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java
View file

@ -9,7 +9,7 @@ import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.network.ServerPacketHandler; import org.dimdev.dimdoors.network.ServerPacketHandler;
import org.dimdev.dimdoors.rift.targets.IdMarker; import org.dimdev.dimdoors.rift.targets.IdMarker;
import org.dimdev.dimdoors.api.util.EntityUtils; import org.dimdev.dimdoors.api.util.EntityUtils;
import org.dimdev.dimdoors.world.level.component.CounterComponent; import org.dimdev.dimdoors.item.component.CounterComponent;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.item.TooltipContext; import net.minecraft.client.item.TooltipContext;

2
src/main/java/org/dimdev/dimdoors/world/level/component/CounterComponent.java → src/main/java/org/dimdev/dimdoors/item/component/CounterComponent.java
View file

@ -1,4 +1,4 @@
package org.dimdev.dimdoors.world.level.component; package org.dimdev.dimdoors.item.component;
import dev.onyxstudios.cca.api.v3.item.ItemComponent; import dev.onyxstudios.cca.api.v3.item.ItemComponent;
import org.dimdev.dimdoors.world.level.DimensionalDoorsComponents; import org.dimdev.dimdoors.world.level.DimensionalDoorsComponents;

2
src/main/java/org/dimdev/dimdoors/world/level/DimensionalDoorsComponents.java
View file

@ -12,7 +12,7 @@ import dev.onyxstudios.cca.api.v3.level.LevelComponentFactoryRegistry;
import dev.onyxstudios.cca.api.v3.level.LevelComponentInitializer; import dev.onyxstudios.cca.api.v3.level.LevelComponentInitializer;
import org.dimdev.dimdoors.item.ModItems; import org.dimdev.dimdoors.item.ModItems;
import org.dimdev.dimdoors.world.level.component.ChunkLazilyGeneratedComponent; import org.dimdev.dimdoors.world.level.component.ChunkLazilyGeneratedComponent;
import org.dimdev.dimdoors.world.level.component.CounterComponent; import org.dimdev.dimdoors.item.component.CounterComponent;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry; import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")