CHANGELOG.md

@@ -3,10 +3,6 @@
 * Add the stairs, slabs and walls to the appropriate block/item tags
 * Change the sound type of the casing blocks to match material used in the recipe
 * Change the sound type of some machines to use the metal sound
-* Change the sound type of crystal blocks / Clusters
-* Allow seeds and crops to be composted
-* Add the tiny coal and charcoal to the furnace fuel datamap
-* Fix one of the Engineer House blocks being the wrong block
 
 # 1.3.7+mc1.21.1
 * Added recipes for AA crops in the IE cloche.

src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f

@@ -1,3 +0,0 @@
-// 1.21.1	2024-11-02T14:59:13.7640446	Data Maps
-9f93ec7e2a943d73ede3af027951495c9939bafc data/neoforge/data_maps/item/compostables.json
-3141fd94b43dbb67fc8814b371114c571bc07b58 data/neoforge/data_maps/item/furnace_fuels.json

src/generated/resources/data/neoforge/data_maps/item/compostables.json

@@ -1,22 +0,0 @@
-{
-  "values": {
-    "actuallyadditions:canola": {
-      "chance": 0.65
-    },
-    "actuallyadditions:canola_seeds": {
-      "chance": 0.3
-    },
-    "actuallyadditions:coffee_beans": {
-      "chance": 0.65
-    },
-    "actuallyadditions:flax_seeds": {
-      "chance": 0.65
-    },
-    "actuallyadditions:rice": {
-      "chance": 0.65
-    },
-    "actuallyadditions:rice_seeds": {
-      "chance": 0.3
-    }
-  }
-}

src/generated/resources/data/neoforge/data_maps/item/furnace_fuels.json

@@ -1,10 +0,0 @@
-{
-  "values": {
-    "actuallyadditions:tiny_charcoal": {
-      "burn_time": 200
-    },
-    "actuallyadditions:tiny_coal": {
-      "burn_time": 200
-    }
-  }
-}

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

@@ -66,8 +66,6 @@ public class ActuallyAdditionsData {
         generator.addProvider(true, new MiningLensGenerator(packOutput, lookupProvider));
         generator.addProvider(true, new CoffeeIngredientGenerator(packOutput, lookupProvider));
 
-        generator.addProvider(true, new DataMapGenerator(packOutput, lookupProvider));
-
         generator.addProvider(true, new SoundsGenerator(packOutput, helper));
 
         if (ModList.get().isLoaded("patchouli"))

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

@@ -1,38 +0,0 @@
-package de.ellpeck.actuallyadditions.data;
-
-import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
-import net.minecraft.core.HolderLookup.Provider;
-import net.minecraft.data.PackOutput;
-import net.neoforged.neoforge.common.data.DataMapProvider;
-import net.neoforged.neoforge.registries.datamaps.builtin.Compostable;
-import net.neoforged.neoforge.registries.datamaps.builtin.FurnaceFuel;
-import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
-
-import java.util.concurrent.CompletableFuture;
-
-public class DataMapGenerator extends DataMapProvider {
-	public DataMapGenerator(PackOutput packOutput, CompletableFuture<Provider> lookupProvider) {
-		super(packOutput, lookupProvider);
-	}
-
-	@Override
-	protected void gather() {
-		final float SEEDS = 0.3F;
-		final float CROPS = 0.65F;
-
-		final var compostables = builder(NeoForgeDataMaps.COMPOSTABLES);
-		compostables.add(ActuallyItems.RICE_SEEDS, new Compostable(SEEDS), false);
-		compostables.add(ActuallyItems.COFFEE_BEANS, new Compostable(SEEDS), false);
-		compostables.add(ActuallyItems.CANOLA_SEEDS, new Compostable(SEEDS), false);
-		compostables.add(ActuallyItems.FLAX_SEEDS, new Compostable(SEEDS), false);
-
-		compostables.add(ActuallyItems.RICE, new Compostable(CROPS), false);
-		compostables.add(ActuallyItems.COFFEE_BEANS, new Compostable(CROPS), false);
-		compostables.add(ActuallyItems.CANOLA, new Compostable(CROPS), false);
-		compostables.add(ActuallyItems.FLAX_SEEDS, new Compostable(CROPS), false);
-
-		final var furnaceFuels = builder(NeoForgeDataMaps.FURNACE_FUELS);
-		furnaceFuels.add(ActuallyItems.TINY_COAL, new FurnaceFuel(200), false);
-		furnaceFuels.add(ActuallyItems.TINY_CHARCOAL, new FurnaceFuel(200), false);
-	}
-}

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java

@@ -11,13 +11,12 @@
 package de.ellpeck.actuallyadditions.mod.blocks;
 
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.SoundType;
 
 public class BlockCrystal extends ActuallyBlock {
     private final boolean isEmpowered;
 
     public BlockCrystal(boolean isEmpowered) {
-        super(ActuallyBlocks.defaultPickProps().sound(SoundType.AMETHYST));
+        super(ActuallyBlocks.defaultPickProps());
         this.isEmpowered = isEmpowered;
     }
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/CrystalClusterBlock.java

@@ -45,7 +45,7 @@ public class CrystalClusterBlock extends FullyDirectionalBlock {
         super(Block.Properties.of()
             .instrument(NoteBlockInstrument.HAT)
             .lightLevel((e) -> 7)
-            .sound(SoundType.AMETHYST_CLUSTER)
+            .sound(SoundType.GLASS)
             .noOcclusion()
             .strength(0.25f, 1.0f));
     }