work: import cleanup and menu work

build.gradle

@@ -21,8 +21,6 @@ base {
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
-
 neoForge {
     version = project.neo_version
 
@@ -75,7 +73,7 @@ configurations {
 }
 
 dependencies {
-//    implementation "com.aetherteam.aether:aether:${project.aether_version}"
+    //implementation "com.aetherteam.aether:aether:${project.aether_version}"
     implementation "blank:aether-1.21.1-1.5.10:neoforge"
 
     implementation "com.aetherteam.beyondparity:aether_beyond_parity:${project.beyond_parity_version}"

gradle.properties

@@ -30,12 +30,12 @@ neo_version_range=[21.1.72,)
 loader_version_range=[4,)
 
 # Dependencies
-aether_version=1.21.1-1.5.4-neoforge
+aether_version=1.21.1-1.5.10-neoforge
 aether_version_range=[1.5.4,)
 beyond_parity_version=1.21.1-1.0.0-neoforge
 beyond_parity_version_range=[1.0.0,)
 nitrogen_version=1.21.1-1.1.23-neoforge
-cumulus_version=1.21.1-2.0.0-neoforge
+cumulus_version=1.21.1-2.0.8-neoforge
 accessories_version=1.1.0-beta.49
 aeroblender_version=1.0.0
 terrablender_version=1.21.1-4.1.0.5

src/generated/resources/assets/aether_genesis/lang/en_us.json

@@ -336,5 +336,6 @@
   "subtitles.aether_genesis.item.accessory.equip_lucky_bell": "Lucky Bell jingles",
   "subtitles.aether_genesis.item.accessory.equip_mouse_ear_cap": "Mouse Ear Cap rustles",
   "subtitles.aether_genesis.item.accessory.equip_skyroot_ring": "Skyroot Ring clunks",
-  "subtitles.aether_genesis.item.accessory.equip_swetty_pendant": "Swetty Pendant splats"
+  "subtitles.aether_genesis.item.accessory.equip_swetty_pendant": "Swetty Pendant splats",
+  "aether_genesis.menu_title.aether_genesis": "Aether Genesis"
 }

src/main/java/com/aetherteam/genesis/api/GenesisMenus.java

@@ -0,0 +1,27 @@
+package com.aetherteam.genesis.api;
+
+import com.aetherteam.aether.client.gui.screen.menu.AetherTitleScreen;
+import com.aetherteam.cumulus.api.CumulusEntrypoint;
+import com.aetherteam.cumulus.api.Menu;
+import com.aetherteam.cumulus.api.MenuInitializer;
+import com.aetherteam.cumulus.api.MenuRegisterCallback;
+import com.aetherteam.genesis.AetherGenesis;
+import com.aetherteam.genesis.client.gui.screen.menu.GenesisTitleScreen;
+import net.minecraft.client.renderer.CubeMap;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+
+@CumulusEntrypoint
+public class GenesisMenus implements MenuInitializer {
+
+    private static final ResourceLocation GENESIS_ICON = ResourceLocation.fromNamespaceAndPath(AetherGenesis.MODID,"textures/gui/menu_api/menu_icon_aether_genesis.png");
+
+    private static final Component GENESIS_NAME = Component.translatable("aether_genesis.menu_title.aether_genesis");
+
+
+    public static final Menu GENESIS = new Menu(GENESIS_ICON, GENESIS_NAME, new GenesisTitleScreen(), new Menu.Properties().music(AetherTitleScreen.MENU).panorama(new CubeMap(ResourceLocation.fromNamespaceAndPath(AetherGenesis.MODID, "textures/gui/title/panorama/panorama"))));
+
+    public void registerMenus(MenuRegisterCallback menuRegisterCallback) {
+        menuRegisterCallback.registerMenu(ResourceLocation.fromNamespaceAndPath(AetherGenesis.MODID, "aether_genesis"), GENESIS);
+    }
+}

src/main/java/com/aetherteam/genesis/attachment/GenesisPlayerAttachment.java

@@ -1,9 +1,6 @@
 package com.aetherteam.genesis.attachment;
 
-import com.aetherteam.aether.Aether;
-import com.aetherteam.aether.item.EquipmentUtil;
 import com.aetherteam.genesis.entity.companion.Companion;
-import com.aetherteam.genesis.entity.companion.CompanionMob;
 import com.aetherteam.genesis.item.accessories.companion.CompanionAccessory;
 import com.aetherteam.genesis.network.packet.GenesisPlayerSyncPacket;
 import com.aetherteam.nitrogen.attachment.INBTSynchable;

src/main/java/com/aetherteam/genesis/block/miscellaneous/ColdFireBlock.java

@@ -13,7 +13,11 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.*;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;

src/main/java/com/aetherteam/genesis/block/natural/OrangeTreeBlock.java

@@ -13,7 +13,11 @@
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.*;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.BonemealableBlock;

src/main/java/com/aetherteam/genesis/client/AetherGenesisClient.java

@@ -1,6 +1,5 @@
 package com.aetherteam.genesis.client;
 
-import com.aetherteam.aether.Aether;
 import com.aetherteam.aether.AetherConfig;
 import com.aetherteam.aether.client.AetherClient;
 import com.aetherteam.aether.item.AetherItems;

src/main/java/com/aetherteam/genesis/client/gui/screen/menu/GenesisTitleScreen.java

@@ -0,0 +1,6 @@
+package com.aetherteam.genesis.client.gui.screen.menu;
+
+import com.aetherteam.aether.client.gui.screen.menu.AetherTitleScreen;
+
+public class GenesisTitleScreen extends AetherTitleScreen {
+}

src/main/java/com/aetherteam/genesis/client/particle/TempestElectricityParticle.java

@@ -1,7 +1,11 @@
 package com.aetherteam.genesis.client.particle;
 
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.particle.*;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.particle.ParticleProvider;
+import net.minecraft.client.particle.ParticleRenderType;
+import net.minecraft.client.particle.SpriteSet;
+import net.minecraft.client.particle.TextureSheetParticle;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;

src/main/java/com/aetherteam/genesis/client/renderer/accessory/model/MouseEarCapModel.java

@@ -5,7 +5,11 @@
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.world.entity.LivingEntity;
 
 public class MouseEarCapModel extends HumanoidModel<LivingEntity> {

src/main/java/com/aetherteam/genesis/client/renderer/blockentity/AltarRenderer.java

@@ -10,7 +10,11 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;

src/main/java/com/aetherteam/genesis/client/renderer/entity/AbstractGolemModel.java

@@ -5,7 +5,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.world.entity.Entity;
 
 public abstract class AbstractGolemModel<T extends Entity> extends EntityModel<T> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/CogProtectileModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 
 public class CogProtectileModel extends EntityModel<CogProjectile> {
 	public final ModelPart cog;

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/FangrinModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class FangrinModel extends EntityModel<Fangrin> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/FrostboundSpriteModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class FrostboundSpriteModel extends EntityModel<FrostboundSprite> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/FrostpineTotemModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 
 public class FrostpineTotemModel extends EntityModel<FrostpineTotem> {
 	private final ModelPart totem;

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/HostEyeProjectileModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 
 public class HostEyeProjectileModel extends EntityModel<HostEyeProjectile> {
 	private final ModelPart eye;

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/KraisithModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class KraisithModel extends EntityModel<Kraisith> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/LabyrinthEyeModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 
 import java.util.List;
 

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/NexSpiritModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class NexSpiritModel extends EntityModel<NexSpirit> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/SentryGuardianModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class SentryGuardianModel extends EntityModel<SentryGuardian> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/ShadeOfArkenzusModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class ShadeOfArkenzusModel extends EntityModel<ShadeOfArkenzus> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/SliderHostMimicModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class SliderHostMimicModel extends EntityModel<SliderHostMimic> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/WispModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class WispModel extends EntityModel<Wisp> {

src/main/java/com/aetherteam/genesis/client/renderer/entity/model/ZephyrooModel.java

@@ -6,7 +6,11 @@
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.util.Mth;
 
 public class ZephyrooModel<T extends Zephyroo> extends EntityModel<T> {

src/main/java/com/aetherteam/genesis/data/generators/GenesisAdvancementData.java

@@ -13,7 +13,13 @@
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.advancements.AdvancementRequirements;
 import net.minecraft.advancements.AdvancementType;
-import net.minecraft.advancements.critereon.*;
+import net.minecraft.advancements.critereon.ConsumeItemTrigger;
+import net.minecraft.advancements.critereon.DamageSourcePredicate;
+import net.minecraft.advancements.critereon.EntityPredicate;
+import net.minecraft.advancements.critereon.InventoryChangeTrigger;
+import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.advancements.critereon.KilledTrigger;
+import net.minecraft.advancements.critereon.TagPredicate;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.network.chat.Component;

src/main/java/com/aetherteam/genesis/data/resources/registries/GenesisConfiguredFeatures.java

@@ -34,7 +34,11 @@
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.WeightedPlacedFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.*;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.BlobFoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;

src/main/java/com/aetherteam/genesis/data/resources/registries/GenesisPlacedFeatures.java

@@ -17,7 +17,11 @@
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.VerticalAnchor;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import net.minecraft.world.level.levelgen.placement.*;
+import net.minecraft.world.level.levelgen.placement.BiomeFilter;
+import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
+import net.minecraft.world.level.levelgen.placement.PlacedFeature;
+import net.minecraft.world.level.levelgen.placement.PlacementModifier;
+import net.minecraft.world.level.levelgen.placement.RarityFilter;
 
 import java.util.List;