1.3.0 (#12)

* Clean up; mostly distillation aparatus

* Little Fixes

* Add recipe for distillation aparatus

* Fix my silly spelling error
Aparatus -> Apparatus

* Change dev, version number & do auto cleans

* Fix reported leaks

* Clean up some warnings

* Fix another leak

* Oops, moss is actually moss_block

* Fix silly mistake

* That was *not* the right way to fix the leaks
Also, it seems that for some reason, now that client is its own variable, eclipse doesn't complain anymore.

* Info

gradle.properties

@@ -6,12 +6,12 @@ yarn_mappings       = 1.17.1+build.10
 loader_version      = 0.11.6
 
 # Mod properties
-mod_version         = 1.2.0
-maven_group         = com.cumulusmc.artofalchemy
+mod_version         = 1.3.0
+maven_group         = dev.cafeteria.artofalchemy
 archives_base_name  = artofalchemy
 
 # Dependencies
-fabric_api_version  = 0.36.1+1.17
+fabric_api_version  = 0.40.1+1.17.1
 
 libgui_version		= 4.1.2+1.17.1
 modmenu_version		= 2.0.2

src/main/java/com/cumulusmc/artofalchemy/AoAConfig.java → src/main/java/dev/cafeteria/artofalchemy/AoAConfig.java

@@ -1,6 +1,7 @@
-package com.cumulusmc.artofalchemy;
+package dev.cafeteria.artofalchemy;
+
+import dev.cafeteria.artofalchemy.util.MateriaRank;
 
-import com.cumulusmc.artofalchemy.util.MateriaRank;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;

src/main/java/com/cumulusmc/artofalchemy/ArtOfAlchemy.java → src/main/java/dev/cafeteria/artofalchemy/ArtOfAlchemy.java

@@ -1,17 +1,22 @@
-package com.cumulusmc.artofalchemy;
+package dev.cafeteria.artofalchemy;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import dev.cafeteria.artofalchemy.block.AoABlocks;
+import dev.cafeteria.artofalchemy.blockentity.AoABlockEntities;
+import dev.cafeteria.artofalchemy.dispenser.AoADispenserBehavior;
+import dev.cafeteria.artofalchemy.essentia.AoAEssentia;
+import dev.cafeteria.artofalchemy.fluid.AoAFluids;
+import dev.cafeteria.artofalchemy.gui.handler.AoAHandlers;
+import dev.cafeteria.artofalchemy.item.AoAItems;
+import dev.cafeteria.artofalchemy.network.AoANetworking;
+import dev.cafeteria.artofalchemy.recipe.AoARecipes;
+import dev.cafeteria.artofalchemy.transport.EssentiaNetworker;
+import dev.cafeteria.artofalchemy.util.AoALoot;
+import dev.cafeteria.artofalchemy.util.AoATags;
 
-import com.cumulusmc.artofalchemy.block.AoABlocks;
-import com.cumulusmc.artofalchemy.blockentity.AoABlockEntities;
-import com.cumulusmc.artofalchemy.dispenser.AoADispenserBehavior;
-import com.cumulusmc.artofalchemy.essentia.AoAEssentia;
-import com.cumulusmc.artofalchemy.fluid.AoAFluids;
-import com.cumulusmc.artofalchemy.gui.handler.AoAHandlers;
-import com.cumulusmc.artofalchemy.item.AoAItems;
-import com.cumulusmc.artofalchemy.network.AoANetworking;
-import com.cumulusmc.artofalchemy.recipe.AoARecipes;
-import com.cumulusmc.artofalchemy.transport.EssentiaNetworker;
-import com.cumulusmc.artofalchemy.util.AoALoot;
-import com.cumulusmc.artofalchemy.util.AoATags;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
@@ -21,9 +26,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 public class ArtOfAlchemy implements ModInitializer {
 

src/main/java/com/cumulusmc/artofalchemy/ArtOfAlchemyClient.java → src/main/java/dev/cafeteria/artofalchemy/ArtOfAlchemyClient.java

@@ -1,8 +1,9 @@
-package com.cumulusmc.artofalchemy;
+package dev.cafeteria.artofalchemy;
+
+import dev.cafeteria.artofalchemy.gui.screen.AoAScreens;
+import dev.cafeteria.artofalchemy.network.AoAClientNetworking;
+import dev.cafeteria.artofalchemy.render.AoARenderers;
 
-import com.cumulusmc.artofalchemy.gui.screen.AoAScreens;
-import com.cumulusmc.artofalchemy.network.AoAClientNetworking;
-import com.cumulusmc.artofalchemy.render.AoARenderers;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

src/main/java/com/cumulusmc/artofalchemy/block/AbstractBlockCentrifuge.java → src/main/java/dev/cafeteria/artofalchemy/block/AbstractBlockCentrifuge.java

@@ -1,21 +1,20 @@
-package com.cumulusmc.artofalchemy.block;
+package dev.cafeteria.artofalchemy.block;
+
+import dev.cafeteria.artofalchemy.essentia.EssentiaContainer;
 
-import com.cumulusmc.artofalchemy.blockentity.AoABlockEntities;
-import com.cumulusmc.artofalchemy.blockentity.BlockEntityCalcinator;
-import com.cumulusmc.artofalchemy.essentia.EssentiaContainer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.entity.BlockEntityTicker;
-import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.state.StateManager.Builder;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.util.*;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -26,8 +25,8 @@ abstract public class AbstractBlockCentrifuge extends Block implements BlockEnti
 	public static final int TANK_SIZE = 4000;
 	public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING;
 	public static final Settings SETTINGS = Settings
-		.of(Material.STONE)
-		.strength(5.0f, 6.0f);
+			.of(Material.STONE)
+			.strength(5.0f, 6.0f);
 	protected EssentiaContainer input = new EssentiaContainer().setCapacity(TANK_SIZE).setInput(true).setOutput(false);
 	protected EssentiaContainer[] outputs;
 
@@ -48,7 +47,7 @@ public BlockState getPlacementState(ItemPlacementContext ctx) {
 
 	@Override
 	public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand,
-							  BlockHitResult hit) {
+			BlockHitResult hit) {
 		if (world.isClient) {
 			return ActionResult.SUCCESS;
 		}
@@ -61,10 +60,12 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
 		return ActionResult.SUCCESS;
 	}
 
+	@Override
 	public BlockState rotate(BlockState state, BlockRotation rotation) {
 		return state.with(FACING, rotation.rotate(state.get(FACING)));
 	}
 
+	@Override
 	public BlockState mirror(BlockState state, BlockMirror mirror) {
 		return state.rotate(mirror.getRotation(state.get(FACING)));
 	}

src/main/java/com/cumulusmc/artofalchemy/block/AoABlocks.java → src/main/java/dev/cafeteria/artofalchemy/block/AoABlocks.java

@@ -1,19 +1,20 @@
-package com.cumulusmc.artofalchemy.block;
-
-import com.cumulusmc.artofalchemy.ArtOfAlchemy;
-import com.cumulusmc.artofalchemy.essentia.Essentia;
-import com.cumulusmc.artofalchemy.essentia.RegistryEssentia;
-import com.cumulusmc.artofalchemy.item.AoAItems;
-import com.cumulusmc.artofalchemy.item.BlockItemMateria;
-import com.cumulusmc.artofalchemy.util.MateriaRank;
+package dev.cafeteria.artofalchemy.block;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import dev.cafeteria.artofalchemy.ArtOfAlchemy;
+import dev.cafeteria.artofalchemy.essentia.Essentia;
+import dev.cafeteria.artofalchemy.essentia.RegistryEssentia;
+import dev.cafeteria.artofalchemy.item.AoAItems;
+import dev.cafeteria.artofalchemy.item.BlockItemMateria;
+import dev.cafeteria.artofalchemy.util.MateriaRank;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class AoABlocks {
 
 	public static final Block ANALYZER = new BlockAnalyzer();
@@ -39,7 +40,7 @@ public static void registerBlocks() {
 		register("analysis_desk", ANALYZER);
 		register("calcination_furnace", CALCINATOR);
 		register("dissolution_chamber", DISSOLVER);
-		register("distillation_aparatus", DISTILLER);
+		register("distillation_apparatus", DISTILLER);
 		register("synthesis_table", SYNTHESIZER);
 		register("projection_altar", PROJECTOR);
 		register("calcination_furnace_plus", CALCINATOR_PLUS);

src/main/java/com/cumulusmc/artofalchemy/block/BlockAlkahest.java → src/main/java/dev/cafeteria/artofalchemy/block/BlockAlkahest.java

@@ -1,6 +1,9 @@
-package com.cumulusmc.artofalchemy.block;
+package dev.cafeteria.artofalchemy.block;
+
+import java.util.Random;
+
+import dev.cafeteria.artofalchemy.fluid.AoAFluids;
 
-import com.cumulusmc.artofalchemy.fluid.AoAFluids;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
@@ -12,12 +15,10 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import java.util.Random;
-
 public class BlockAlkahest extends FluidBlock {
 
 	public static final Settings SETTINGS = Settings.copy(Blocks.WATER)
-		.luminance((state) -> 9);
+			.luminance((state) -> 9);
 
 	public BlockAlkahest() {
 		super(AoAFluids.ALKAHEST, SETTINGS);
@@ -26,8 +27,8 @@ public BlockAlkahest() {
 	@Override
 	public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
 		entity.damage(DamageSource.MAGIC, 2);
-//		world.playSound(entity.getX(), entity.getY(), entity.getZ(), SoundEvents.ENTITY_GENERIC_BURN,
-//				entity.getSoundCategory(), 1.0F, 1.0F, false);
+		//		world.playSound(entity.getX(), entity.getY(), entity.getZ(), SoundEvents.ENTITY_GENERIC_BURN,
+		//				entity.getSoundCategory(), 1.0F, 1.0F, false);
 		world.addParticle(ParticleTypes.LARGE_SMOKE, entity.getX(), entity.getY(), entity.getZ(),
 				0.0D, 0.0D, 0.0D);
 	}