From 1ae36591df1232e07c9a30e5ca953863b06ba21f Mon Sep 17 00:00:00 2001 From: Zontreck Date: Thu, 15 Feb 2024 17:14:00 -0700 Subject: [PATCH] Move the deprecated blocks to their own class --- gradle.properties | 4 +- src/main/java/dev/zontreck/otemod/OTEMod.java | 2 + .../otemod/blocks/DeprecatedBlock.java | 11 +++++ .../otemod/blocks/DeprecatedModBlocks.java | 39 ++++++++++++++++++ .../dev/zontreck/otemod/blocks/ModBlocks.java | 37 ++--------------- .../otemod/textures/block/deprecated.png | Bin 0 -> 206 bytes .../otemod/textures/item/deprecated.png | Bin 0 -> 277 bytes 7 files changed, 58 insertions(+), 35 deletions(-) create mode 100644 src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java create mode 100644 src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java create mode 100644 src/main/resources/assets/otemod/textures/block/deprecated.png create mode 100644 src/main/resources/assets/otemod/textures/item/deprecated.png diff --git a/gradle.properties b/gradle.properties index 9df2721..11915b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -libzontreck=1.10.021424.1759 +libzontreck=1.10.021524.1704 ## Environment Properties @@ -48,7 +48,7 @@ mod_name=Thresholds # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1.4.021524.1703 +mod_version=1.4.021524.1709 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/dev/zontreck/otemod/OTEMod.java b/src/main/java/dev/zontreck/otemod/OTEMod.java index 12243a6..d3b67b6 100644 --- a/src/main/java/dev/zontreck/otemod/OTEMod.java +++ b/src/main/java/dev/zontreck/otemod/OTEMod.java @@ -16,6 +16,7 @@ import dev.zontreck.libzontreck.profiles.Profile; import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException; import dev.zontreck.libzontreck.util.ChatHelpers; import dev.zontreck.libzontreck.vectors.Vector3; +import dev.zontreck.otemod.blocks.DeprecatedModBlocks; import dev.zontreck.otemod.effects.ModEffects; import dev.zontreck.otemod.enchantments.FlightEnchantment; import dev.zontreck.otemod.enchantments.NightVisionEnchantment; @@ -133,6 +134,7 @@ public class OTEMod MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class); ModBlocks.register(bus); + DeprecatedModBlocks.register(bus); CreativeModeTabs.REGISTER.register(bus); ModItems.register(bus); DeprecatedModItems.register(bus); diff --git a/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java new file mode 100644 index 0000000..0c9e4c6 --- /dev/null +++ b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java @@ -0,0 +1,11 @@ +package dev.zontreck.otemod.blocks; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; + +public class DeprecatedBlock extends Block +{ + public DeprecatedBlock(){ + super(BlockBehaviour.Properties.of().instabreak()); + } +} diff --git a/src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java new file mode 100644 index 0000000..9327038 --- /dev/null +++ b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java @@ -0,0 +1,39 @@ +package dev.zontreck.otemod.blocks; + +import dev.zontreck.otemod.OTEMod; +import dev.zontreck.otemod.implementation.CreativeModeTabs; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class DeprecatedModBlocks +{ + + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, OTEMod.MOD_ID); + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID); + + public static void register(IEventBus bus){ + BLOCKS.register(bus); + ITEMS.register(bus); + OTEMod.LOGGER.info("Registering all blocks..."); + } + + + public static final RegistryObject ILUSIUM_ORE_BLOCK = BLOCKS.register("ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_ORE_BLOCK.get()).noOcclusion())); + + public static final RegistryObject ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore_block", () -> new BlockItem(ILUSIUM_ORE_BLOCK.get(), new Item.Properties()))); + + public static final RegistryObject DEEPSLATE_ILUSIUM_ORE_BLOCK = BLOCKS.register("deepslate_ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ILUSIUM_ORE_BLOCK.get()).noOcclusion())); + + public static final RegistryObject DEEPSLATE_ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_ilusium_ore_block", () -> new BlockItem(DEEPSLATE_ILUSIUM_ORE_BLOCK.get(), new Item.Properties()))); + + + public static final RegistryObject ILUSIUM_BLOCK = BLOCKS.register("ilusium_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().strength(5, 20).requiresCorrectToolForDrops())); + + public static final RegistryObject ILUSIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_block", () -> new BlockItem(ILUSIUM_BLOCK.get(), new Item.Properties()))); +} diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java index bb586f3..f93bffa 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java @@ -48,49 +48,26 @@ public class ModBlocks { public static final RegistryObject DEEPSLATE_ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_eternium_ore_block", () -> new BlockItem(DEEPSLATE_ETERNIUM_ORE_BLOCK.get(), new Item.Properties()))); - public static final RegistryObject AURORA_BLOCK = BLOCKS.register("aurora_block", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(9f).explosionResistance(100000f).destroyTime(10).sound(SoundType.NETHERITE_BLOCK))); - - public static final RegistryObject AURORA_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_block", () -> new BlockItem(AURORA_BLOCK.get(), new Item.Properties()))); - - - - public static final RegistryObject AURORA_DOOR = BLOCKS.register("aurora_door", AuroraDoorBlock::new); - - public static final RegistryObject AURORA_DOOR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_door", () -> new BlockItem(AURORA_DOOR.get(), new Item.Properties()))); - - public static final RegistryObject CLEAR_GLASS_BLOCK = BLOCKS.register("clear_glass_block", () -> new Block(BlockBehaviour.Properties.copy(Blocks.GLASS).strength(1f).destroyTime(6).noOcclusion().isViewBlocking(ModBlocks::never))); public static final RegistryObject CLEAR_GLASS_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("clear_glass_block", () -> new BlockItem(CLEAR_GLASS_BLOCK.get(), new Item.Properties()))); - public static final RegistryObject ITEM_SCRUBBER = BLOCKS.register("item_scrubber", ()->new ItemScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); + public static final RegistryObject ITEM_SCRUBBER = BLOCKS.register("item_scrubber", ()->new ItemScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); public static final RegistryObject ITEM_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("item_scrubber", ()->new BlockItem(ITEM_SCRUBBER.get(), new Item.Properties()))); - public static final RegistryObject MAGICAL_SCRUBBER = BLOCKS.register("magical_scrubber", ()->new MagicalScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); + public static final RegistryObject MAGICAL_SCRUBBER = BLOCKS.register("magical_scrubber", ()->new MagicalScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); public static final RegistryObject MAGICAL_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("magical_scrubber", ()->new BlockItem(MAGICAL_SCRUBBER.get(), new Item.Properties()))); - public static final RegistryObject STABLE_SINGULARITY = BLOCKS.register("stable_singularity", ()->new Block(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); + public static final RegistryObject STABLE_SINGULARITY = BLOCKS.register("stable_singularity", ()->new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); public static final RegistryObject STABLE_SINGULARITY_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("stable_singularity", ()->new BlockItem(STABLE_SINGULARITY.get(), new Item.Properties()))); - public static final RegistryObject ILUSIUM_ORE_BLOCK = BLOCKS.register("ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_ORE_BLOCK.get()).noOcclusion())); - public static final RegistryObject ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore_block", () -> new BlockItem(ILUSIUM_ORE_BLOCK.get(), new Item.Properties()))); - - public static final RegistryObject DEEPSLATE_ILUSIUM_ORE_BLOCK = BLOCKS.register("deepslate_ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ILUSIUM_ORE_BLOCK.get()).noOcclusion())); - - public static final RegistryObject DEEPSLATE_ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_ilusium_ore_block", () -> new BlockItem(DEEPSLATE_ILUSIUM_ORE_BLOCK.get(), new Item.Properties()))); - - - public static final RegistryObject ILUSIUM_BLOCK = BLOCKS.register("ilusium_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().strength(5, 20).requiresCorrectToolForDrops())); - - public static final RegistryObject ILUSIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_block", () -> new BlockItem(ILUSIUM_BLOCK.get(), new Item.Properties()))); - - public static final RegistryObject COMPRESSION_CHAMBER_BLOCK = BLOCKS.register("compression_chamber", ()->new CompressionChamberBlock(BlockBehaviour.Properties.copy(ModBlocks.ILUSIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); + public static final RegistryObject COMPRESSION_CHAMBER_BLOCK = BLOCKS.register("compression_chamber", ()->new CompressionChamberBlock(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); public static final RegistryObject COMPRESSION_CHAMBER_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compression_chamber", ()->new BlockItem(COMPRESSION_CHAMBER_BLOCK.get(), new Item.Properties()))); @@ -104,12 +81,6 @@ public class ModBlocks { - - - - - - public static final RegistryObject LIMINAL_TILES = BLOCKS.register("liminal_tiles", ()-> new Block(BlockBehaviour.Properties.copy(Blocks.BEDROCK))); public static final RegistryObject LIMINAL_TILES_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tiles", ()->new BlockItem(LIMINAL_TILES.get(), new Item.Properties()))); diff --git a/src/main/resources/assets/otemod/textures/block/deprecated.png b/src/main/resources/assets/otemod/textures/block/deprecated.png new file mode 100644 index 0000000000000000000000000000000000000000..4989d847364192bfb3f7b579409faf86439189d1 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Iy_w*Lo9mt zPP)kD;2_}o{(<$LiX~Hm?$z$H(Og>7Apfvx;+C{5l|0|v+vjd>zU{$hz$Os3T4tOjITNBeT z(BxO4VlO9qHPP4^Ch80lJC7)78&qol`;+ E05rZ(6aWAK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/item/deprecated.png b/src/main/resources/assets/otemod/textures/item/deprecated.png new file mode 100644 index 0000000000000000000000000000000000000000..ccce825aaecb0b033f793c5b364ea1d0f9c60346 GIT binary patch literal 277 zcmV+w0qXvVP)Px#&q+iLQ!xs{KoFb_zQM*f1O&xG5JV9lEQnyGO$sY3JF(DLTwpBBh4Hc{ zLKX(X-OTLl9szom{kY>l+?)Zo01Ck_!}kohOvDj;N0S*AuBJ(4-&?7_iBme_g5k(1;rm54P#EPF|UJK25*N9-kNlMIv2&kVo! b&(yo#xuQYJsmNr?00000NkvXXu0mjfp&o9n literal 0 HcmV?d00001