From a205a2b4f5227753c7f5b788e3b6ce7697fe4edf Mon Sep 17 00:00:00 2001 From: Mana Kampman Date: Thu, 19 May 2022 12:41:58 -0700 Subject: [PATCH] Initial commit --- build.gradle | 4 +++- .../com/redpandastudios/garth/core/Garth.java | 1 - .../garth/core/registry/GarthBlocks.java | 10 +++++++++ .../farmersdelight/GarthCabinetBlock.java | 21 +++++++++++++++++++ .../farmersdelight/GarthCabinetSuppliers.java | 11 ++++++++++ 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/redpandastudios/garth/core/registry/GarthBlocks.java create mode 100644 src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetBlock.java create mode 100644 src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetSuppliers.java diff --git a/build.gradle b/build.gradle index 78cba94..48ed075 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,9 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath(group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true) { exclude group: 'org.apache.logging.log4j' } + classpath 'org.apache.logging.log4j:log4j-api:2.11.2' + classpath 'org.apache.logging.log4j:log4j-core:2.11.2' classpath 'org.parchmentmc:librarian:1.+' } } diff --git a/src/main/java/com/redpandastudios/garth/core/Garth.java b/src/main/java/com/redpandastudios/garth/core/Garth.java index 2e57125..a5c05f7 100644 --- a/src/main/java/com/redpandastudios/garth/core/Garth.java +++ b/src/main/java/com/redpandastudios/garth/core/Garth.java @@ -12,7 +12,6 @@ public class Garth { public static final String MOD_ID = "garth"; - public static final Logger LOGGER = LogUtils.getLogger(); public static final RegistryHelper REGISTRY_HELPER = new RegistryHelper(MOD_ID); diff --git a/src/main/java/com/redpandastudios/garth/core/registry/GarthBlocks.java b/src/main/java/com/redpandastudios/garth/core/registry/GarthBlocks.java new file mode 100644 index 0000000..90174c0 --- /dev/null +++ b/src/main/java/com/redpandastudios/garth/core/registry/GarthBlocks.java @@ -0,0 +1,10 @@ +package com.redpandastudios.garth.core.registry; + +import com.redpandastudios.garth.core.Garth; +import com.teamabnormals.blueprint.core.util.registry.BlockSubRegistryHelper; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = Garth.MOD_ID) +public class GarthBlocks { + public static final BlockSubRegistryHelper HELPER = Garth.REGISTRY_HELPER.getBlockSubHelper(); +} diff --git a/src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetBlock.java b/src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetBlock.java new file mode 100644 index 0000000..63fb00d --- /dev/null +++ b/src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetBlock.java @@ -0,0 +1,21 @@ +package com.redpandastudios.garth.integration.farmersdelight; + +import com.teamabnormals.blueprint.core.util.item.filling.TargetedItemCategoryFiller; +import net.minecraft.core.NonNullList; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import vectorwing.farmersdelight.common.block.CabinetBlock; +import vectorwing.farmersdelight.common.registry.ModItems; + +public class GarthCabinetBlock extends CabinetBlock { + private static final TargetedItemCategoryFiller FILLER = new TargetedItemCategoryFiller(ModItems.WARPED_CABINET); + + public GarthCabinetBlock(Properties properties) { + super(properties); + } + + @Override + public void fillItemCategory(CreativeModeTab tab, NonNullList item) { + FILLER.fillItem(this.asItem(), tab, item); + } +} diff --git a/src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetSuppliers.java b/src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetSuppliers.java new file mode 100644 index 0000000..280f841 --- /dev/null +++ b/src/main/java/com/redpandastudios/garth/integration/farmersdelight/GarthCabinetSuppliers.java @@ -0,0 +1,11 @@ +package com.redpandastudios.garth.integration.farmersdelight; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour; + +import java.util.function.Supplier; + +public class GarthCabinetSuppliers { + public static final Supplier CABINET = () -> new GarthCabinetBlock(BlockBehaviour.Properties.copy(Blocks.BARREL)); +}