fix: remaining issues

build.gradle

@@ -91,18 +91,18 @@ dependencies {
 }
 
 // not sure if this is still needed
-processResources {
-    inputs.property('version', project.version)
-
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-        expand 'version': project.version
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
-}
+//processResources {
+//    inputs.property('version', project.version)
+//
+//    from(sourceSets.main.resources.srcDirs) {
+//        include 'META-INF/mods.toml'
+//        expand 'version': project.version
+//    }
+//
+//    from(sourceSets.main.resources.srcDirs) {
+//        exclude 'META-INF/mods.toml'
+//    }
+//}
 
 jar {
     group = 'artifact'

src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java

@@ -93,6 +93,7 @@ public class ActuallyAdditions {
         IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
 
         ActuallyBlocks.BLOCKS.register(eventBus);
+        ActuallyItems.ITEMS.register(eventBus);
         ActuallyBlocks.TILES.register(eventBus);
         ActuallyRecipes.init(eventBus);
         ActuallyContainers.CONTAINERS.register(eventBus);

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java

@@ -38,7 +38,6 @@
 //@OnlyIn(Dist.CLIENT)
 //public class GuiMainPage extends GuiBooklet {
 //
-//    private static final String[] QUOTES = new String[]{"Actually Additions, to me, is quite magical in a way.@Saphrym", "Actually quite cool. Lots of nice little additions.@Direwolf20", "Mod Dev quite rude and arrogant@Bubb1e0seven", "A whimsical breath of fresh air in a stuffy tech-mod world.@mezz", "User-friendly :3@TheMeeep", "A lot of stuff, some of it really good.@Narubion", "I like the bookmarks.@Vazkii", "It's got some stuff I guess.@Ellpeck", "Actually Additions should be included in every new modpack that includes any form of tech.@YasminEndusa", "A mod that basically lets you do what ever the heck you want.@Ristelle", "TINY TORCHES!! BABY TORCHES!! Somebody actually finally did it!!@Soaryn", "Balanced mod wich makes things different - in a good way.@garantiertnicht", "The mod everyone needs, but not everyone knows@Brewpl", "The in-game documentation is the best I’ve seen. I especially love the JEI integration. Even a derp like me can figure it out.@dannydjdk", "The second best mod I've ever used.@mmaas44", "The Fermenting Barrel is one of my favorite textures.@amadornes", "Smiley Clouds is the reason for fascism in 2016.@raoulvdberge", "The worms are an awesome idea!@greenking", "Can I use that mod in my pack?@Ibraheem", "Hello, love the mod.@SuntannedDuck2", "Quick! Have all the fun before they nerf it!@JuddMan03", "I have a feeling Actually Additions is also like Extra Utilities with Random things smashed together why is it...@lesslighter", "Leaf eater... munchdew... hummm@EiOs", "There is no such thing as canola seeds.@AlBoVa", "This mod is cancer, BRUTAL EXPENSIVE POWER usage..Just, cancer.@KoJo", "Spaghetti is spaghetti, and noodles are noodles.@robsonld04", "The Actually Additions name is actually true. It's actually great!@asiekierka", "Such a great mod@jsdeveloper", "That mod is kind of funny.@Anonymous", "Actually Additions is a lot of fun.@Anonymous", "Is Actually Additions still fugly?@Anonymous", "I like it, but it's so small.@Anonymous", "It has a couple of blocks I like, but overall it's just a mess.@Anonymous", "Direwolf's 1.10 playthrough is just him shilling Actually Additions@Anonymous", "We thought about sending the author a bunch of pizzas to his adress@Anonymous", "It's op as heck.@billofbong0", "Actually AdditionsってマイクラMODすごく良いのに日本人で遊んでる人あんまいないっぽい@stay_uk", "Actually Additions is OP. Not like my favorite combination of mods, Project E + Magic Crops + Draconic Evolution.@Anonymous", "To be perfectly honest, I never actually realized how much content Actually Additions has before.@Ellpeck", "I don't blame you, I actually downgraded to Actually Additions.@PvtSeaCow", "It is lonely because there is no device to fly items with the laser in the 1.7.10 version.@Google Translate", "始めまして。日本人です。このMODは本当に素晴らしい！ただ、1.7.10ヴァージョンだと、レーザーでアイテムを飛ばす装置がないので寂しいです。@Anonymous", "Some verses found in older translations, such as the KJV were actually additions made by later copyists.@Pat_Joel", "I can't place filters into Laser Relays, but the mod is very cool.@LP_Jakob", "Am I good enough to be an Actually Additions tool?@deanwhufc"};
 //
 //    //private TexturedButton achievementButton;
 //    private TexturedButton configButton;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java

@@ -10,8 +10,8 @@
 
 package de.ellpeck.actuallyadditions.mod.inventory;
 
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
-import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import net.minecraft.entity.player.PlayerEntity;
@@ -27,10 +27,6 @@ public class ContainerCanolaPress extends Container {
 
     public final TileEntityCanolaPress press;
 
-    public static ContainerCanolaPress fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) {
-        return new ContainerCanolaPress(windowId, inv, (TileEntityCanolaPress) Objects.requireNonNull(inv.player.level.getBlockEntity(data.readBlockPos())));
-    }
-
     public ContainerCanolaPress(int windowId, PlayerInventory inventory, TileEntityCanolaPress tile) {
         super(ActuallyContainers.CANOLA_PRESS_CONTAINER.get(), windowId);
         this.press = tile;
@@ -47,6 +43,10 @@ public class ContainerCanolaPress extends Container {
         }
     }
 
+    public static ContainerCanolaPress fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) {
+        return new ContainerCanolaPress(windowId, inv, (TileEntityCanolaPress) Objects.requireNonNull(inv.player.level.getBlockEntity(data.readBlockPos())));
+    }
+
     @Override
     public ItemStack quickMoveStack(PlayerEntity player, int slot) {
         int inventoryStart = 1;
@@ -63,7 +63,7 @@ public class ContainerCanolaPress extends Container {
             //Other Slots in Inventory excluded
             if (slot >= inventoryStart) {
                 //Shift from Inventory
-                if (newStack.getItem() == ActuallyItems.CANOLA.get()) {
+                if (newStack.getItem() == ActuallyBlocks.CANOLA.getItem()) {
                     if (!this.moveItemStackTo(newStack, 0, 1, false)) {
                         return StackUtil.getEmpty();
                     }

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

@@ -35,7 +35,7 @@ public final class ActuallyItems {
     public static final RegistryObject<Item> itemMisc = ITEMS.register("misc", ItemBase::new);
 
     // MISC ITEMS
-    public static final RegistryObject<Item> CANOLA = ITEMS.register("canola", ItemBase::new);
+//    public static final RegistryObject<Item> CANOLA = ITEMS.register("canola", ItemBase::new);
     public static final RegistryObject<Item> COFFEE_CUP = ITEMS.register("coffee_cup", ItemBase::new);
     public static final RegistryObject<Item> PAPER_CONE = ITEMS.register("paper_cone", ItemBase::new);
     public static final RegistryObject<Item> MASHED_FOOD = ITEMS.register("mashed_food", ItemBase::new);
@@ -141,7 +141,7 @@ public final class ActuallyItems {
     public static final RegistryObject<Item> DRILL_UPGRADE_FIVE_BY_FIVE = ITEMS.register("drill_upgrade_five_by_five", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE));
     public static final RegistryObject<Item> DRILL_UPGRADE_BLOCK_PLACING = ITEMS.register("drill_upgrade_block_placing", () -> new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER));
     public static final RegistryObject<Item> FERTILIZER = ITEMS.register("fertilizer", ItemFertilizer::new);
-    public static final RegistryObject<Item> COFFEE = ITEMS.register("coffee", ItemCoffee::new);
+    //    public static final RegistryObject<Item> COFFEE = ITEMS.register("coffee", ItemCoffee::new);
     public static final RegistryObject<Item> PHANTOM_CONNECTOR = ITEMS.register("phantom_connector", ItemPhantomConnector::new);
     public static final RegistryObject<Item> RESONANT_RICE = ITEMS.register("resonant_rice", ItemResonantRice::new);
     public static final RegistryObject<Item> FOOD = ITEMS.register("food", ItemBase::new); //just... food? //TODO

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
 import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerCanolaPress;
-import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor;
 import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
@@ -60,7 +59,11 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IN
     private int lastProcessTime;
 
     public TileEntityCanolaPress() {
-        super(ActuallyBlocks.CANOLA_PRESS.getTileEntityType(),  1);
+        super(ActuallyBlocks.CANOLA_PRESS.getTileEntityType(), 1);
+    }
+
+    public static boolean isCanola(ItemStack stack) {
+        return stack.getItem() == ActuallyBlocks.CANOLA.getItem();
     }
 
     @OnlyIn(Dist.CLIENT)
@@ -132,10 +135,6 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IN
         return (slot, stack, automation) -> slot == 0 && isCanola(stack);
     }
 
-    public static boolean isCanola(ItemStack stack) {
-        return stack.getItem() == ActuallyItems.CANOLA.get();
-    }
-
     @Override
     public IRemover getRemover() {
         return (slot, automation) -> !automation;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java

@@ -44,9 +44,6 @@ import net.minecraftforge.fluids.capability.templates.FluidTank;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase.NBTType;
-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
-
 public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements INamedContainerProvider, IButtonReactor, ISharingFluidHandler {
 
     public static final int SLOT_COFFEE_BEANS = 0;
@@ -89,7 +86,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
     private int lastBrewTime;
 
     public TileEntityCoffeeMachine() {
-        super(ActuallyBlocks.COFFEE_MACHINE.getTileEntityType(),  11);
+        super(ActuallyBlocks.COFFEE_MACHINE.getTileEntityType(), 11);
     }
 
     @OnlyIn(Dist.CLIENT)
@@ -189,7 +186,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
                 this.storage.extractEnergyInternal(ENERGY_USED, false);
                 if (this.brewTime >= TIME_USED) {
                     this.brewTime = 0;
-                    ItemStack output = new ItemStack(ActuallyItems.COFFEE.get());
+                    ItemStack output = new ItemStack(ActuallyBlocks.COFFEE.getItem());
                     for (int i = 3; i < this.inv.getSlots(); i++) {
                         if (StackUtil.isValid(this.inv.getStackInSlot(i))) {
                             CoffeeIngredient ingredient = ItemCoffee.getIngredientFromStack(this.inv.getStackInSlot(i));

src/main/resources/META-INF/mods.toml

@@ -0,0 +1,28 @@
+
+modLoader="javafml"
+loaderVersion="[36,)"
+license="MIT"
+[[mods]]
+modId="actuallyadditions"
+version="${file.jarVersion}"
+displayName="Example Mod"
+logoFile="assets/actuallyadditions/textures/logo.png"
+credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp"
+authors="Ellpeck"
+description='''
+Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more!
+'''
+
+[[dependencies.actuallyadditions]]
+    modId="forge"
+    mandatory=true
+    versionRange="[36,)"
+    ordering="NONE"
+    side="BOTH"
+
+[[dependencies.actuallyadditions]]
+    modId="minecraft"
+    mandatory=true
+    versionRange="[1.16.5,1.17)"
+    ordering="NONE"
+    side="BOTH"

src/main/resources/pack.mcmeta

@@ -0,0 +1,7 @@
+{
+  "pack": {
+    "description": "actuallyadditions resources",
+    "pack_format": 6,
+    "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods."
+  }
+}