Add TODO for coffee saturation

Bumped for FC

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Actually Additions
 
-mod_version=1.2.7
+mod_version=1.2.8
 
 # Forge
 game_version=1.20.4

src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246

@@ -1,4 +1,4 @@
-// 1.20.4	2024-03-13T16:30:00.2078814	Item Recipes
+// 1.20.4	2024-03-14T17:01:13.6665594	Item Recipes
 d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json
 f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json
 d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json
@@ -82,6 +82,7 @@ ffa7a52a39d9261b9c90c62709183a1f2d8f8352 data/actuallyadditions/recipes/drill_up
 17d778888263c745217e8f1f7322b2245b99875d data/actuallyadditions/recipes/engineers_goggles_advanced.json
 86ebb8d24b81682bf376f6cba628bcb13d62ed41 data/actuallyadditions/recipes/filter.json
 811730c9a8496dd65e208a36d015b0671e86df1b data/actuallyadditions/recipes/gold_aiot.json
+8b2ce2abfa8f78f7903c22347a54cdcf018d03eb data/actuallyadditions/recipes/handheld_filler.json
 a4e0e3bb72d472302f2ab4e5d282cbc7fd6882a6 data/actuallyadditions/recipes/iron_aiot.json
 5615f6ad2e28e9c105491acb965e763dfe8cacab data/actuallyadditions/recipes/laser_upgrade_invisibility.json
 38f744e92f1a5ff6a64e37cdfbb646422f741b3c data/actuallyadditions/recipes/laser_upgrade_range.json

src/generated/resources/.cache/fa43e5ef6ac83dd009de17d3b434e29660c4c3fc

@@ -1,4 +1,11 @@
-// 1.20.4	2024-03-12T17:06:32.3158961	Mining Lens Recipes
+// 1.20.4	2024-03-14T16:41:17.9423551	Mining Lens Recipes
+2e77c114530406cd2b3c59a921817803bb718b68 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json
+e791752df12b4dd6c337e160857117f298bbe52b data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json
+00cb1642560fbd392263735bc697e5a24417b612 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json
+b9e872f89dc2c45d54ee0215a4a335949baee42a data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json
+39ef8ef0bddee11a9e0d3a5e436cd1f5a787659d data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json
+1cddaac7b3a3310dc2398f1be3cd100758fb1f38 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json
+f1c2091a2c4bbb81e1908bb9c4ebbcc0bae492b2 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json
 7341f498818439ac0a9272a1beaa8f19389012ef data/actuallyadditions/recipes/mininglens/nether_ancient_debris.json
 411b455c637359f1f46df6fced8cd7558436e938 data/actuallyadditions/recipes/mininglens/nether_nether_gold_ore.json
 7227ee2a53f520facb7fe8f7b34a1a74c9a49e85 data/actuallyadditions/recipes/mininglens/nether_nether_quartz_ore.json

src/generated/resources/data/actuallyadditions/recipes/handheld_filler.json

@@ -0,0 +1,29 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "B": {
+      "item": "actuallyadditions:triple_battery"
+    },
+    "C": {
+      "item": "actuallyadditions:advanced_coil"
+    },
+    "D": {
+      "item": "actuallyadditions:diamatine_crystal"
+    },
+    "I": {
+      "item": "actuallyadditions:empowered_enori_crystal"
+    },
+    "P": {
+      "item": "actuallyadditions:palis_crystal"
+    }
+  },
+  "pattern": [
+    "IPI",
+    "DCD",
+    " B "
+  ],
+  "result": {
+    "item": "actuallyadditions:handheld_filler"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_coal_ore"
+  },
+  "weight": 2000
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_diamond_ore"
+  },
+  "weight": 50
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_emerald_ore"
+  },
+  "weight": 30
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_gold_ore"
+  },
+  "weight": 500
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_iron_ore"
+  },
+  "weight": 3000
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_lapis_ore"
+  },
+  "weight": 250
+}

src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "item": "minecraft:deepslate"
+  },
+  "result": {
+    "item": "minecraft:deepslate_redstone_ore"
+  },
+  "weight": 200
+}

src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java

@@ -88,7 +88,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
             .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
 
         //Filling Wand
-/*        Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get())
+        Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get())
             .pattern("IPI")
             .pattern("DCD")
             .pattern(" B ")
@@ -96,7 +96,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
             .define('P', ActuallyItems.PALIS_CRYSTAL.get())
             .define('C', ActuallyItems.ADVANCED_COIL.get())
             .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
-            .define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput);*/ //TODO not done yet
+            .define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput);
 
         //Bag
         Recipe.shaped(ActuallyItems.TRAVELERS_SACK.get())

src/main/java/de/ellpeck/actuallyadditions/data/MiningLensGenerator.java

@@ -47,6 +47,14 @@ public class MiningLensGenerator extends RecipeProvider {
         buildTagOre(consumer, Tags.Items.NETHERRACK, "nether", weight, output);
     }
 
+    private void buildDeepSlateOre(RecipeOutput consumer, int weight, ItemLike output) {
+        consumer.accept(folderRecipe("mininglens", "deepslate_" + getItemName(output)), new MiningLensRecipe(
+                Ingredient.of(Items.DEEPSLATE),
+                weight,
+                output.asItem().getDefaultInstance()
+        ), null);
+    }
+
     private void buildTagOre(RecipeOutput consumer, TagKey<Item> tag, String prefix, int weight, ItemLike output) {
         consumer.accept(folderRecipe("mininglens", prefix + "_" + getItemName(output)), new MiningLensRecipe(
                 Ingredient.of(tag),
@@ -67,5 +75,13 @@ public class MiningLensGenerator extends RecipeProvider {
         buildNetherOre(consumer, 3000, Items.NETHER_QUARTZ_ORE);
         buildStoneOre(consumer, 3000, ActuallyBlocks.BLACK_QUARTZ_ORE.getItem());
         buildNetherOre(consumer, 1, Items.ANCIENT_DEBRIS);
+
+        buildDeepSlateOre(consumer, 2000, Items.DEEPSLATE_COAL_ORE);
+        buildDeepSlateOre(consumer, 3000, Items.DEEPSLATE_IRON_ORE);
+        buildDeepSlateOre(consumer, 500, Items.DEEPSLATE_GOLD_ORE);
+        buildDeepSlateOre(consumer, 50, Items.DEEPSLATE_DIAMOND_ORE);
+        buildDeepSlateOre(consumer, 250, Items.DEEPSLATE_LAPIS_ORE);
+        buildDeepSlateOre(consumer, 200, Items.DEEPSLATE_REDSTONE_ORE);
+        buildDeepSlateOre(consumer, 30, Items.DEEPSLATE_EMERALD_ORE);
     }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/DirectionalBlock.java

@@ -3,6 +3,8 @@ package de.ellpeck.actuallyadditions.mod.blocks.base;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -28,6 +30,16 @@ public abstract class DirectionalBlock extends BlockBase {
         builder.add(FACING);
     }
 
+    @Override
+    public BlockState rotate(BlockState pState, Rotation pRot) {
+        return pState.setValue(FACING, pRot.rotate(pState.getValue(FACING)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState pState, Mirror pMirror) {
+        return pState.rotate(pMirror.getRotation(pState.getValue(FACING)));
+    }
+
     public abstract static class Container extends BlockContainerBase {
         public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 

src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java

@@ -103,7 +103,7 @@ public final class ActuallyItems {
     public static final DeferredItem<ItemEngineerGoggles> ENGINEERS_GOGGLES = ITEMS.register("engineers_goggles", () -> new ItemEngineerGoggles(false));
     public static final DeferredItem<ItemLaserRelayUpgrade> LASER_UPGRADE_RANGE = ITEMS.register("laser_upgrade_range", ItemLaserRelayUpgrade::new);
     public static final DeferredItem<ItemLaserRelayUpgrade> LASER_UPGRADE_INVISIBILITY = ITEMS.register("laser_upgrade_invisibility", ItemLaserRelayUpgrade::new);
-    public static final DeferredItem<ItemFillingWand> HANDHELD_FILLER = ITEMS.register("handheld_filler", ItemFillingWand::new);
+    public static final DeferredItem<Filler> HANDHELD_FILLER = ITEMS.register("handheld_filler", Filler::new);
     public static final DeferredItem<Sack> TRAVELERS_SACK = ITEMS.register("travelers_sack", () -> new Sack(false));
     public static final DeferredItem<Sack> VOID_SACK = ITEMS.register("void_sack", () -> new Sack(true));
     public static final DeferredItem<Worm> WORM = ITEMS.register("worm", Worm::new);

src/main/java/de/ellpeck/actuallyadditions/mod/items/Filler.java

@@ -40,9 +40,9 @@ import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Optional;
 
-public class ItemFillingWand extends ItemEnergy {
+public class Filler extends ItemEnergy {
 
-    public ItemFillingWand() {
+    public Filler() {
         super(500000, 1000);
     }
 
@@ -143,7 +143,7 @@ public class ItemFillingWand extends ItemEnergy {
 
             if (isSelected) {
                 if (entity instanceof Player player && stack.hasTag()) {
-	                boolean creative = player.isCreative();
+                    boolean creative = player.isCreative();
 
                     CompoundTag compound = stack.getOrCreateTag();
 

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java

@@ -35,7 +35,7 @@ import net.neoforged.api.distmarker.OnlyIn;
 import javax.annotation.Nullable;
 import java.util.List;
 
-public class ItemCoffee extends ItemBase {
+public class ItemCoffee extends ItemBase { //TODO: Do we want to change the saturation? Currently it's 5.0F which becomes 40 in game. That's a lot of saturation.
     private static final FoodProperties FOOD = new FoodProperties.Builder().nutrition(8).saturationMod(5.0F).alwaysEat().build();
 
     public ItemCoffee() {
@@ -87,7 +87,7 @@ public class ItemCoffee extends ItemBase {
         applyPotionEffectsFromStack(stack, livingEntity);
         theStack.setDamageValue(theStack.getDamageValue() + 1);
         if (theStack.getMaxDamage() - theStack.getDamageValue() < 0) {
-            return new ItemStack(ActuallyItems.COFFEE_CUP.get());
+            return new ItemStack(ActuallyItems.EMPTY_CUP.get());
         } else {
             return theStack;
         }

src/main/resources/assets/actuallyadditions/lang/en_us.json

@@ -326,8 +326,6 @@
   "item.actuallyadditions.crafter_on_a_stick": "Crafting Table On A Stick",
   "item.actuallyadditions.basic_coil": "Basic Coil",
   "item.actuallyadditions.advanced_coil": "Advanced Coil",
-  "item.actuallyadditions.potion_ring": "Ring of (wip)",
-  "item.actuallyadditions.potion_ring_advanced": "Advanced Ring of (wip)",
   "item.actuallyadditions.solidified_experience": "Solidified Experience",
   "item.actuallyadditions.dust_iron": "Crushed Iron (wip)",
   "item.actuallyadditions.dust_gold": "Crushed Gold (wip)",
@@ -367,23 +365,20 @@
   "item.actuallyadditions.paxel_crystal_white": "Enori Crystal AIOT)",
   "item.actuallyadditions.paxel_crystal_green": "Emeradic Crystal AIOT",
   "item.actuallyadditions.ender_star": "Ender Star",
-  "item.actuallyadditions.spawner_changer": "Spawner Changer (wip)",
-  "item.actuallyadditions.spawner_shard": "Spawner Shards (wip)",
   "item.actuallyadditions.minecart_firework_box": "Firework Box Cart (wip)",
   "item.actuallyadditions.water_bowl": "Bowl of Water",
   "item.actuallyadditions.filter": "Item Filter",
   "item.actuallyadditions.biomass": "Biomass (wip)",
   "item.actuallyadditions.biocoal": "Bio Coal (wip)",
-  "item.actuallyadditions.player_probe": "Player Probe (wip)",
+  "item.actuallyadditions.player_probe": "Player Probe",
   "item.actuallyadditions.worm": "Worm",
   "item.actuallyadditions.travelers_sack": "Traveler's Sack",
-  "item.actuallyadditions.bag.storage": "filled slots (wip)",
   "item.actuallyadditions.void_sack": "Void Sack (wip)",
   "item.actuallyadditions.crystallized_canola_seed": "Crystallized Canola Seed",
   "item.actuallyadditions.empowered_canola_seed": "Empowered Canola Seed",
-  "item.actuallyadditions.lens_of_the_miner": "Lens of the Miner (wip)",
+  "item.actuallyadditions.lens_of_the_miner": "Lens of the Miner",
   "item.actuallyadditions.lens_of_the_killer": "Lens of the Killer (wip)",
-  "item.actuallyadditions.handheld_filler": "Handheld Filler (wip)",
+  "item.actuallyadditions.handheld_filler": "Handheld Filler",
   "item.actuallyadditions.laser_upgrade_invisibility": "Laser Relay Modifier: Invisibility (wip)",
   "item.actuallyadditions.engineers_goggles": "Engineer's Goggles",
   "item.actuallyadditions.engineers_goggles_advanced": "Engineer's Infrared Goggles",