diff --git a/CHANGELOG b/CHANGELOG index 9a20684..26c1068 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,4 +23,6 @@ ## 1.18.2-1.1.3-unstable (incomplete) - added evade enchantment -- added more advancements \ No newline at end of file +- added more advancements +- added weem hay bale +- rearranged block files \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java deleted file mode 100755 index cdd144c..0000000 --- a/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.arcmods.ryantlg.blocks; - -import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blockClasses.WeemCropBlock; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.CropBlock; -import net.minecraft.block.Material; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -public class CropBlocks { - public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); - - public static void register() { - - Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK); - - gameritems.LOGGER.info("CropBlocks loaded"); - } -} diff --git a/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java b/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java new file mode 100755 index 0000000..8c5f951 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java @@ -0,0 +1,31 @@ +package net.arcmods.ryantlg.blocks.cropBlocks; + +import net.arcmods.ryantlg.gameritems; +import net.arcmods.ryantlg.blockClasses.WeemCropBlock; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.CropBlock; +import net.minecraft.block.Material; +import net.minecraft.block.PillarBlock; +import net.minecraft.item.BlockItem; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class weemCrop { + public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); + public static final Block WEEM_HAY_BLOCK = new PillarBlock(FabricBlockSettings.of(Material.SOLID_ORGANIC).nonOpaque().strength(1, 1).sounds(BlockSoundGroup.GRASS)); + + public static void register() { + + Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "weem_hay_block"), WEEM_HAY_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_hay_block"), new BlockItem(WEEM_HAY_BLOCK, new FabricItemSettings().group(gameritems.CHING))); + FlammableBlockRegistry.getDefaultInstance().add(WEEM_HAY_BLOCK, 60, 20); + + gameritems.LOGGER.info("CropBlocks loaded"); + } +} diff --git a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/jeremiumBlocks.java similarity index 97% rename from src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java rename to src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/jeremiumBlocks.java index 34ed2e4..02dae8c 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/jeremiumBlocks.java @@ -1,4 +1,4 @@ -package net.arcmods.ryantlg.blocks; +package net.arcmods.ryantlg.blocks.metalBlocks; import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.jeremiumBlock; diff --git a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/omniumBlocks.java similarity index 96% rename from src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java rename to src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/omniumBlocks.java index 3e4f1f7..cc16581 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/omniumBlocks.java @@ -1,4 +1,4 @@ -package net.arcmods.ryantlg.blocks; +package net.arcmods.ryantlg.blocks.metalBlocks; import net.arcmods.ryantlg.gameritems; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; diff --git a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/oriumBlocks.java similarity index 97% rename from src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java rename to src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/oriumBlocks.java index e814435..f2fa5b7 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/oriumBlocks.java @@ -1,4 +1,4 @@ -package net.arcmods.ryantlg.blocks; +package net.arcmods.ryantlg.blocks.metalBlocks; import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.oriumBlock; diff --git a/src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/otherBlocks/FunnyBlocks.java similarity index 94% rename from src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java rename to src/main/java/net/arcmods/ryantlg/blocks/otherBlocks/FunnyBlocks.java index f3afd74..824c31a 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/otherBlocks/FunnyBlocks.java @@ -1,4 +1,4 @@ -package net.arcmods.ryantlg.blocks; +package net.arcmods.ryantlg.blocks.otherBlocks; import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.Damon; diff --git a/src/main/java/net/arcmods/ryantlg/gameritems.java b/src/main/java/net/arcmods/ryantlg/gameritems.java index 8264386..0ac208e 100755 --- a/src/main/java/net/arcmods/ryantlg/gameritems.java +++ b/src/main/java/net/arcmods/ryantlg/gameritems.java @@ -1,10 +1,10 @@ package net.arcmods.ryantlg; -import net.arcmods.ryantlg.blocks.CropBlocks; -import net.arcmods.ryantlg.blocks.FunnyBlocks; -import net.arcmods.ryantlg.blocks.jeremiumBlocks; -import net.arcmods.ryantlg.blocks.omniumBlocks; -import net.arcmods.ryantlg.blocks.oriumBlocks; +import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop; +import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks; +import net.arcmods.ryantlg.blocks.otherBlocks.FunnyBlocks; import net.arcmods.ryantlg.enchantments.evadeEnchantment; import net.arcmods.ryantlg.items.armour.jeremiumArmour; import net.arcmods.ryantlg.items.armour.notArmour; @@ -86,7 +86,7 @@ public class gameritems implements ModInitializer { OriumOreGen.register(); DeepslateOriumOreGen.register(); - CropBlocks.register(); + weemCrop.register(); fabricOfReality.register(); diff --git a/src/main/java/net/arcmods/ryantlg/gameritemsClient.java b/src/main/java/net/arcmods/ryantlg/gameritemsClient.java index e6df13e..c80969d 100644 --- a/src/main/java/net/arcmods/ryantlg/gameritemsClient.java +++ b/src/main/java/net/arcmods/ryantlg/gameritemsClient.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg; -import net.arcmods.ryantlg.blocks.CropBlocks; +import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop; import net.arcmods.ryantlg.utils.bowModelPredicateProvider; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; @@ -13,7 +13,7 @@ public class gameritemsClient implements ClientModInitializer{ @Override public void onInitializeClient() { - BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), CropBlocks.WEEM_CROP_BLOCK); + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), weemCrop.WEEM_CROP_BLOCK); bowModelPredicateProvider.registerBowModels(); diff --git a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java index 22698de..60a61ec 100755 --- a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java +++ b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java @@ -1,7 +1,7 @@ package net.arcmods.ryantlg.items.itemsByCrop; import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blocks.CropBlocks; +import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop; import net.arcmods.ryantlg.itemClasses.BreemItem; import net.arcmods.ryantlg.itemClasses.WeemItem; import net.arcmods.ryantlg.statusEffects.GamerEffects; @@ -56,14 +56,13 @@ public class weemItems { //seeds //================================================================================================================ - public static final Item WEEM_SEEDS = new AliasedBlockItem(CropBlocks.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING)); + public static final Item WEEM_SEEDS = new AliasedBlockItem(weemCrop.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING)); public static void register() { Registry.register(Registry.ITEM, new Identifier("gameritems", "breem"), BREEM); Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_apple"), WEEM_APPLE); - Registry.register(Registry.ITEM, new Identifier("gameritems","weem_seeds"), WEEM_SEEDS); Registry.register(Registry.ITEM, new Identifier("gameritems", "weem"), WEEM); diff --git a/src/main/java/net/arcmods/ryantlg/todo.txt b/src/main/java/net/arcmods/ryantlg/todo.txt index a0b6c4d..54d35e2 100755 --- a/src/main/java/net/arcmods/ryantlg/todo.txt +++ b/src/main/java/net/arcmods/ryantlg/todo.txt @@ -5,4 +5,6 @@ advancements argentine geranine soulium -floute \ No newline at end of file +floute + +port to 1.18.1 when busyn't \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java index c32b09d..230fe7d 100644 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java @@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration; import java.util.Arrays; import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blocks.omniumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.minecraft.util.registry.RegistryKey; diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java index 5fdef23..961cc40 100644 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java @@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration; import java.util.Arrays; import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blocks.oriumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.minecraft.util.registry.RegistryKey; diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java index da15fb0..957ccd7 100644 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java @@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration; import java.util.Arrays; import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blocks.jeremiumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.minecraft.util.registry.RegistryKey; diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java index 0965a6b..e89fd4c 100755 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java @@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration; import java.util.Arrays; import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blocks.omniumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.minecraft.util.registry.RegistryKey; diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java index 5ff7251..adf036d 100755 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java @@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration; import java.util.Arrays; import net.arcmods.ryantlg.gameritems; -import net.arcmods.ryantlg.blocks.oriumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.minecraft.util.registry.RegistryKey; diff --git a/src/main/resources/assets/gameritems/blockstates/weem_hay_block.json b/src/main/resources/assets/gameritems/blockstates/weem_hay_block.json new file mode 100644 index 0000000..0cae05c --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/weem_hay_block.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "gameritems:block/weem_hay_block" + }, + "axis=z": { + "model": "gameritems:block/weem_hay_block", + "x": 90 + }, + "axis=x": { + "model": "gameritems:block/weem_hay_block", + "x": 90, + "y": 90 + } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/lang/en_us.json b/src/main/resources/assets/gameritems/lang/en_us.json index 2eb38aa..a4f9305 100755 --- a/src/main/resources/assets/gameritems/lang/en_us.json +++ b/src/main/resources/assets/gameritems/lang/en_us.json @@ -70,6 +70,7 @@ "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore", "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore", "item.gameritems.gamer_bow": "Gamer Bow", - "enchantment.gameritems.evade": "Evade" + "enchantment.gameritems.evade": "Evade", + "block.gameritems.weem_hay_block": "Weem Hay Bale" } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/block/weem_hay_block.json b/src/main/resources/assets/gameritems/models/block/weem_hay_block.json new file mode 100644 index 0000000..1085716 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/block/weem_hay_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "gameritems:block/weem_block_top", + "side": "gameritems:block/weem_block_side" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/block/weem_hay_block_horizontal.json b/src/main/resources/assets/gameritems/models/block/weem_hay_block_horizontal.json new file mode 100644 index 0000000..c896f06 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/block/weem_hay_block_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "gameritems:block/weem_block_top", + "side": "gameritems:block/weem_block_side" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/weem_hay_block.json b/src/main/resources/assets/gameritems/models/item/weem_hay_block.json new file mode 100644 index 0000000..e5f66da --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/weem_hay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/weem_hay_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/textures/block/weem_block_side.png b/src/main/resources/assets/gameritems/textures/block/weem_block_side.png new file mode 100644 index 0000000..c211ea4 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/block/weem_block_side.png differ diff --git a/src/main/resources/assets/gameritems/textures/block/weem_block_top.png b/src/main/resources/assets/gameritems/textures/block/weem_block_top.png new file mode 100644 index 0000000..ea6d070 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/block/weem_block_top.png differ