PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-12-02 17:08:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Moved tree stuff to its own package

Browse source
This commit is contained in:
Sollace 2021-08-20 22:25:46 +02:00
parent 320e279d27
commit 58e4fd5ba9
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/minelittlepony/unicopia/Unicopia.java
View file

@ -10,6 +10,7 @@ import java.util.Optional;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import com.minelittlepony.unicopia.ability.data.tree.TreeTypeLoader;
import com.minelittlepony.unicopia.advancement.UCriteria; import com.minelittlepony.unicopia.advancement.UCriteria;
import com.minelittlepony.unicopia.command.Commands; import com.minelittlepony.unicopia.command.Commands;
import com.minelittlepony.unicopia.entity.effect.UPotions; import com.minelittlepony.unicopia.entity.effect.UPotions;

2
src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java
View file

@ -7,9 +7,9 @@ import org.jetbrains.annotations.Nullable;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.minelittlepony.unicopia.BlockDestructionManager; import com.minelittlepony.unicopia.BlockDestructionManager;
import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.TreeType;
import com.minelittlepony.unicopia.ability.data.Hit; import com.minelittlepony.unicopia.ability.data.Hit;
import com.minelittlepony.unicopia.ability.data.Pos; import com.minelittlepony.unicopia.ability.data.Pos;
import com.minelittlepony.unicopia.ability.data.tree.TreeType;
import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.util.PosHelper; import com.minelittlepony.unicopia.util.PosHelper;
import com.minelittlepony.unicopia.util.RayTraceHelper; import com.minelittlepony.unicopia.util.RayTraceHelper;

2
src/main/java/com/minelittlepony/unicopia/TreeType.java → src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeType.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia; package com.minelittlepony.unicopia.ability.data.tree;
import com.minelittlepony.unicopia.util.PosHelper; import com.minelittlepony.unicopia.util.PosHelper;
import com.minelittlepony.unicopia.util.Weighted; import com.minelittlepony.unicopia.util.Weighted;

4
src/main/java/com/minelittlepony/unicopia/TreeTypeLoader.java → src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia; package com.minelittlepony.unicopia.ability.data.tree;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
@ -29,7 +29,7 @@ public class TreeTypeLoader extends JsonDataLoader implements IdentifiableResour
.registerTypeAdapter(Identifier.class, new ToStringAdapter<>(Identifier::new)) .registerTypeAdapter(Identifier.class, new ToStringAdapter<>(Identifier::new))
.create(); .create();
static final TreeTypeLoader INSTANCE = new TreeTypeLoader(); public static final TreeTypeLoader INSTANCE = new TreeTypeLoader();
private final Set<TreeType> entries = new HashSet<>(); private final Set<TreeType> entries = new HashSet<>();

2
src/main/java/com/minelittlepony/unicopia/item/enchantment/PoisonedJokeEnchantment.java
View file

@ -14,8 +14,8 @@ import java.util.stream.Stream;
import org.apache.commons.lang3.reflect.TypeUtils; import org.apache.commons.lang3.reflect.TypeUtils;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.minelittlepony.unicopia.TreeTypeLoader;
import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.ability.data.tree.TreeTypeLoader;
import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.entity.Living;
import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;