Biogas System (WIP) & Gunpowder Barrel

src/generated/resources/assets/frostedheart/lang/en_ud.json

@@ -6,6 +6,8 @@
   "block.frostedheart.besnowed_debris_block": "ʞɔoןᗺ sıɹqǝᗡ pǝʍousǝᗺ",
   "block.frostedheart.besnowed_twigs": "sbıʍ⟘ pǝʍousǝᗺ",
   "block.frostedheart.besnowed_twigs_block": "ʞɔoןᗺ sbıʍ⟘ pǝʍousǝᗺ",
+  "block.frostedheart.biogas_digester_controller": "ɹǝןןoɹʇuoƆ ɹǝʇsǝbıᗡ sɐboıᗺ",
+  "block.frostedheart.biogas_digester_io": "ʇndʇnO & ʇnduI ɹǝʇsǝbıᗡ sɐboıᗺ",
   "block.frostedheart.blood_block": "pooןᗺ",
   "block.frostedheart.bone_block": "sǝuoᗺ ɟo ǝןıԀ",
   "block.frostedheart.broken_plate": "buıʇɐןԀ ɹoʇɐɹǝuǝ⅁ uǝʞoɹᗺ",

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

@@ -6,6 +6,8 @@
   "block.frostedheart.besnowed_debris_block": "Besnowed Debris Block",
   "block.frostedheart.besnowed_twigs": "Besnowed Twigs",
   "block.frostedheart.besnowed_twigs_block": "Besnowed Twigs Block",
+  "block.frostedheart.biogas_digester_controller": "Biogas Digester Controller",
+  "block.frostedheart.biogas_digester_io": "Biogas Digester Input & Output",
   "block.frostedheart.blood_block": "Blood",
   "block.frostedheart.bone_block": "Pile of Bones",
   "block.frostedheart.broken_plate": "Broken Generator Plating",

src/generated/resources/assets/frostedheart/models/item/biogas_digester_controller.json

@@ -0,0 +1,3 @@
+{
+  "parent": "frostedheart:block/biogas_digester_controller"
+}

src/generated/resources/assets/frostedheart/models/item/biogas_digester_io.json

@@ -0,0 +1,3 @@
+{
+  "parent": "frostedheart:block/biogas_digester_io"
+}

src/generated/resources/data/frostedheart/loot_tables/blocks/biogas_digester_controller.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "frostedheart:biogas_digester_controller"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "frostedheart:blocks/biogas_digester_controller"
+}

src/generated/resources/data/frostedheart/loot_tables/blocks/biogas_digester_io.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "frostedheart:biogas_digester_io"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "frostedheart:blocks/biogas_digester_io"
+}

src/generated/resources/data/frostedheart/tags/blocks/machines/metal.json

@@ -15,6 +15,8 @@
     "frostedheart:requester_chest",
     "frostedheart:storage_chest",
     "frostedheart:supplier_chest",
-    "frostedheart:test_logistic_core"
+    "frostedheart:test_logistic_core",
+    "frostedheart:biogas_digester_controller",
+    "frostedheart:biogas_digester_io"
   ]
 }

src/generated/resources/data/frostedheart/tags/blocks/machines/wooden.json

@@ -2,6 +2,7 @@
   "values": [
     "frostedheart:incubator",
     "frostedheart:heat_pipe",
-    "frostedheart:wardrobe"
+    "frostedheart:wardrobe",
+    "frostedheart:gunpowder_barrel"
   ]
 }

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -56,6 +56,8 @@
     "frostedheart:ruined_machine_screen",
     "frostedheart:ruined_machine_screen_cracked",
     "frostedheart:ruined_machine_switch",
+    "frostedheart:biogas_digester_controller",
+    "frostedheart:biogas_digester_io",
     "#frostedheart:machines/metal",
     "#frostedheart:permafrost",
     "frostedheart:generator_t1",

src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json

@@ -19,6 +19,8 @@
     "frostedheart:generator_amplifier_r1",
     "frostedheart:refractory_bricks",
     "frostedheart:high_refractory_bricks",
+    "frostedheart:biogas_digester_controller",
+    "frostedheart:biogas_digester_io",
     "#frostedheart:permafrost"
   ]
 }

src/main/java/com/teammoeg/frostedheart/bootstrap/client/FHScreens.java

@@ -24,6 +24,9 @@
 import com.teammoeg.chorda.client.cui.CUIMenuScreen;
 import com.teammoeg.chorda.client.cui.PrimaryLayer;
 import com.teammoeg.frostedheart.bootstrap.common.FHMenuTypes;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.screen.BiogasDigesterControllerMenu;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.screen.BiogasDigesterControllerScreen;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.screen.BiogasDigesterIOScreen;
 import com.teammoeg.frostedheart.content.climate.block.ClothesScreen;
 import com.teammoeg.frostedheart.content.climate.block.generator.GeneratorScreen;
 import com.teammoeg.frostedheart.content.climate.block.generator.t1.T1GeneratorLogic;
@@ -64,6 +67,9 @@ public static void init() {
         MenuScreens.register(FHMenuTypes.SUPPLY_CHEST.get(), LogisticChestScreen::new);
         MenuScreens.register(FHMenuTypes.STORAGE_CHEST.get(), LogisticChestScreen::new);
         MenuScreens.register(FHMenuTypes.REQUEST_CHEST.get(), LogisticChestScreen::new);
+        MenuScreens.register(FHMenuTypes.BIOGAS_DIGESTER_CONTROLLER.get(), BiogasDigesterControllerScreen::new);
+        MenuScreens.register(FHMenuTypes.BIOGAS_DIGESTER_IO.get(), BiogasDigesterIOScreen::new);
+
     }
 
     public static <C extends AbstractContainerMenu, S extends BaseScreen> void

src/main/java/com/teammoeg/frostedheart/bootstrap/client/FHTabs.java

@@ -23,6 +23,7 @@
 import com.teammoeg.frostedheart.FHMain;
 import com.teammoeg.chorda.creativeTab.ICreativeModeTabItem;
 import com.teammoeg.chorda.creativeTab.TabType;
+import com.teammoeg.frostedheart.bootstrap.common.FHBlockEntityTypes;
 import com.teammoeg.frostedheart.bootstrap.common.FHBlocks;
 import com.teammoeg.frostedheart.bootstrap.common.FHItems;
 import com.teammoeg.frostedheart.infrastructure.gen.FHRegistrate;
@@ -35,11 +36,15 @@
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.*;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.RegistryObject;
 import org.apache.commons.lang3.mutable.MutableObject;
@@ -50,7 +55,7 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-
+@Mod.EventBusSubscriber(modid = FHMain.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class FHTabs {
     public static final DeferredRegister<CreativeModeTab> TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, FHMain.MODID);
 
@@ -120,6 +125,22 @@ public class FHTabs {
                     .build());
     public static final TabType itemGroup = new TabType(MISC);
 
+    @SubscribeEvent
+    public static void onBuildCreativeTabContents(BuildCreativeModeTabContentsEvent event) {
+        if (event.getTab() == TOOLS.get()){
+            Item item = Item.byBlock(FHBlocks.GUNPOWDER_BARREL.get());
+            for (int i = 1; i <= 3; i++) {
+                for (int j = 0; j <= 3; j++){
+                    ItemStack stack = new ItemStack(item);
+                    CompoundTag nbt = new CompoundTag();
+                    nbt.putInt("Power", i);
+                    nbt.putInt("Fortune", j);
+                    BlockItem.setBlockEntityData(stack, FHBlockEntityTypes.GUNPOWDER_BARREL.get(),nbt);
+                    event.accept(stack);
+                }
+            }
+        }
+    }
 
     public static void fillFHTab(CreativeModeTab.ItemDisplayParameters parms, CreativeModeTab.Output out) {
         for (final RegistryObject<Item> itemRef : FHItems.ITEMS.getEntries()) {

src/main/java/com/teammoeg/frostedheart/bootstrap/common/FHBlockEntityTypes.java

@@ -19,16 +19,11 @@
 
 package com.teammoeg.frostedheart.bootstrap.common;
 
-import static com.teammoeg.frostedheart.FHMain.*;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableSet;
 import com.simibubi.create.content.kinetics.base.HalfShaftInstance;
 import com.teammoeg.frostedheart.FHMain;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.block.BiogasDigesterControllerBlockEntity;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.block.BiogasDigesterIOBlockEntity;
 import com.teammoeg.frostedheart.content.climate.block.wardrobe.WardrobeBlockEntity;
 import com.teammoeg.frostedheart.content.decoration.RelicChestTileEntity;
 import com.teammoeg.frostedheart.content.incubator.HeatIncubatorTileEntity;
@@ -51,10 +46,10 @@
 import com.teammoeg.frostedheart.content.town.mine.MineBaseBlockEntity;
 import com.teammoeg.frostedheart.content.town.mine.MineBlockEntity;
 import com.teammoeg.frostedheart.content.town.warehouse.WarehouseBlockEntity;
+import com.teammoeg.frostedheart.content.utility.gunpowder_barrel.GunpowderBarrelBlockEntity;
 import com.teammoeg.frostedheart.content.utility.incinerator.GasVentTileEntity;
 import com.teammoeg.frostedheart.content.utility.incinerator.OilBurnerTileEntity;
 import com.tterrag.registrate.util.entry.BlockEntityEntry;
-
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -63,6 +58,13 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static com.teammoeg.frostedheart.FHMain.REGISTRATE;
+
 public class FHBlockEntityTypes {
     public static final BlockEntityEntry<CreativeHeaterBlockEntity> CREATIVE_HEATER = REGISTRATE
             .blockEntity("creative_heater", CreativeHeaterBlockEntity::new)
@@ -151,6 +153,13 @@ public class FHBlockEntityTypes {
         "supplier_chest", makeType(SupplierTileEntity::new, FHBlocks.SUPPLIER_CHEST::get)
 );    public static final RegistryObject<BlockEntityType<NetworkCoreTileEntity>> NETWORK_CORE = REGISTER.register(
     "logistic_test_core", makeType(NetworkCoreTileEntity::new, FHBlocks.TEST_LOGISTIC_CORE::get));
+    public static final RegistryObject<BlockEntityType<BiogasDigesterControllerBlockEntity>> BIOGAS_DIGESTER_CONTROLLER = REGISTER.register(
+            "biogas_digest_controller", makeType(BiogasDigesterControllerBlockEntity::new, FHBlocks.BIOGAS_DIGESTER_CONTROLLER::get));
+    public static final RegistryObject<BlockEntityType<BiogasDigesterIOBlockEntity>> BIOGAS_DIGESTER_IO = REGISTER.register(
+            "biogas_digest_io", makeType(BiogasDigesterIOBlockEntity::new, FHBlocks.BIOGAS_DIGESTER_IO::get));
+    public static final RegistryObject<BlockEntityType<GunpowderBarrelBlockEntity>> GUNPOWDER_BARREL = REGISTER.register(
+            "gunpowder_barrel", makeType(GunpowderBarrelBlockEntity::new, FHBlocks.GUNPOWDER_BARREL::get));
+
     private static <T extends BlockEntity> Supplier<BlockEntityType<T>> makeType(BlockEntitySupplier<T> create, Supplier<Block> valid) {
         return makeTypeMultipleBlocks(create, () -> ImmutableSet.of(valid.get()));
     }

src/main/java/com/teammoeg/frostedheart/bootstrap/common/FHBlocks.java

@@ -19,16 +19,6 @@
 
 package com.teammoeg.frostedheart.bootstrap.common;
 
-import static com.teammoeg.frostedheart.FHMain.*;
-import static com.teammoeg.frostedheart.infrastructure.gen.FHBlockStateGen.*;
-import static com.teammoeg.frostedheart.infrastructure.gen.FHTagGen.*;
-import static net.minecraft.world.level.block.Blocks.*;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 import com.google.common.collect.ImmutableMap;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.foundation.data.AssetLookup;
@@ -37,19 +27,21 @@
 import com.teammoeg.chorda.block.CDirectionalFacingBlock;
 import com.teammoeg.chorda.block.CDirectionalRotatableBlock;
 import com.teammoeg.frostedheart.FHMain;
+import com.teammoeg.frostedheart.bootstrap.client.FHTabs;
 import com.teammoeg.frostedheart.bootstrap.reference.FHFoodProperties;
+import com.teammoeg.frostedheart.bootstrap.reference.FHProps;
+import com.teammoeg.frostedheart.bootstrap.reference.FHTags;
 import com.teammoeg.frostedheart.content.agriculture.RubberDandelionBlock;
+import com.teammoeg.frostedheart.content.agriculture.RyeBlock;
+import com.teammoeg.frostedheart.content.agriculture.WhiteTurnipBlock;
 import com.teammoeg.frostedheart.content.agriculture.WildRubberDandelionBlock;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.block.BiogasDigesterControllerBlock;
+import com.teammoeg.frostedheart.content.agriculture.biogassystem.block.BiogasDigesterIOBlock;
 import com.teammoeg.frostedheart.content.climate.block.CooledMagmaBlock;
 import com.teammoeg.frostedheart.content.climate.block.LayeredThinIceBlock;
 import com.teammoeg.frostedheart.content.climate.block.ThinIceBlock;
-import com.teammoeg.frostedheart.content.decoration.*;
-import com.teammoeg.frostedheart.bootstrap.client.FHTabs;
-import com.teammoeg.frostedheart.bootstrap.reference.FHProps;
-import com.teammoeg.frostedheart.bootstrap.reference.FHTags;
-import com.teammoeg.frostedheart.content.agriculture.RyeBlock;
-import com.teammoeg.frostedheart.content.agriculture.WhiteTurnipBlock;
 import com.teammoeg.frostedheart.content.climate.block.wardrobe.WardrobeBlock;
+import com.teammoeg.frostedheart.content.decoration.*;
 import com.teammoeg.frostedheart.content.incubator.HeatIncubatorBlock;
 import com.teammoeg.frostedheart.content.incubator.IncubatorBlock;
 import com.teammoeg.frostedheart.content.robotics.logistics.LogisticChestBlock;
@@ -72,21 +64,23 @@
 import com.teammoeg.frostedheart.content.town.mine.MineBaseBlock;
 import com.teammoeg.frostedheart.content.town.mine.MineBlock;
 import com.teammoeg.frostedheart.content.town.warehouse.WarehouseBlock;
+import com.teammoeg.frostedheart.content.utility.gunpowder_barrel.GunpowderBarrelBlock;
+import com.teammoeg.frostedheart.content.utility.gunpowder_barrel.GunpowderBarrelBlockItem;
 import com.teammoeg.frostedheart.content.utility.incinerator.GasVentBlock;
 import com.teammoeg.frostedheart.content.utility.incinerator.OilBurnerBlock;
 import com.teammoeg.frostedheart.infrastructure.gen.FHBlockStateGen;
 import com.teammoeg.frostedheart.infrastructure.gen.FHLootGen;
 import com.teammoeg.frostedheart.item.FHBlockItem;
 import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables;
 import com.tterrag.registrate.util.entry.BlockEntry;
-
 import net.minecraft.advancements.critereon.StatePropertiesPredicate;
 import net.minecraft.data.loot.packs.VanillaBlockLoot;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.material.PushReaction;
@@ -99,10 +93,21 @@
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
 import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.data.SoundDefinition;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import static com.teammoeg.frostedheart.FHMain.REGISTRATE;
+import static com.teammoeg.frostedheart.infrastructure.gen.FHBlockStateGen.ruinedMachines;
+import static com.teammoeg.frostedheart.infrastructure.gen.FHTagGen.*;
+import static net.minecraft.world.level.block.Blocks.*;
+
 @SuppressWarnings("unused")
 public class FHBlocks {
 
@@ -2024,6 +2029,43 @@ protected static <T extends Block> RegistryObject<T> register(String name, Suppl
             .tag(FHTags.Blocks.METAL_MACHINES.get())
             .simpleItem()
             .register();
+    // gunpowder_barrel
+    public static final RegistryObject<GunpowderBarrelBlock> GUNPOWDER_BARREL = register(
+            "gunpowder_barrel",
+            () -> new GunpowderBarrelBlock(BlockBehaviour.Properties.copy(TNT)
+                    .sound(SoundType.WOOD)
+                    .mapColor(SPRUCE_PLANKS.defaultMapColor())),
+            "gunpowder_barrel",
+            b -> new GunpowderBarrelBlockItem(new Item.Properties().stacksTo(1))
+            );
+    // Biogas System
+    public static final BlockEntry<BiogasDigesterControllerBlock> BIOGAS_DIGESTER_CONTROLLER = REGISTRATE.block("biogas_digester_controller", BiogasDigesterControllerBlock::new)
+            .initialProperties(() -> COPPER_BLOCK)
+            .properties(t->t.mapColor(IRON_BLOCK.defaultMapColor())
+                    .requiresCorrectToolForDrops())
+            .transform(pickaxeOnly())
+            .blockstate(FHBlockStateGen.existed())
+            .loot(RegistrateBlockLootTables::dropSelf)
+            .tag(FHTags.Blocks.METAL_MACHINES.get())
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
+            .tag(BlockTags.NEEDS_STONE_TOOL)
+            .lang("Biogas Digester Controller")
+            .simpleItem()
+            .register();
+    public static final BlockEntry<BiogasDigesterIOBlock> BIOGAS_DIGESTER_IO = REGISTRATE.block("biogas_digester_io", BiogasDigesterIOBlock::new)
+            .initialProperties(() -> COPPER_BLOCK)
+            .properties(t->t.mapColor(IRON_BLOCK.defaultMapColor())
+                    .noOcclusion()
+                    .requiresCorrectToolForDrops())
+            .transform(pickaxeOnly())
+            .loot(RegistrateBlockLootTables::dropSelf)
+            .blockstate(FHBlockStateGen.existed())
+            .tag(FHTags.Blocks.METAL_MACHINES.get())
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
+            .tag(BlockTags.NEEDS_STONE_TOOL)
+            .lang("Biogas Digester Input & Output")
+            .simpleItem()
+            .register();
     public static void init() { }
 
     public static final Map<Block, Supplier<? extends Block>> SNOWY_TERRAIN_BLOCKS = new HashMap<>(new ImmutableMap.Builder<Block, Supplier<? extends Block>>()

src/main/java/com/teammoeg/frostedheart/bootstrap/common/FHItems.java

@@ -27,6 +27,7 @@
 import com.simibubi.create.foundation.item.ItemDescription;
 import com.teammoeg.caupona.CPTags;
 import com.teammoeg.frostedheart.FHMain;
+import com.teammoeg.frostedheart.content.utility.gunpowder_barrel.GunpowderBarrelBlockItem;
 import com.teammoeg.frostedheart.content.utility.seld.SledItem;
 import com.teammoeg.frostedheart.item.DyedItemList;
 import com.teammoeg.frostedheart.bootstrap.reference.FHArmorMaterial;