PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move trinkets and seasons code to the compat package

Browse source
This commit is contained in:
Sollace 2023-09-10 22:14:27 +01:00
parent 6f0a11297a
commit 6d7345c389
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
28 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import com.minelittlepony.unicopia.advancement.UCriteria;
import com.minelittlepony.unicopia.block.UBlocks;
import com.minelittlepony.unicopia.block.state.StateMapLoader;
import com.minelittlepony.unicopia.command.Commands;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.container.SpellbookChapterLoader;
import com.minelittlepony.unicopia.container.UScreenHandlers;
import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
@ -35,7 +36,6 @@ import com.minelittlepony.unicopia.server.world.UGameRules;
import com.minelittlepony.unicopia.server.world.UWorldGen;
import com.minelittlepony.unicopia.server.world.WeatherConditions;
import com.minelittlepony.unicopia.server.world.ZapAppleStageStore;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
public class Unicopia implements ModInitializer {
public static final String DEFAULT_NAMESPACE = "unicopia";

2
src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java
View file

@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.ability.EarthPonyKickAbility.Buckable;
import com.minelittlepony.unicopia.seasons.FertilizableUtil;
import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil;
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
import net.minecraft.block.*;

2
src/main/java/com/minelittlepony/unicopia/block/PineappleCropBlock.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.unicopia.block;
import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.seasons.FertilizableUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;

2
src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java
View file

@ -4,7 +4,7 @@ import java.util.function.Supplier;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.seasons.FertilizableUtil;
import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil;
import net.minecraft.block.*;
import net.minecraft.item.ItemConvertible;

2
src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java
View file

@ -17,11 +17,11 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellTyp
import com.minelittlepony.unicopia.client.FlowingText;
import com.minelittlepony.unicopia.client.gui.*;
import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.*;
import com.minelittlepony.unicopia.compat.trinkets.TrinketSlotBackSprites;
import com.minelittlepony.unicopia.container.*;
import com.minelittlepony.unicopia.container.inventory.*;
import com.minelittlepony.unicopia.network.Channel;
import com.minelittlepony.unicopia.network.MsgSpellbookStateChanged;
import com.minelittlepony.unicopia.trinkets.TrinketSlotBackSprites;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;

2
src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java
View file

@ -9,9 +9,9 @@ import com.minelittlepony.client.model.IPonyModel;
import com.minelittlepony.common.util.Color;
import com.minelittlepony.unicopia.client.render.BraceletFeatureRenderer;
import com.minelittlepony.unicopia.client.render.BraceletFeatureRenderer.BraceletModel;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.item.FriendshipBraceletItem;
import com.minelittlepony.unicopia.item.GlowableItem;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import net.minecraft.client.model.Dilation;
import net.minecraft.client.network.ClientPlayerEntity;

2
src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java
View file

@ -6,8 +6,8 @@ import com.minelittlepony.api.model.gear.IGear;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.unicopia.*;
import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.util.AnimationUtil;
import net.fabricmc.api.ClientModInitializer;

2
src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java
View file

@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.client.render;
import com.minelittlepony.common.util.Color;
import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.client.minelittlepony.MineLPDelegate;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.item.*;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import net.minecraft.client.model.Dilation;
import net.minecraft.client.model.Model;

2
src/main/java/com/minelittlepony/unicopia/seasons/FertilizableUtil.java → src/main/java/com/minelittlepony/unicopia/compat/seasons/FertilizableUtil.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.seasons;
package com.minelittlepony.unicopia.compat.seasons;
import com.minelittlepony.unicopia.mixin.seasons.MixinFertilizableUtil;

2
src/main/java/com/minelittlepony/unicopia/trinkets/SpellbookTrinketSlot.java → src/main/java/com/minelittlepony/unicopia/compat/trinkets/SpellbookTrinketSlot.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.trinkets;
package com.minelittlepony.unicopia.compat.trinkets;
import com.minelittlepony.unicopia.container.SpellbookScreenHandler;
import com.minelittlepony.unicopia.container.inventory.InventorySlot;

2
src/main/java/com/minelittlepony/unicopia/trinkets/TrinketSlotBackSprites.java → src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketSlotBackSprites.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.trinkets;
package com.minelittlepony.unicopia.compat.trinkets;
import java.util.HashMap;
import java.util.Map;

2
src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegate.java → src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.trinkets;
package com.minelittlepony.unicopia.compat.trinkets;
import java.util.*;
import java.util.stream.Collectors;

2
src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegateImpl.java → src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegateImpl.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.trinkets;
package com.minelittlepony.unicopia.compat.trinkets;
import java.util.*;
import java.util.stream.Collectors;

2
src/main/java/com/minelittlepony/unicopia/trinkets/UnicopiaTrinket.java → src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.trinkets;
package com.minelittlepony.unicopia.compat.trinkets;
import java.util.UUID;

2
src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java
View file

@ -6,11 +6,11 @@ import java.util.function.Predicate;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.container.inventory.*;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.mojang.datafixers.util.Pair;
import net.minecraft.enchantment.EnchantmentHelper;

2
src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java
View file

@ -4,8 +4,8 @@ import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Stream;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.util.*;
import net.minecraft.entity.LivingEntity;

2
src/main/java/com/minelittlepony/unicopia/entity/Living.java
View file

@ -17,6 +17,7 @@ import com.minelittlepony.unicopia.ability.magic.SpellPredicate;
import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell;
import com.minelittlepony.unicopia.ability.magic.spell.Situation;
import com.minelittlepony.unicopia.advancement.UCriteria;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.behaviour.EntityAppearance;
import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity;
import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck;
@ -32,7 +33,6 @@ import com.minelittlepony.unicopia.network.datasync.Transmittable;
import com.minelittlepony.unicopia.particle.ParticleUtils;
import com.minelittlepony.unicopia.projectile.ProjectileImpactListener;
import com.minelittlepony.unicopia.server.world.DragonBreathStore;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.util.*;
import it.unimi.dsi.fastutil.floats.Float2ObjectFunction;

2
src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java
View file

@ -4,10 +4,10 @@ import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.UTags;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.Living;
import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.util.MeteorlogicalUtil;
import net.minecraft.entity.Entity;

2
src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
View file

@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation;
import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation.Recipient;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.client.render.PlayerPoser.AnimationInstance;
import com.minelittlepony.unicopia.*;
import com.minelittlepony.unicopia.ability.*;
@ -30,7 +31,6 @@ import com.minelittlepony.unicopia.util.*;
import com.minelittlepony.unicopia.network.*;
import com.minelittlepony.unicopia.network.datasync.EffectSync.UpdateCallback;
import com.minelittlepony.unicopia.server.world.UGameRules;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.common.util.animation.LinearInterpolator;
import com.google.common.collect.Streams;
import com.minelittlepony.common.util.animation.Interpolator;

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

@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
import com.google.common.collect.ImmutableMultimap;
import com.minelittlepony.unicopia.InteractionManager;
import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.*;
import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
import com.minelittlepony.unicopia.entity.effect.UEffects;
@ -16,7 +17,6 @@ import com.minelittlepony.unicopia.particle.FollowingParticleEffect;
import com.minelittlepony.unicopia.particle.ParticleUtils;
import com.minelittlepony.unicopia.particle.UParticles;
import com.minelittlepony.unicopia.server.world.UnicopiaWorldProperties;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.util.VecHelper;
import it.unimi.dsi.fastutil.floats.Float2ObjectFunction;

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

@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.client.MinecraftClient;

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

@ -9,8 +9,8 @@ import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.ability.magic.Caster;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;

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

@ -1,6 +1,6 @@
package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.entity.EquipmentSlot;

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

@ -1,6 +1,6 @@
package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.block.DispenserBlock;

2
src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinScreenHandler.java
View file

@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.*;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import net.minecraft.item.ItemStack;
import net.minecraft.screen.ScreenHandler;

3
src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketInventory.java
View file

@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.mixin.trinkets;
import org.spongepowered.asm.mixin.*;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegateImpl;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegateImpl;
import dev.emi.trinkets.api.*;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;

3
src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketItem.java
View file

@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.mixin.trinkets;
import org.spongepowered.asm.mixin.*;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegateImpl;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegateImpl;
import dev.emi.trinkets.api.*;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;

3
src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketSlot.java
View file

@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.mixin.trinkets;
import org.spongepowered.asm.mixin.*;
import com.minelittlepony.unicopia.trinkets.TrinketsDelegateImpl;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegateImpl;
import dev.emi.trinkets.*;
import dev.emi.trinkets.api.*;
import net.minecraft.item.ItemStack;