Undo

Abes-Hutt · Jan 11, 2025 · 6b40636 · 6b40636
1 parent 8bd249a
commit 6b40636
Show file tree

Hide file tree

Showing 21 changed files with 3 additions and 275 deletions.
diff --git a/common/src/main/java/abeshutt/staracademy/StarAcademyMod.java b/common/src/main/java/abeshutt/staracademy/StarAcademyMod.java
@@ -1,9 +1,9 @@
 package abeshutt.staracademy;
 
+import abeshutt.staracademy.compat.enhancedcelestials.EnhancedCelestialsCompat;
 import abeshutt.staracademy.event.CommonEvents;
 import abeshutt.staracademy.init.ModConfigs;
 import abeshutt.staracademy.init.ModRegistries;
-import abeshutt.staracademy.compat.enhancedcelestials.EnhancedCelestialsCompat;
 import abeshutt.staracademy.world.random.JavaRandom;
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.CobblemonItems;

diff --git a/common/src/main/java/abeshutt/staracademy/config/BiomeGroupsConfig.java b/common/src/main/java/abeshutt/staracademy/config/BiomeGroupsConfig.java
@@ -1,16 +1,10 @@
 package abeshutt.staracademy.config;
 
 import abeshutt.staracademy.data.biome.BiomePredicate;
-import abeshutt.staracademy.data.item.ItemPredicate;
-import abeshutt.staracademy.data.item.PartialItem;
-import abeshutt.staracademy.data.item.PartialStack;
-import abeshutt.staracademy.data.nbt.PartialCompoundNbt;
 import com.google.gson.annotations.Expose;
-import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
-import org.spongepowered.asm.mixin.Dynamic;
 
 import java.util.HashSet;
 import java.util.LinkedHashMap;

diff --git a/common/src/main/java/abeshutt/staracademy/config/ForceSpawnItemConfig.java b/common/src/main/java/abeshutt/staracademy/config/ForceSpawnItemConfig.java
diff --git a/common/src/main/java/abeshutt/staracademy/config/PokemonSpawnEntry.java b/common/src/main/java/abeshutt/staracademy/config/PokemonSpawnEntry.java
diff --git a/common/src/main/java/abeshutt/staracademy/data/adapter/util/Vec3dAdapter.java b/common/src/main/java/abeshutt/staracademy/data/adapter/util/Vec3dAdapter.java
@@ -10,7 +10,6 @@
 import io.netty.buffer.ByteBuf;
 import net.minecraft.nbt.*;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.Vec3d;
 
 import java.io.DataInput;
 import java.io.DataOutput;

diff --git a/common/src/main/java/abeshutt/staracademy/data/biome/BiomePlacement.java b/common/src/main/java/abeshutt/staracademy/data/biome/BiomePlacement.java
@@ -2,7 +2,6 @@
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.WorldAccess;
 
 public interface BiomePlacement<T> extends BiomePredicate {
 

diff --git a/common/src/main/java/abeshutt/staracademy/data/biome/BiomePredicate.java b/common/src/main/java/abeshutt/staracademy/data/biome/BiomePredicate.java
@@ -11,7 +11,6 @@
 import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtString;
 import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;

diff --git a/common/src/main/java/abeshutt/staracademy/data/biome/OrBiomePredicate.java b/common/src/main/java/abeshutt/staracademy/data/biome/OrBiomePredicate.java
@@ -1,6 +1,5 @@
 package abeshutt.staracademy.data.biome;
 
-import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;
 

diff --git a/common/src/main/java/abeshutt/staracademy/data/biome/PartialBiome.java b/common/src/main/java/abeshutt/staracademy/data/biome/PartialBiome.java
@@ -2,21 +2,19 @@
 
 import abeshutt.staracademy.data.adapter.Adapters;
 import abeshutt.staracademy.data.adapter.ISimpleAdapter;
-import abeshutt.staracademy.data.nbt.PartialCompoundNbt;
 import com.google.gson.JsonElement;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.nbt.NbtElement;
-import net.minecraft.registry.*;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.state.property.Property;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.InvalidIdentifierException;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.WorldAccess;
 import net.minecraft.world.biome.Biome;
 
 import java.util.Optional;

diff --git a/common/src/main/java/abeshutt/staracademy/data/biome/PartialBiomeGroup.java b/common/src/main/java/abeshutt/staracademy/data/biome/PartialBiomeGroup.java
@@ -3,7 +3,6 @@
 import abeshutt.staracademy.init.ModConfigs;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.InvalidIdentifierException;

diff --git a/common/src/main/java/abeshutt/staracademy/data/biome/PartialBiomeTag.java b/common/src/main/java/abeshutt/staracademy/data/biome/PartialBiomeTag.java
@@ -2,9 +2,6 @@
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.InvalidIdentifierException;

diff --git a/common/src/main/java/abeshutt/staracademy/entity/NurseNPCEntity.java b/common/src/main/java/abeshutt/staracademy/entity/NurseNPCEntity.java
@@ -1,17 +1,13 @@
 package abeshutt.staracademy.entity;
 
 import abeshutt.staracademy.StarAcademyMod;
-import abeshutt.staracademy.init.ModWorldData;
-import abeshutt.staracademy.world.data.SafariData;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ai.goal.LookAroundGoal;
 import net.minecraft.entity.ai.goal.LookAtEntityGoal;
 import net.minecraft.entity.ai.goal.SwimGoal;
 import net.minecraft.entity.mob.PathAwareEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
-import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;

diff --git a/common/src/main/java/abeshutt/staracademy/entity/PartnerNPCConversation.java b/common/src/main/java/abeshutt/staracademy/entity/PartnerNPCConversation.java
@@ -10,14 +10,12 @@
 import com.cobblemon.mod.common.api.events.pokemon.PokemonSentPostEvent;
 import com.cobblemon.mod.common.pokemon.Species;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import net.minecraft.world.World;
 
 import java.util.Optional;
 import java.util.UUID;

diff --git a/common/src/main/java/abeshutt/staracademy/entity/renderer/ShootingStarRenderer.java b/common/src/main/java/abeshutt/staracademy/entity/renderer/ShootingStarRenderer.java
@@ -2,28 +2,12 @@
 
 import abeshutt.staracademy.entity.ShootingStarEntity;
 import abeshutt.staracademy.entity.model.ShootingStarModel;
-import abeshutt.staracademy.entity.model.StarBadgeBeltModel;
-import abeshutt.staracademy.init.ModItems;
-import abeshutt.staracademy.world.data.StarBadgeData;
-import abeshutt.staracademy.world.inventory.BaseInventory;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.*;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
-import net.minecraft.client.render.entity.feature.FeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.PlayerEntityModel;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.RotationAxis;
-import net.minecraft.util.math.Vec3d;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class ShootingStarRenderer extends EntityRenderer<ShootingStarEntity> {
 

diff --git a/common/src/main/java/abeshutt/staracademy/init/ModConfigs.java b/common/src/main/java/abeshutt/staracademy/init/ModConfigs.java
@@ -22,7 +22,6 @@ public class ModConfigs extends ModRegistries {
     public static WardrobeConfig WARDROBE;
     public static NPCConfig NPC;
     public static DuelingConfig DUELING;
-    public static ForceSpawnItemConfig FORCE_SPAWN_ITEM;
 
     public static void register(boolean initialization) {
         TILE_GROUPS = new TileGroupsConfig().read();
@@ -37,7 +36,6 @@ public static void register(boolean initialization) {
         WARDROBE = new WardrobeConfig().read();
         NPC = new NPCConfig().read();
         DUELING = new DuelingConfig().read();
-        FORCE_SPAWN_ITEM = new ForceSpawnItemConfig().read();
 
         if(!initialization) {
             POST_LOAD.forEach(Runnable::run);